Merge branch 'main' into fix/1323-telegram-endless-typing

2026-03-17 23:25:15 -07:00 · 2026-03-17 23:25:15 -07:00 · 317c70a7b2
commit 317c70a7b2
parent dc037f0d79 f79469c19d
192 changed files with 16578 additions and 3265 deletions
--- a/.env.example
+++ b/.env.example
@ -5,6 +5,7 @@
 # ANTHROPIC_API_KEY=sk-ant-xxx
 # OPENAI_API_KEY=sk-xxx
 # GEMINI_API_KEY=xxx
 # MODELSCOPE_API_KEY=xxx
 # CLAUDE_CODE_OAUTH=xxx
 # ── Chat Channel ──────────────────────────
 # TELEGRAM_BOT_TOKEN=123456:ABC...
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -0,0 +1,27 @@
 version: 2
 updates:
  # Go dependencies (entire repo)
  - package-ecosystem: "gomod"
    directory: "/"
    schedule:
      interval: "weekly"
    labels:
      - "dependencies"
      - "go"
  # Frontend dependencies
  - package-ecosystem: "npm"
    directory: "/web/frontend"
    schedule:
      interval: "weekly"
    labels:
      - "dependencies"
      - "frontend"
  # GitHub Actions
  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
      interval: "weekly"
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@ -31,11 +31,11 @@ jobs:
      # ── Docker Buildx ─────────────────────────
      - name: 🔧 Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
      # ── Login to GHCR ─────────────────────────
      - name: 🔑 Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: ${{ env.GHCR_REGISTRY }}
          username: ${{ github.actor }}
@ -43,7 +43,7 @@ jobs:
      # ── Login to Docker Hub ────────────────────
      - name: 🔑 Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: ${{ env.DOCKERHUB_REGISTRY }}
          username: ${{ secrets.DOCKERHUB_USERNAME }}
@ -62,7 +62,7 @@ jobs:
      # ── Build & Push ──────────────────────────
      - name: 🚀 Build and push Docker image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          context: .
          push: true
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@ -9,64 +9,37 @@ permissions:
  contents: read
 jobs:
-  create-tag:
+  nightly:
-    name: Create Git Tag
+    name: Nightly Build
    runs-on: ubuntu-latest
    permissions:
      contents: write
-    outputs:
+      packages: write
      version: ${{ steps.version.outputs.version }}
      tag: ${{ steps.version.outputs.tag }}
      changelog: ${{ steps.version.outputs.changelog }}
    steps:
      - name: Checkout
        uses: actions/checkout@v6
        with:
          fetch-depth: 0
-      - name: Generate and push tag
+      - name: Compute version
        id: version
        run: |
          DATE=$(date -u +%Y%m%d)
          SHA=$(git rev-parse --short=8 HEAD)
          BASE_VERSION=$(git describe --tags --match "v*" --exclude "*nightly*" --abbrev=0 2>/dev/null || true)
          if [ -z "$BASE_VERSION" ] || [ "$BASE_VERSION" = "v0.0.0" ]; then
-            TAG="v0.0.0-nightly.${DATE}.${SHA}"
+            VERSION="v0.0.0-nightly.${DATE}.${SHA}"
          else
-            TAG="${BASE_VERSION}-nightly.${DATE}.${SHA}"
+            VERSION="${BASE_VERSION}-nightly.${DATE}.${SHA}"
          fi
          VERSION=$TAG
          git config user.name "github-actions[bot]"
          git config user.email "github-actions[bot]@users.noreply.github.com"
          if git rev-parse -q --verify "refs/tags/$TAG" >/dev/null; then
            echo "Tag $TAG already exists, reusing existing tag"
          else
            git tag -a "$TAG" -m "Nightly build $VERSION"
          fi
          git push origin "$TAG"
-          COMPARE_URL="https://github.com/${{ github.repository }}/commits/${TAG}"
+          COMPARE_URL="https://github.com/${{ github.repository }}/commits/main"
          if [ -n "$BASE_VERSION" ] && [ "$BASE_VERSION" != "v0.0.0" ]; then
-            COMPARE_URL="https://github.com/${{ github.repository }}/compare/${BASE_VERSION}...${TAG}"
+            COMPARE_URL="https://github.com/${{ github.repository }}/compare/${BASE_VERSION}...main"
          fi
          echo "changelog=**Full Changelog**: $COMPARE_URL" >> "$GITHUB_OUTPUT"
          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
-          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "changelog=**Full Changelog**: $COMPARE_URL" >> "$GITHUB_OUTPUT"
  release:
    name: GoReleaser Release
    needs: create-tag
    runs-on: ubuntu-latest
    permissions:
      contents: write
      packages: write
    steps:
      - name: Checkout tag
        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          ref: ${{ needs.create-tag.outputs.tag }}
      - name: Setup Go from go.mod
        id: setup-go
@ -75,7 +48,7 @@ jobs:
          go-version-file: go.mod
      - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
        with:
          node-version: 22
@ -86,15 +59,25 @@ jobs:
        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Login to Docker Hub
        uses: docker/login-action@v4
        with:
          registry: docker.io
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Create local tag for GoReleaser
        run: git tag "${{ steps.version.outputs.version }}"
      - name: Run GoReleaser
        uses: goreleaser/goreleaser-action@v6
        with:
@ -106,6 +89,7 @@ jobs:
          GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
          DOCKERHUB_IMAGE_NAME: ${{ vars.DOCKERHUB_REPOSITORY }}
          GOVERSION: ${{ steps.setup-go.outputs.go-version }}
          GORELEASER_CURRENT_TAG: ${{ steps.version.outputs.version }}
          NIGHTLY_BUILD: "true"
          MACOS_SIGN_P12: ${{ secrets.MACOS_SIGN_P12 }}
          MACOS_SIGN_PASSWORD: ${{ secrets.MACOS_SIGN_PASSWORD }}
@ -113,26 +97,14 @@ jobs:
          MACOS_NOTARY_KEY_ID: ${{ secrets.MACOS_NOTARY_KEY_ID }}
          MACOS_NOTARY_KEY: ${{ secrets.MACOS_NOTARY_KEY }}
  update-rolling:
    name: Update Rolling Nightly
    needs: [create-tag, release]
    runs-on: ubuntu-latest
    permissions:
      contents: write
      packages: write
    steps:
      - name: Checkout
        uses: actions/checkout@v6
      - name: Update nightly release
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAG: ${{ needs.create-tag.outputs.tag }}
+          VERSION: ${{ steps.version.outputs.version }}
          TITLE: ${{ needs.create-tag.outputs.version }}
        run: |
-          CHANGELOG='${{ needs.create-tag.outputs.changelog }}'
+          CHANGELOG='${{ steps.version.outputs.changelog }}'
          NOTES=$(cat <<EOF
-          Nightly build for **${TITLE}**
+          Nightly build for **${VERSION}**
          This is an automated build and may be unstable. Use with caution.
@ -140,65 +112,27 @@ jobs:
          EOF
          )
-          # Download assets from the newly created release if it exists,
+          # Delete existing nightly release and tag
-          # otherwise fall back to using locally built dist/ artifacts.
+          gh release delete nightly --cleanup-tag -y 2>/dev/null || true
          mkdir -p build
          if gh release view "$TAG" >/dev/null 2>&1; then
            echo "Downloading assets from GitHub release for $TAG..."
            gh release download "$TAG" --dir build
          else
            echo "GitHub release for $TAG not found; falling back to local dist/ artifacts..."
            if [ -d "dist" ]; then
              cp -R dist/* build/
            else
              echo "Error: no GitHub release for $TAG and no local dist/ directory found." >&2
              exit 1
            fi
          fi
-          # Delete existing nightly release and tag to avoid conflicts
+          # Force-update nightly tag to current HEAD
-          echo "Deleting existing nightly release and tag..."
+          git config user.name "github-actions[bot]"
-          gh release delete nightly --cleanup-tag -y || true
+          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git push origin :refs/tags/nightly || true
+          git tag -fa nightly -m "Nightly build ${VERSION}"
          git push origin nightly
          # Collect release artifacts from goreleaser dist/
          ASSETS=()
          for f in dist/*.tar.gz dist/*.zip dist/*.deb dist/*.rpm dist/checksums.txt; do
            [ -f "$f" ] && ASSETS+=("$f")
          done
          # Create nightly release (prerelease, NOT latest)
          gh release create nightly \
            --title "Nightly Build" \
            --notes "$NOTES" \
            --target "${{ github.sha }}" \
            --prerelease \
-            build/*
+            --latest=false \
            "${ASSETS[@]}"
          echo "Cleaning up old nightly releases (keeping only the most recent)..."
          gh release list --limit 100 --json tagName -q '.[].tagName | select(contains("-nightly."))' | tail -n +2 | while read -r old_tag; do
            if [ -n "$old_tag" ] && [ "$old_tag" != "$TAG" ]; then
              echo "Deleting old nightly release: $old_tag"
              gh release delete "$old_tag" --cleanup-tag -y || true
            fi
          done
          echo "Cleaning up old 'vX.X.X-nightly...' Docker images on GHCR..."
          OWNER="${{ github.repository_owner }}"
          PACKAGE_NAME="${{ github.event.repository.name }}"
          # Check if owner is an organization or user
          ORG_TEST=$(gh api -H "Accept: application/vnd.github+json" /orgs/$OWNER 2>/dev/null || true)
          if echo "$ORG_TEST" | grep -q '"login"'; then
            ACCOUNT_TYPE="orgs"
          else
            ACCOUNT_TYPE="users"
          fi
          PACKAGE_URL="/${ACCOUNT_TYPE}/${OWNER}/packages/container/${PACKAGE_NAME}/versions"
          OLD_NIGHTLY_VERSIONS=$(gh api --paginate -H "Accept: application/vnd.github+json" \
            -H "X-GitHub-Api-Version: 2022-11-28" \
            "$PACKAGE_URL" \
            --jq ". | map(select(any(.metadata.container.tags[]; contains(\"-nightly.\") and (. != \"nightly\") and (. != \"$TAG\")))) | .[].id" 2>/dev/null || true)
          for version_id in $OLD_NIGHTLY_VERSIONS; do
            if [ -n "$version_id" ]; then
              echo "Deleting Docker image version ID: $version_id"
              gh api -X DELETE -H "Accept: application/vnd.github+json" \
                -H "X-GitHub-Api-Version: 2022-11-28" \
                "/${ACCOUNT_TYPE}/${OWNER}/packages/container/${PACKAGE_NAME}/versions/$version_id" || true
            fi
          done
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -34,7 +34,7 @@ jobs:
          persist-credentials: false
      - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
        with:
          go-version-file: go.mod
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -66,7 +66,7 @@ jobs:
          go-version-file: go.mod
      - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
        with:
          node-version: 22
@ -77,17 +77,17 @@ jobs:
        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: docker.io
          username: ${{ secrets.DOCKERHUB_USERNAME }}
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@ -27,6 +27,7 @@ builds:
      - windows
      - darwin
      - freebsd
      - netbsd
    goarch:
      - amd64
      - arm64
@ -44,6 +45,12 @@ builds:
    ignore:
      - goos: windows
        goarch: arm
      - goos: netbsd
        goarch: s390x
      - goos: netbsd
        goarch: mips64
      - goos: netbsd
        goarch: arm
  - id: picoclaw-launcher
    binary: picoclaw-launcher
@ -58,6 +65,7 @@ builds:
      - windows
      - darwin
      - freebsd
      - netbsd
    goarch:
      - amd64
      - arm64
@ -75,6 +83,12 @@ builds:
    ignore:
      - goos: windows
        goarch: arm
      - goos: netbsd
        goarch: s390x
      - goos: netbsd
        goarch: mips64
      - goos: netbsd
        goarch: arm
  - id: picoclaw-launcher-tui
    binary: picoclaw-launcher-tui
@ -89,6 +103,7 @@ builds:
      - windows
      - darwin
      - freebsd
      - netbsd
    goarch:
      - amd64
      - arm64
@ -106,6 +121,12 @@ builds:
    ignore:
      - goos: windows
        goarch: arm
      - goos: netbsd
        goarch: s390x
      - goos: netbsd
        goarch: mips64
      - goos: netbsd
        goarch: arm
 dockers_v2:
  - id: picoclaw
@ -116,9 +137,9 @@ dockers_v2:
      - picoclaw
    images:
      - "ghcr.io/{{ .Env.GITHUB_REPOSITORY_OWNER }}/picoclaw"
-      - '{{ if not (isEnvSet "NIGHTLY_BUILD") }}docker.io/{{ .Env.DOCKERHUB_IMAGE_NAME }}{{ end }}'
+      - 'docker.io/{{ .Env.DOCKERHUB_IMAGE_NAME }}'
    tags:
-      - "{{ .Tag }}"
+      - '{{ if isEnvSet "NIGHTLY_BUILD" }}nightly{{ else }}{{ .Tag }}{{ end }}'
      - '{{ if isEnvSet "NIGHTLY_BUILD" }}nightly{{ else }}latest{{ end }}'
    platforms:
      - linux/amd64
@ -133,9 +154,9 @@ dockers_v2:
      - picoclaw-launcher-tui
    images:
      - "ghcr.io/{{ .Env.GITHUB_REPOSITORY_OWNER }}/picoclaw"
-      - '{{ if not (isEnvSet "NIGHTLY_BUILD") }}docker.io/{{ .Env.DOCKERHUB_IMAGE_NAME }}{{ end }}'
+      - 'docker.io/{{ .Env.DOCKERHUB_IMAGE_NAME }}'
    tags:
-      - "{{ .Tag }}-launcher"
+      - '{{ if isEnvSet "NIGHTLY_BUILD" }}nightly-launcher{{ else }}{{ .Tag }}-launcher{{ end }}'
      - '{{ if isEnvSet "NIGHTLY_BUILD" }}nightly-launcher{{ else }}launcher{{ end }}'
    platforms:
      - linux/amd64
@ -215,6 +236,7 @@ changelog:
 #      lzma: true
 release:
  disable: '{{ isEnvSet "NIGHTLY_BUILD" }}'
  footer: >-
    ---
--- a/59
+++ b/59
@ -12,10 +12,11 @@ GIT_COMMIT=$(shell git rev-parse --short=8 HEAD 2>/dev/null || echo "dev")
 BUILD_TIME=$(shell date +%FT%T%z)
 GO_VERSION=$(shell $(GO) version | awk '{print $$3}')
 CONFIG_PKG=github.com/sipeed/picoclaw/pkg/config
-LDFLAGS=-ldflags "-X $(CONFIG_PKG).Version=$(VERSION) -X $(CONFIG_PKG).GitCommit=$(GIT_COMMIT) -X $(CONFIG_PKG).BuildTime=$(BUILD_TIME) -X $(CONFIG_PKG).GoVersion=$(GO_VERSION) -s -w"
+LDFLAGS=-X $(CONFIG_PKG).Version=$(VERSION) -X $(CONFIG_PKG).GitCommit=$(GIT_COMMIT) -X $(CONFIG_PKG).BuildTime=$(BUILD_TIME) -X $(CONFIG_PKG).GoVersion=$(GO_VERSION) -s -w
 # Go variables
 GO?=CGO_ENABLED=0 go
 WEB_GO?=$(GO)
 GOFLAGS?=-v -tags stdjson
 # Patch MIPS LE ELF e_flags (offset 36) for NaN2008-only kernels (e.g. Ingenic X2600).
@ -79,6 +80,7 @@ ifeq ($(UNAME_S),Linux)
 	endif
 else ifeq ($(UNAME_S),Darwin)
 	PLATFORM=darwin
 	WEB_GO=CGO_ENABLED=1 go
 	ifeq ($(UNAME_M),x86_64)
 		ARCH=amd64
 	else ifeq ($(UNAME_M),arm64)
@ -107,7 +109,7 @@ generate:
 build: generate
 	@echo "Building $(BINARY_NAME) for $(PLATFORM)/$(ARCH)..."
 	@mkdir -p $(BUILD_DIR)
-	@$(GO) build $(GOFLAGS) $(LDFLAGS) -o $(BINARY_PATH) ./$(CMD_DIR)
+	@$(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BINARY_PATH) ./$(CMD_DIR)
 	@echo "Build complete: $(BINARY_PATH)"
 	@ln -sf $(BINARY_NAME)-$(PLATFORM)-$(ARCH) $(BUILD_DIR)/$(BINARY_NAME)
@ -119,7 +121,7 @@ build-launcher:
 		echo "Building frontend..."; \
 		cd web/frontend && pnpm install && pnpm build:backend; \
 	fi
-	@$(GO) build $(GOFLAGS) -o $(BUILD_DIR)/picoclaw-launcher-$(PLATFORM)-$(ARCH) ./web/backend
+	@$(WEB_GO) build $(GOFLAGS) -o $(BUILD_DIR)/picoclaw-launcher-$(PLATFORM)-$(ARCH) ./web/backend
 	@ln -sf picoclaw-launcher-$(PLATFORM)-$(ARCH) $(BUILD_DIR)/picoclaw-launcher
 	@echo "Build complete: $(BUILD_DIR)/picoclaw-launcher"
@ -128,16 +130,16 @@ build-whatsapp-native: generate
 ## @echo "Building $(BINARY_NAME) with WhatsApp native for $(PLATFORM)/$(ARCH)..."
 	@echo "Building for multiple platforms..."
 	@mkdir -p $(BUILD_DIR)
-	GOOS=linux GOARCH=amd64 $(GO) build -tags whatsapp_native $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-amd64 ./$(CMD_DIR)
+	GOOS=linux GOARCH=amd64 $(GO) build -tags whatsapp_native -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-amd64 ./$(CMD_DIR)
-	GOOS=linux GOARCH=arm GOARM=7 $(GO) build -tags whatsapp_native $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm ./$(CMD_DIR)
+	GOOS=linux GOARCH=arm GOARM=7 $(GO) build -tags whatsapp_native -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm ./$(CMD_DIR)
-	GOOS=linux GOARCH=arm64 $(GO) build -tags whatsapp_native $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 ./$(CMD_DIR)
+	GOOS=linux GOARCH=arm64 $(GO) build -tags whatsapp_native -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 ./$(CMD_DIR)
-	GOOS=linux GOARCH=loong64 $(GO) build -tags whatsapp_native $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-loong64 ./$(CMD_DIR)
+	GOOS=linux GOARCH=loong64 $(GO) build -tags whatsapp_native -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-loong64 ./$(CMD_DIR)
-	GOOS=linux GOARCH=riscv64 $(GO) build -tags whatsapp_native $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-riscv64 ./$(CMD_DIR)
+	GOOS=linux GOARCH=riscv64 $(GO) build -tags whatsapp_native -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-riscv64 ./$(CMD_DIR)
-	GOOS=linux GOARCH=mipsle GOMIPS=softfloat $(GO) build -tags whatsapp_native $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-mipsle ./$(CMD_DIR)
+	GOOS=linux GOARCH=mipsle GOMIPS=softfloat $(GO) build -tags whatsapp_native -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-mipsle ./$(CMD_DIR)
 	$(call PATCH_MIPS_FLAGS,$(BUILD_DIR)/$(BINARY_NAME)-linux-mipsle)
-	GOOS=darwin GOARCH=arm64 $(GO) build -tags whatsapp_native $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-darwin-arm64 ./$(CMD_DIR)
+	GOOS=darwin GOARCH=arm64 $(GO) build -tags whatsapp_native -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-darwin-arm64 ./$(CMD_DIR)
-	GOOS=windows GOARCH=amd64 $(GO) build -tags whatsapp_native $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe ./$(CMD_DIR)
+	GOOS=windows GOARCH=amd64 $(GO) build -tags whatsapp_native -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe ./$(CMD_DIR)
-## @$(GO) build $(GOFLAGS) -tags whatsapp_native $(LDFLAGS) -o $(BINARY_PATH) ./$(CMD_DIR)
+## @$(GO) build $(GOFLAGS) -tags whatsapp_native -ldflags "$(LDFLAGS)" -o $(BINARY_PATH) ./$(CMD_DIR)
 	@echo "Build complete"
 ##	@ln -sf $(BINARY_NAME)-$(PLATFORM)-$(ARCH) $(BUILD_DIR)/$(BINARY_NAME)
@ -145,21 +147,21 @@ build-whatsapp-native: generate
 build-linux-arm: generate
 	@echo "Building for linux/arm (GOARM=7)..."
 	@mkdir -p $(BUILD_DIR)
-	GOOS=linux GOARCH=arm GOARM=7 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm ./$(CMD_DIR)
+	GOOS=linux GOARCH=arm GOARM=7 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm ./$(CMD_DIR)
 	@echo "Build complete: $(BUILD_DIR)/$(BINARY_NAME)-linux-arm"
 ## build-linux-arm64: Build for Linux ARM64 (e.g. Raspberry Pi Zero 2 W 64-bit)
 build-linux-arm64: generate
 	@echo "Building for linux/arm64..."
 	@mkdir -p $(BUILD_DIR)
-	GOOS=linux GOARCH=arm64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 ./$(CMD_DIR)
+	GOOS=linux GOARCH=arm64 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 ./$(CMD_DIR)
 	@echo "Build complete: $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64"
 ## build-linux-mipsle: Build for Linux MIPS32 LE
 build-linux-mipsle: generate
 	@echo "Building for linux/mipsle (softfloat)..."
 	@mkdir -p $(BUILD_DIR)
-	GOOS=linux GOARCH=mipsle GOMIPS=softfloat $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-mipsle ./$(CMD_DIR)
+	GOOS=linux GOARCH=mipsle GOMIPS=softfloat $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-mipsle ./$(CMD_DIR)
 	$(call PATCH_MIPS_FLAGS,$(BUILD_DIR)/$(BINARY_NAME)-linux-mipsle)
 	@echo "Build complete: $(BUILD_DIR)/$(BINARY_NAME)-linux-mipsle"
@ -171,16 +173,18 @@ build-pi-zero: build-linux-arm build-linux-arm64
 build-all: generate
 	@echo "Building for multiple platforms..."
 	@mkdir -p $(BUILD_DIR)
-	GOOS=linux GOARCH=amd64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-amd64 ./$(CMD_DIR)
+	GOOS=linux GOARCH=amd64 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-amd64 ./$(CMD_DIR)
-	GOOS=linux GOARCH=arm GOARM=7 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm ./$(CMD_DIR)
+	GOOS=linux GOARCH=arm GOARM=7 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm ./$(CMD_DIR)
-	GOOS=linux GOARCH=arm64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 ./$(CMD_DIR)
+	GOOS=linux GOARCH=arm64 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 ./$(CMD_DIR)
-	GOOS=linux GOARCH=loong64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-loong64 ./$(CMD_DIR)
+	GOOS=linux GOARCH=loong64 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-loong64 ./$(CMD_DIR)
-	GOOS=linux GOARCH=riscv64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-riscv64 ./$(CMD_DIR)
+	GOOS=linux GOARCH=riscv64 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-riscv64 ./$(CMD_DIR)
-	GOOS=linux GOARCH=mipsle GOMIPS=softfloat $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-mipsle ./$(CMD_DIR)
+	GOOS=linux GOARCH=mipsle GOMIPS=softfloat $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-mipsle ./$(CMD_DIR)
 	$(call PATCH_MIPS_FLAGS,$(BUILD_DIR)/$(BINARY_NAME)-linux-mipsle)
-	GOOS=linux GOARCH=arm GOARM=7 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-armv7 ./$(CMD_DIR)
+	GOOS=linux GOARCH=arm GOARM=7 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-armv7 ./$(CMD_DIR)
-	GOOS=darwin GOARCH=arm64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-darwin-arm64 ./$(CMD_DIR)
+	GOOS=darwin GOARCH=arm64 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-darwin-arm64 ./$(CMD_DIR)
-	GOOS=windows GOARCH=amd64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe ./$(CMD_DIR)
+	GOOS=windows GOARCH=amd64 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe ./$(CMD_DIR)
 	GOOS=netbsd GOARCH=amd64 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-netbsd-amd64 ./$(CMD_DIR)
 	GOOS=netbsd GOARCH=arm64 $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-netbsd-arm64 ./$(CMD_DIR)
 	@echo "All builds complete"
 ## install: Install picoclaw to system and copy builtin skills
@ -217,11 +221,14 @@ clean:
 ## vet: Run go vet for static analysis
 vet: generate
-	@$(GO) vet ./...
+	@packages="$$(go list ./...)" && \
 		$(GO) vet $$(printf '%s\n' "$$packages" | grep -v '^github.com/sipeed/picoclaw/web/')
 	@cd web/backend && $(WEB_GO) vet ./...
 ## test: Test Go code
 test: generate
-	@$(GO) test ./...
+	@$(GO) test $$(go list ./... | grep -v github.com/sipeed/picoclaw/web/)
 	@cd web && make test
 ## fmt: Format Go code
 fmt:
--- a/README.fr.md
+++ b/README.fr.md
@ -1,17 +1,21 @@
 <div align="center">
-  <img src="assets/logo.jpg" alt="PicoClaw" width="512">
+  <img src="assets/logo.webp" alt="PicoClaw" width="512">
  <h1>PicoClaw : Assistant IA Ultra-Efficace en Go</h1>
  <h3>Matériel à 10$ · 10 Mo de RAM · Démarrage en 1s · 皮皮虾，我们走！</h3>
  <p>
    <img src="https://img.shields.io/badge/Go-1.21+-00ADD8?style=flat&logo=go&logoColor=white" alt="Go">
    <img src="https://img.shields.io/badge/Arch-x86__64%2C%20ARM64%2C%20MIPS%2C%20RISC--V-blue" alt="Hardware">
    <img src="https://img.shields.io/badge/license-MIT-green" alt="License">
    <br>
    <a href="https://picoclaw.io"><img src="https://img.shields.io/badge/Website-picoclaw.io-blue?style=flat&logo=google-chrome&logoColor=white" alt="Website"></a>
    <a href="https://docs.picoclaw.io/"><img src="https://img.shields.io/badge/Docs-Official-007acc?style=flat&logo=read-the-docs&logoColor=white" alt="Docs"></a>
    <a href="https://deepwiki.com/sipeed/picoclaw"><img src="https://img.shields.io/badge/Wiki-DeepWiki-FFA500?style=flat&logo=wikipedia&logoColor=white" alt="Wiki"></a>
    <br>
    <a href="https://x.com/SipeedIO"><img src="https://img.shields.io/badge/X_(Twitter)-SipeedIO-black?style=flat&logo=x&logoColor=white" alt="Twitter"></a>
    <a href="./assets/wechat.png"><img src="https://img.shields.io/badge/WeChat-Group-41d56b?style=flat&logo=wechat&logoColor=white"></a>
    <a href="https://discord.gg/V4sAZ9XWpN"><img src="https://img.shields.io/badge/Discord-Community-4c60eb?style=flat&logo=discord&logoColor=white" alt="Discord"></a>
  </p>
 [中文](README.zh.md) | [日本語](README.ja.md) | [Português](README.pt-br.md) | [Tiếng Việt](README.vi.md) | [English](README.md) | **Français**
@ -19,7 +23,9 @@
 ---
-🦐 **PicoClaw** est un assistant personnel IA ultra-léger inspiré de [nanobot](https://github.com/HKUDS/nanobot), entièrement réécrit en **Go** via un processus d'auto-amorçage (self-bootstrapping) — où l'agent IA lui-même a piloté l'intégralité de la migration architecturale et de l'optimisation du code.
+> **PicoClaw** est un projet open-source indépendant initié par [Sipeed](https://sipeed.com). Il est entièrement écrit en **Go** — ce n'est pas un fork d'OpenClaw, de NanoBot ou de tout autre projet.
 🦐 **PicoClaw** est un assistant personnel IA ultra-léger inspiré de [NanoBot](https://github.com/HKUDS/nanobot), entièrement réécrit en **Go** via un processus d'auto-amorçage (self-bootstrapping) — où l'agent IA lui-même a piloté l'intégralité de la migration architecturale et de l'optimisation du code.
 ⚡️ **Extrêmement léger :** Fonctionne sur du matériel à seulement **10$** avec **<10 Mo** de RAM. C'est 99% de mémoire en moins qu'OpenClaw et 98% moins cher qu'un Mac mini !
@ -206,9 +212,7 @@ docker compose -f docker/docker-compose.yml --profile gateway up -d
 ### 🚀 Démarrage Rapide
 > [!TIP]
-> Configurez votre clé API dans `~/.picoclaw/config.json`.
+> Configurez votre clé API dans `~/.picoclaw/config.json`. Obtenez des clés API : [Volcengine (CodingPlan)](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw) (LLM) · [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM). La recherche web est optionnelle — obtenez gratuitement l'[API Tavily](https://tavily.com) (1000 requêtes gratuites/mois) ou l'[API Brave Search](https://brave.com/search/api) (2000 requêtes gratuites/mois).
 > Obtenir des clés API : [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM)
 > La recherche web est **optionnelle** — obtenez gratuitement l'[API Brave Search](https://brave.com/search/api) (2000 requêtes gratuites/mois) ou utilisez le repli automatique intégré.
 **1. Initialiser**
@ -222,8 +226,14 @@ picoclaw onboard
 {
  "model_list": [
    {
-      "model_name": "gpt4",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key",
      "api_base":"https://ark.cn-beijing.volces.com/api/coding/v3"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key",
      "request_timeout": 300,
      "api_base": "https://api.openai.com/v1"
@ -231,7 +241,7 @@ picoclaw onboard
  ],
  "agents": {
    "defaults": {
-      "model_name": "gpt4"
+      "model_name": "gpt-5.4"
    }
  },
  "channels": {
@ -243,6 +253,9 @@ picoclaw onboard
  },
  "tools": {
    "web": {
      "enabled": true,
      "fetch_limit_bytes": 10485760,
      "format": "plaintext",
      "brave": {
        "enabled": false,
        "api_key": "VOTRE_CLE_API_BRAVE",
@ -649,7 +662,6 @@ PicoClaw stocke les données dans votre workspace configuré (par défaut : `~/.
 ├── HEARTBEAT.md      # Invites de tâches périodiques (vérifiées toutes les 30 min)
 ├── IDENTITY.md       # Identité de l'Agent
 ├── SOUL.md           # Âme de l'Agent
 ├── TOOLS.md          # Description des outils
 └── USER.md           # Préférences utilisateur
 ```
@ -833,6 +845,7 @@ Le sous-agent a accès aux outils (message, web_search, etc.) et peut communique
 | ------------------------ | ---------------------------------------- | ------------------------------------------------------ |
 | `gemini`                 | LLM (Gemini direct)                      | [aistudio.google.com](https://aistudio.google.com)     |
 | `zhipu`                  | LLM (Zhipu direct)                       | [bigmodel.cn](bigmodel.cn)                             |
 | `volcengine`             | LLM(Volcengine direct)                   | [volcengine.com](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw)           |
 | `openrouter` (À tester)  | LLM (recommandé, accès à tous les modèles) | [openrouter.ai](https://openrouter.ai)               |
 | `anthropic` (À tester)   | LLM (Claude direct)                      | [console.anthropic.com](https://console.anthropic.com) |
 | `openai` (À tester)      | LLM (GPT direct)                         | [platform.openai.com](https://platform.openai.com)     |
@ -978,9 +991,12 @@ Cette conception permet également le **support multi-agent** avec une sélectio
 | **OpenRouter** | `openrouter/` | `https://openrouter.ai/api/v1` | OpenAI | [Obtenir Clé](https://openrouter.ai/keys) |
 | **VLLM** | `vllm/` | `http://localhost:8000/v1` | OpenAI | Local |
 | **Cerebras** | `cerebras/` | `https://api.cerebras.ai/v1` | OpenAI | [Obtenir Clé](https://cerebras.ai) |
-| **Volcengine** | `volcengine/` | `https://ark.cn-beijing.volces.com/api/v3` | OpenAI | [Obtenir Clé](https://console.volcengine.com) |
+| **VolcEngine (Doubao)** | `volcengine/` | `https://ark.cn-beijing.volces.com/api/v3` | OpenAI | [Obtenir Clé](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw) |
 | **ShengsuanYun** | `shengsuanyun/` | `https://router.shengsuanyun.com/api/v1` | OpenAI | - |
 | **BytePlus**        | `byteplus/`       | `https://ark.ap-southeast.bytepluses.com/api/v3`    | OpenAI    | [Obtenir Clé](https://www.byteplus.com/)                    |
 | **LongCat**         | `longcat/`        | `https://api.longcat.chat/openai`                   | OpenAI    | [Obtenir une clé](https://longcat.chat/platform)                 |
 | **ModelScope (魔搭)**| `modelscope/`    | `https://api-inference.modelscope.cn/v1`            | OpenAI    | [Obtenir un Token](https://modelscope.cn/my/tokens)              |
 | **Azure OpenAI**    | `azure/`          | `https://{resource}.openai.azure.com`               | Azure     | [Obtenir Clé](https://portal.azure.com)                          |
 | **Antigravity** | `antigravity/` | Google Cloud | Custom | OAuth uniquement |
 | **GitHub Copilot** | `github-copilot/` | `localhost:4321` | gRPC | - |
@ -990,8 +1006,13 @@ Cette conception permet également le **support multi-agent** avec une sélectio
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key"
    },
    {
@ -1007,7 +1028,7 @@ Cette conception permet également le **support multi-agent** avec une sélectio
  ],
  "agents": {
    "defaults": {
-      "model": "gpt-5.2"
+      "model": "gpt-5.4"
    }
  }
 }
@ -1018,8 +1039,17 @@ Cette conception permet également le **support multi-agent** avec une sélectio
 **OpenAI**
 ```json
 {
-  "model_name": "gpt-5.2",
+  "model_name": "gpt-5.4",
-  "model": "openai/gpt-5.2",
+  "model": "openai/gpt-5.4",
  "api_key": "sk-..."
 }
 ```
 **VolcEngine (Doubao)**
 ```json
 {
  "model_name": "ark-code-latest",
  "model": "volcengine/ark-code-latest",
  "api_key": "sk-..."
 }
 ```
@ -1062,14 +1092,14 @@ Configurez plusieurs points de terminaison pour le même nom de modèle—PicoCl
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api1.example.com/v1",
      "api_key": "sk-key1"
    },
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api2.example.com/v1",
      "api_key": "sk-key2"
    }
@ -1201,6 +1231,14 @@ Cela se produit lorsqu'une autre instance du bot est en cours d'exécution. Assu
 | Service          | Offre Gratuite       | Cas d'Utilisation                     |
 | ---------------- | -------------------- | ------------------------------------- |
 | **OpenRouter**   | 200K tokens/mois     | Multiples modèles (Claude, GPT-4, etc.) |
-| **Zhipu**        | 200K tokens/mois     | Idéal pour les utilisateurs chinois   |
+| **Volcengine CodingPlan** | 9,9¥/premier mois | Idéal pour les utilisateurs chinois, multiples modèles SOTA (Doubao, DeepSeek, etc.) |
 | **Zhipu**        | 200K tokens/mois     | Convient aux utilisateurs chinois   |
 | **Brave Search** | 2000 requêtes/mois   | Fonctionnalité de recherche web       |
 | **Groq**         | Offre gratuite dispo | Inférence ultra-rapide (Llama, Mixtral) |
 | **ModelScope**   | 2000 requêtes/jour   | Inférence gratuite (Qwen, GLM, DeepSeek, etc.) |
 ---
 <div align="center">
  <img src="assets/logo.jpg" alt="PicoClaw Meme" width="512">
 </div>
--- a/README.ja.md
+++ b/README.ja.md
@ -1,15 +1,22 @@
 <div align="center">
-<img src="assets/logo.jpg" alt="PicoClaw" width="512">
+<img src="assets/logo.webp" alt="PicoClaw" width="512">
 <h1>PicoClaw: Go で書かれた超効率 AI アシスタント</h1>
 <h3>$10 ハードウェア · 10MB RAM · 1秒起動 · 行くぜ、シャコ！</h3>
 <h3></h3>
  <p>
    <img src="https://img.shields.io/badge/Go-1.21+-00ADD8?style=flat&logo=go&logoColor=white" alt="Go">
    <img src="https://img.shields.io/badge/Arch-x86__64%2C%20ARM64%2C%20MIPS%2C%20RISC--V-blue" alt="Hardware">
    <img src="https://img.shields.io/badge/license-MIT-green" alt="License">
    <br>
    <a href="https://picoclaw.io"><img src="https://img.shields.io/badge/Website-picoclaw.io-blue?style=flat&logo=google-chrome&logoColor=white" alt="Website"></a>
    <a href="https://docs.picoclaw.io/"><img src="https://img.shields.io/badge/Docs-Official-007acc?style=flat&logo=read-the-docs&logoColor=white" alt="Docs"></a>
    <a href="https://deepwiki.com/sipeed/picoclaw"><img src="https://img.shields.io/badge/Wiki-DeepWiki-FFA500?style=flat&logo=wikipedia&logoColor=white" alt="Wiki"></a>
    <br>
    <a href="https://x.com/SipeedIO"><img src="https://img.shields.io/badge/X_(Twitter)-SipeedIO-black?style=flat&logo=x&logoColor=white" alt="Twitter"></a>
    <a href="./assets/wechat.png"><img src="https://img.shields.io/badge/WeChat-Group-41d56b?style=flat&logo=wechat&logoColor=white"></a>
    <a href="https://discord.gg/V4sAZ9XWpN"><img src="https://img.shields.io/badge/Discord-Community-4c60eb?style=flat&logo=discord&logoColor=white" alt="Discord"></a>
  </p>
 [中文](README.zh.md) | **日本語** | [Português](README.pt-br.md) | [Tiếng Việt](README.vi.md) | [Français](README.fr.md) | [English](README.md)
@ -19,7 +26,9 @@
 ---
-🦐 PicoClaw は [nanobot](https://github.com/HKUDS/nanobot) にインスパイアされた超軽量パーソナル AI アシスタントです。Go でゼロからリファクタリングされ、AI エージェント自身がアーキテクチャの移行とコード最適化を推進するセルフブートストラッピングプロセスで構築されました。
+> **PicoClaw** は [Sipeed](https://sipeed.com) が立ち上げた独立したオープンソースプロジェクトです。完全に **Go 言語**で一から書かれており、OpenClaw、NanoBot、その他のプロジェクトのフォークではありません。
 🦐 PicoClaw は [NanoBot](https://github.com/HKUDS/nanobot) にインスパイアされた超軽量パーソナル AI アシスタントです。Go でゼロからリファクタリングされ、AI エージェント自身がアーキテクチャの移行とコード最適化を推進するセルフブートストラッピングプロセスで構築されました。
 ⚡️ $10 のハードウェアで 10MB 未満の RAM で動作：OpenClaw より 99% 少ないメモリ、Mac mini より 98% 安い！
@ -168,9 +177,7 @@ docker compose -f docker/docker-compose.yml --profile gateway up -d
 ### 🚀 クイックスタート（ネイティブ）
 > [!TIP]
-> `~/.picoclaw/config.json` に API キーを設定してください。
+> `~/.picoclaw/config.json` に API キーを設定してください。API キーの取得先: [Volcengine (CodingPlan)](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw) (LLM) · [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM)。Web 検索は **任意** です — 無料の [Tavily API](https://tavily.com) (月 1000 クエリ無料) または [Brave Search API](https://brave.com/search/api) (月 2000 クエリ無料)。
 > API キーの取得先: [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM)
 > Web 検索は **任意** です - 無料の [Tavily API](https://tavily.com) (月 1000 クエリ無料) または [Brave Search API](https://brave.com/search/api) (月 2000 クエリ無料)
 **1. 初期化**
@ -184,8 +191,14 @@ picoclaw onboard
 {
  "model_list": [
    {
-      "model_name": "gpt4",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key",
      "api_base":"https://ark.cn-beijing.volces.com/api/coding/v3"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key",
      "request_timeout": 300,
      "api_base": "https://api.openai.com/v1"
@ -193,7 +206,7 @@ picoclaw onboard
  ],
  "agents": {
    "defaults": {
-      "model_name": "gpt4"
+      "model_name": "gpt-5.4"
    }
  },
  "channels": {
@ -205,6 +218,9 @@ picoclaw onboard
  },
  "tools": {
    "web": {
      "enabled": true,
      "fetch_limit_bytes": 10485760,
      "format": "plaintext",
      "search": {
        "api_key": "YOUR_BRAVE_API_KEY",
        "max_results": 5
@ -610,7 +626,6 @@ PicoClaw は設定されたワークスペース（デフォルト: `~/.picoclaw
 ├── HEARTBEAT.md       # 定期タスクプロンプト（30分ごとに確認）
 ├── IDENTITY.md        # エージェントのアイデンティティ
 ├── SOUL.md            # エージェントのソウル
 ├── TOOLS.md           # ツールの説明
 └── USER.md            # ユーザー設定
 ```
@ -791,6 +806,7 @@ HEARTBEAT_OK 応答         ユーザーが直接結果を受け取る
 | --- | --- | --- |
 | `gemini` | LLM（Gemini 直接） | [aistudio.google.com](https://aistudio.google.com) |
 | `zhipu` | LLM（Zhipu 直接） | [bigmodel.cn](https://bigmodel.cn) |
 | `volcengine`             | LLM(Volcengine 直接)                   | [volcengine.com](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw)           |
 | `openrouter`（要テスト） | LLM（推奨、全モデルにアクセス可能） | [openrouter.ai](https://openrouter.ai) |
 | `anthropic`（要テスト） | LLM（Claude 直接） | [console.anthropic.com](https://console.anthropic.com) |
 | `openai`（要テスト） | LLM（GPT 直接） | [platform.openai.com](https://platform.openai.com) |
@ -919,9 +935,12 @@ HEARTBEAT_OK 応答         ユーザーが直接結果を受け取る
 | **OpenRouter** | `openrouter/` | `https://openrouter.ai/api/v1` | OpenAI | [キーを取得](https://openrouter.ai/keys) |
 | **VLLM** | `vllm/` | `http://localhost:8000/v1` | OpenAI | ローカル |
 | **Cerebras** | `cerebras/` | `https://api.cerebras.ai/v1` | OpenAI | [キーを取得](https://cerebras.ai) |
-| **Volcengine** | `volcengine/` | `https://ark.cn-beijing.volces.com/api/v3` | OpenAI | [キーを取得](https://console.volcengine.com) |
+| **VolcEngine (Doubao)** | `volcengine/` | `https://ark.cn-beijing.volces.com/api/v3` | OpenAI | [キーを取得](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw) |
 | **ShengsuanYun** | `shengsuanyun/` | `https://router.shengsuanyun.com/api/v1` | OpenAI | - |
 | **BytePlus**        | `byteplus/`       | `https://ark.ap-southeast.bytepluses.com/api/v3`    | OpenAI    | [キーを取得](https://www.byteplus.com)                     |
 | **LongCat**         | `longcat/`        | `https://api.longcat.chat/openai`                   | OpenAI    | [キーを取得](https://longcat.chat/platform)                      |
 | **ModelScope (魔搭)**| `modelscope/`    | `https://api-inference.modelscope.cn/v1`            | OpenAI    | [トークンを取得](https://modelscope.cn/my/tokens)                 |
 | **Azure OpenAI**    | `azure/`          | `https://{resource}.openai.azure.com`               | Azure     | [キーを取得](https://portal.azure.com)                            |
 | **Antigravity** | `antigravity/` | Google Cloud | カスタム | OAuthのみ |
 | **GitHub Copilot** | `github-copilot/` | `localhost:4321` | gRPC | - |
@ -931,8 +950,13 @@ HEARTBEAT_OK 応答         ユーザーが直接結果を受け取る
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key"
    },
    {
@ -948,7 +972,7 @@ HEARTBEAT_OK 応答         ユーザーが直接結果を受け取る
  ],
  "agents": {
    "defaults": {
-      "model": "gpt-5.2"
+      "model": "gpt-5.4"
    }
  }
 }
@ -959,8 +983,17 @@ HEARTBEAT_OK 応答         ユーザーが直接結果を受け取る
 **OpenAI**
 ```json
 {
-  "model_name": "gpt-5.2",
+  "model_name": "gpt-5.4",
-  "model": "openai/gpt-5.2",
+  "model": "openai/gpt-5.4",
  "api_key": "sk-..."
 }
 ```
 **VolcEngine (Doubao)**
 ```json
 {
  "model_name": "ark-code-latest",
  "model": "volcengine/ark-code-latest",
  "api_key": "sk-..."
 }
 ```
@ -1003,14 +1036,14 @@ HEARTBEAT_OK 応答         ユーザーが直接結果を受け取る
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api1.example.com/v1",
      "api_key": "sk-key1"
    },
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api2.example.com/v1",
      "api_key": "sk-key2"
    }
@ -1121,9 +1154,17 @@ Web 検索を有効にするには：
 | サービス | 無料枠 | ユースケース |
 |---------|--------|------------|
 | **OpenRouter** | 月 200K トークン | 複数モデル（Claude, GPT-4 など） |
-| **Zhipu** | 月 200K トークン | 中国ユーザー向け最適 |
+| **Volcengine CodingPlan** | 9.9元/初月 | 中国ユーザーに最適、複数のSOTAモデル（Doubao、DeepSeek等） |
 | **Zhipu** | 月 200K トークン | 中国ユーザーに適している |
 | **Qwen** | 無料枠あり | 通義千問 (Qwen) |
 | **Brave Search** | 月 2000 クエリ | Web 検索機能 |
 | **Tavily** | 月 1000 クエリ | AI エージェント検索最適化 |
 | **Groq** | 無料枠あり | 高速推論（Llama, Mixtral） |
 | **Cerebras** | 無料枠あり | 高速推論（Llama, Qwen など） |
 | **ModelScope** | 1 日 2000 リクエスト | 無料推論（Qwen, GLM, DeepSeek など） |
 ---
 <div align="center">
  <img src="assets/logo.jpg" alt="PicoClaw Meme" width="512">
 </div>
--- a/README.md
+++ b/README.md
@ -1,18 +1,19 @@
 <div align="center">
-  <img src="assets/logo.jpg" alt="PicoClaw" width="512">
+  <img src="assets/logo.webp" alt="PicoClaw" width="512">
  <h1>PicoClaw: Ultra-Efficient AI Assistant in Go</h1>
  <h3>$10 Hardware · 10MB RAM · 1s Boot · 皮皮虾，我们走！</h3>
  <p>
    <img src="https://img.shields.io/badge/Go-1.21+-00ADD8?style=flat&logo=go&logoColor=white" alt="Go">
    <img src="https://img.shields.io/badge/Arch-x86__64%2C%20ARM64%2C%20MIPS%2C%20RISC--V-blue" alt="Hardware">
    <img src="https://img.shields.io/badge/license-MIT-green" alt="License">
    <br>
    <a href="https://picoclaw.io"><img src="https://img.shields.io/badge/Website-picoclaw.io-blue?style=flat&logo=google-chrome&logoColor=white" alt="Website"></a>
-    <a href="https://x.com/SipeedIO"><img src="https://img.shields.io/badge/X_(Twitter)-SipeedIO-black?style=flat&logo=x&logoColor=white" alt="Twitter"></a>
+    <a href="https://docs.picoclaw.io/"><img src="https://img.shields.io/badge/Docs-Official-007acc?style=flat&logo=read-the-docs&logoColor=white" alt="Docs"></a>
    <a href="https://deepwiki.com/sipeed/picoclaw"><img src="https://img.shields.io/badge/Wiki-DeepWiki-FFA500?style=flat&logo=wikipedia&logoColor=white" alt="Wiki"></a>
    <br>
    <a href="https://x.com/SipeedIO"><img src="https://img.shields.io/badge/X_(Twitter)-SipeedIO-black?style=flat&logo=x&logoColor=white" alt="Twitter"></a>
    <a href="./assets/wechat.png"><img src="https://img.shields.io/badge/WeChat-Group-41d56b?style=flat&logo=wechat&logoColor=white"></a>
    <a href="https://discord.gg/V4sAZ9XWpN"><img src="https://img.shields.io/badge/Discord-Community-4c60eb?style=flat&logo=discord&logoColor=white" alt="Discord"></a>
  </p>
@ -23,7 +24,9 @@
 ---
-🦐 PicoClaw is an ultra-lightweight personal AI Assistant inspired by [nanobot](https://github.com/HKUDS/nanobot), refactored from the ground up in Go through a self-bootstrapping process, where the AI agent itself drove the entire architectural migration and code optimization.
+> **PicoClaw** is an independent open-source project initiated by [Sipeed](https://sipeed.com). It is written entirely in **Go** — not a fork of OpenClaw, NanoBot, or any other project.
 🦐 PicoClaw is an ultra-lightweight personal AI Assistant inspired by [NanoBot](https://github.com/HKUDS/nanobot), refactored from the ground up in Go through a self-bootstrapping process, where the AI agent itself drove the entire architectural migration and code optimization.
 ⚡️ Runs on $10 hardware with <10MB RAM: That's 99% less memory than OpenClaw and 98% cheaper than a Mac mini!
@ -227,9 +230,7 @@ docker compose -f docker/docker-compose.yml --profile gateway up -d
 ### 🚀 Quick Start
 > [!TIP]
-> Set your API key in `~/.picoclaw/config.json`.
+> Set your API Key in `~/.picoclaw/config.json`. Get API Keys: [Volcengine (CodingPlan)](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw) (LLM) · [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM). Web search is optional — get a free [Tavily API](https://tavily.com) (1000 free queries/month) or [Brave Search API](https://brave.com/search/api) (2000 free queries/month).
 > Get API keys: [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM)
 > Web Search is **optional** - get free [Tavily API](https://tavily.com) (1000 free queries/month), [SearXNG](https://github.com/searxng/searxng) (free, self-hosted) or [Brave Search API](https://brave.com/search/api) (2000 free queries/month) or use built-in auto fallback.
 **1. Initialize**
@ -244,7 +245,7 @@ picoclaw onboard
  "agents": {
    "defaults": {
      "workspace": "~/.picoclaw/workspace",
-      "model_name": "gpt4",
+      "model_name": "gpt-5.4",
      "max_tokens": 8192,
      "temperature": 0.7,
      "max_tool_iterations": 20
@ -252,8 +253,14 @@ picoclaw onboard
  },
  "model_list": [
    {
-      "model_name": "gpt4",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key",
      "api_base":"https://ark.cn-beijing.volces.com/api/coding/v3"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "your-api-key",
      "request_timeout": 300
    },
@ -265,6 +272,9 @@ picoclaw onboard
  ],
  "tools": {
    "web": {
      "enabled": true,
      "fetch_limit_bytes": 10485760,
      "format": "plaintext",
      "brave": {
        "enabled": false,
        "api_key": "YOUR_BRAVE_API_KEY",
@ -787,7 +797,6 @@ PicoClaw stores data in your configured workspace (default: `~/.picoclaw/workspa
 ├── HEARTBEAT.md      # Periodic task prompts (checked every 30 min)
 ├── IDENTITY.md       # Agent identity
 ├── SOUL.md           # Agent soul
 ├── TOOLS.md          # Tool descriptions
 └── USER.md           # User preferences
 ```
@ -857,6 +866,21 @@ Even with `restrict_to_workspace: false`, the `exec` tool blocks these dangerous
 * `shutdown`, `reboot`, `poweroff` — System shutdown
 * Fork bomb `:(){ :|:& };:`
 #### Known Limitation: Child Processes From Build Tools
 The exec safety guard only inspects the command line PicoClaw launches directly. It does not recursively inspect child
 processes spawned by allowed developer tools such as `make`, `go run`, `cargo`, `npm run`, or custom build scripts.
 That means a top-level command can still compile or launch other binaries after it passes the initial guard check. In
 practice, treat build scripts, Makefiles, package scripts, and generated binaries as executable code that needs the same
 level of review as a direct shell command.
 For higher-risk environments:
 * Review build scripts before execution.
 * Prefer approval/manual review for compile-and-run workflows.
 * Run PicoClaw inside a container or VM if you need stronger isolation than the built-in guard provides.
 #### Error Examples
 ```
@ -990,17 +1014,19 @@ The subagent has access to tools (message, web_search, etc.) and can communicate
 > Groq provides free voice transcription via Whisper. If configured, audio messages from any channel will be automatically transcribed at the agent level.
 | Provider     | Purpose                                 | Get API Key                                                  |
-| -------------------------- | --------------------------------------- | -------------------------------------------------------------------- |
+| ------------ | --------------------------------------- | ------------------------------------------------------------ |
 | `gemini`     | LLM (Gemini direct)                     | [aistudio.google.com](https://aistudio.google.com)           |
 | `zhipu`      | LLM (Zhipu direct)                      | [bigmodel.cn](https://bigmodel.cn)                           |
-| `openrouter(To be tested)` | LLM (recommended, access to all models) | [openrouter.ai](https://openrouter.ai)                               |
+| `volcengine` | LLM(Volcengine direct)                  | [volcengine.com](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw)                 |
-| `anthropic(To be tested)`  | LLM (Claude direct)                     | [console.anthropic.com](https://console.anthropic.com)               |
+| `openrouter` | LLM (recommended, access to all models) | [openrouter.ai](https://openrouter.ai)                       |
-| `openai(To be tested)`     | LLM (GPT direct)                        | [platform.openai.com](https://platform.openai.com)                   |
+| `anthropic`  | LLM (Claude direct)                     | [console.anthropic.com](https://console.anthropic.com)       |
-| `deepseek(To be tested)`   | LLM (DeepSeek direct)                   | [platform.deepseek.com](https://platform.deepseek.com)               |
+| `openai`     | LLM (GPT direct)                        | [platform.openai.com](https://platform.openai.com)           |
 | `deepseek`   | LLM (DeepSeek direct)                   | [platform.deepseek.com](https://platform.deepseek.com)       |
 | `qwen`       | LLM (Qwen direct)                       | [dashscope.console.aliyun.com](https://dashscope.console.aliyun.com) |
 | `groq`       | LLM + **Voice transcription** (Whisper) | [console.groq.com](https://console.groq.com)                 |
 | `cerebras`   | LLM (Cerebras direct)                   | [cerebras.ai](https://cerebras.ai)                           |
 | `vivgrid`    | LLM (Vivgrid direct)                    | [vivgrid.com](https://vivgrid.com)                           |
 | `azure`      | LLM (Azure OpenAI)                      | [portal.azure.com](https://portal.azure.com)                 |
 ### Model Configuration (model_list)
@ -1031,10 +1057,13 @@ This design also enables **multi-agent support** with flexible provider selectio
 | **LiteLLM Proxy**   | `litellm/`        | `http://localhost:4000/v1`                          | OpenAI    | Your LiteLLM proxy key                                            |
 | **VLLM**            | `vllm/`           | `http://localhost:8000/v1`                          | OpenAI    | Local                                                            |
 | **Cerebras**        | `cerebras/`       | `https://api.cerebras.ai/v1`                        | OpenAI    | [Get Key](https://cerebras.ai)                                   |
-| **火山引擎**        | `volcengine/`     | `https://ark.cn-beijing.volces.com/api/v3`          | OpenAI    | [Get Key](https://console.volcengine.com)                        |
+| **VolcEngine (Doubao)** | `volcengine/`     | `https://ark.cn-beijing.volces.com/api/v3`          | OpenAI    | [Get Key](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw)                        |
 | **神算云**          | `shengsuanyun/`   | `https://router.shengsuanyun.com/api/v1`            | OpenAI    | -                                                                |
 | **BytePlus**        | `byteplus/`       | `https://ark.ap-southeast.bytepluses.com/api/v3`    | OpenAI    | [Get Key](https://www.byteplus.com)                        |
 | **Vivgrid**         | `vivgrid/`        | `https://api.vivgrid.com/v1`                        | OpenAI    | [Get Key](https://vivgrid.com)                                   |
 | **LongCat**         | `longcat/`        | `https://api.longcat.chat/openai`                   | OpenAI    | [Get Key](https://longcat.chat/platform)                         |
 | **ModelScope (魔搭)**| `modelscope/`    | `https://api-inference.modelscope.cn/v1`            | OpenAI    | [Get Token](https://modelscope.cn/my/tokens)                     |
 | **Azure OpenAI**    | `azure/`          | `https://{resource}.openai.azure.com`               | Azure     | [Get Key](https://portal.azure.com)                              |
 | **Antigravity**     | `antigravity/`    | Google Cloud                                        | Custom    | OAuth only                                                       |
 | **GitHub Copilot**  | `github-copilot/` | `localhost:4321`                                    | gRPC      | -                                                                |
@ -1044,8 +1073,13 @@ This design also enables **multi-agent support** with flexible provider selectio
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key"
    },
    {
@ -1061,7 +1095,7 @@ This design also enables **multi-agent support** with flexible provider selectio
  ],
  "agents": {
    "defaults": {
-      "model": "gpt-5.2"
+      "model": "gpt-5.4"
    }
  }
 }
@ -1073,8 +1107,18 @@ This design also enables **multi-agent support** with flexible provider selectio
 ```json
 {
-  "model_name": "gpt-5.2",
+  "model_name": "gpt-5.4",
-  "model": "openai/gpt-5.2",
+  "model": "openai/gpt-5.4",
  "api_key": "sk-..."
 }
 ```
 **VolcEngine (Doubao)**
 ```json
 {
  "model_name": "ark-code-latest",
  "model": "volcengine/ark-code-latest",
  "api_key": "sk-..."
 }
 ```
@ -1111,6 +1155,26 @@ This design also enables **multi-agent support** with flexible provider selectio
 > Run `picoclaw auth login --provider anthropic` to paste your API token.
 **Anthropic Messages API (native format)**
 For direct Anthropic API access or custom endpoints that only support Anthropic's native message format:
 ```json
 {
  "model_name": "claude-opus-4-6",
  "model": "anthropic-messages/claude-opus-4-6",
  "api_key": "sk-ant-your-key",
  "api_base": "https://api.anthropic.com"
 }
 ```
 > Use `anthropic-messages` protocol when:
 > - Using third-party proxies that only support Anthropic's native `/v1/messages` endpoint (not OpenAI-compatible `/v1/chat/completions`)
 > - Connecting to services like MiniMax, Synthetic that require Anthropic's native message format
 > - The existing `anthropic` protocol returns 404 errors (indicating the endpoint doesn't support OpenAI-compatible format)
 >
 > **Note:** The `anthropic` protocol uses OpenAI-compatible format (`/v1/chat/completions`), while `anthropic-messages` uses Anthropic's native format (`/v1/messages`). Choose based on your endpoint's supported format.
 **Ollama (local)**
 ```json
@ -1153,14 +1217,14 @@ Configure multiple endpoints for the same model name—PicoClaw will automatical
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api1.example.com/v1",
      "api_key": "sk-key1"
    },
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api2.example.com/v1",
      "api_key": "sk-key2"
    }
@ -1500,9 +1564,17 @@ This happens when another instance of the bot is running. Make sure only one `pi
 | Service          | Free Tier                | Use Case                              |
 | ---------------- | ------------------------ | ------------------------------------- |
 | **OpenRouter**   | 200K tokens/month        | Multiple models (Claude, GPT-4, etc.) |
-| **Zhipu**        | 200K tokens/month        | Best for Chinese users                |
+| **Volcengine CodingPlan** | ¥9.9/first month | Best for Chinese users, multiple SOTA models (Doubao, DeepSeek, etc.) |
 | **Zhipu**        | 200K tokens/month        | Suitable for Chinese users                |
 | **Brave Search** | Paid ($5/1000 queries)   | Web search functionality              |
 | **SearXNG**      | Unlimited (self-hosted)  | Privacy-focused metasearch (70+ engines) |
 | **Groq**         | Free tier available      | Fast inference (Llama, Mixtral)       |
 | **Cerebras**     | Free tier available      | Fast inference (Llama, Qwen, etc.)    |
 | **LongCat**      | Up to 5M tokens/day      | Fast inference (free tier)            |
 | **ModelScope**   | 2000 requests/day        | Free inference (Qwen, GLM, DeepSeek, etc.) |
 ---
 <div align="center">
  <img src="assets/logo.jpg" alt="PicoClaw Meme" width="512">
 </div>
--- a/README.pt-br.md
+++ b/README.pt-br.md
@ -1,17 +1,21 @@
 <div align="center">
-<img src="assets/logo.jpg" alt="PicoClaw" width="512">
+<img src="assets/logo.webp" alt="PicoClaw" width="512">
 <h1>PicoClaw: Assistente de IA Ultra-Eficiente em Go</h1>
 <h3>Hardware de $10 · 10MB de RAM · Boot em 1s · 皮皮虾，我们走！</h3>
  <p>
    <img src="https://img.shields.io/badge/Go-1.21+-00ADD8?style=flat&logo=go&logoColor=white" alt="Go">
    <img src="https://img.shields.io/badge/Arch-x86__64%2C%20ARM64%2C%20MIPS%2C%20RISC--V-blue" alt="Hardware">
    <img src="https://img.shields.io/badge/license-MIT-green" alt="License">
    <br>
    <a href="https://picoclaw.io"><img src="https://img.shields.io/badge/Website-picoclaw.io-blue?style=flat&logo=google-chrome&logoColor=white" alt="Website"></a>
    <a href="https://docs.picoclaw.io/"><img src="https://img.shields.io/badge/Docs-Official-007acc?style=flat&logo=read-the-docs&logoColor=white" alt="Docs"></a>
    <a href="https://deepwiki.com/sipeed/picoclaw"><img src="https://img.shields.io/badge/Wiki-DeepWiki-FFA500?style=flat&logo=wikipedia&logoColor=white" alt="Wiki"></a>
    <br>
    <a href="https://x.com/SipeedIO"><img src="https://img.shields.io/badge/X_(Twitter)-SipeedIO-black?style=flat&logo=x&logoColor=white" alt="Twitter"></a>
    <a href="./assets/wechat.png"><img src="https://img.shields.io/badge/WeChat-Group-41d56b?style=flat&logo=wechat&logoColor=white"></a>
    <a href="https://discord.gg/V4sAZ9XWpN"><img src="https://img.shields.io/badge/Discord-Community-4c60eb?style=flat&logo=discord&logoColor=white" alt="Discord"></a>
  </p>
 [中文](README.zh.md) | [日本語](README.ja.md) | **Português** | [Tiếng Việt](README.vi.md) | [Français](README.fr.md) | [English](README.md)
@ -19,7 +23,9 @@
 ---
-🦐 **PicoClaw** é um assistente pessoal de IA ultra-leve inspirado no [nanobot](https://github.com/HKUDS/nanobot), reescrito do zero em **Go** por meio de um processo de "auto-inicialização" (self-bootstrapping) — onde o próprio agente de IA conduziu toda a migração de arquitetura e otimização de código.
+> **PicoClaw** é um projeto open-source independente iniciado pela [Sipeed](https://sipeed.com). É escrito inteiramente em **Go** — não é um fork do OpenClaw, NanoBot ou qualquer outro projeto.
 🦐 **PicoClaw** é um assistente pessoal de IA ultra-leve inspirado no [NanoBot](https://github.com/HKUDS/nanobot), reescrito do zero em **Go** por meio de um processo de "auto-inicialização" (self-bootstrapping) — onde o próprio agente de IA conduziu toda a migração de arquitetura e otimização de código.
 ⚡️ **Extremamente leve:** Roda em hardware de apenas **$10** com **<10MB** de RAM. Isso é 99% menos memória que o OpenClaw e 98% mais barato que um Mac mini!
@ -207,9 +213,7 @@ docker compose -f docker/docker-compose.yml --profile gateway up -d
 ### 🚀 Início Rápido
 > [!TIP]
-> Configure sua API key em `~/.picoclaw/config.json`.
+> Configure sua API key em `~/.picoclaw/config.json`. Obtenha API keys: [Volcengine (CodingPlan)](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw) (LLM) · [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM). Busca web é **opcional** — obtenha a [API Tavily](https://tavily.com) gratuita (1000 consultas grátis/mês) ou a [Brave Search API](https://brave.com/search/api) (2000 consultas grátis/mês).
 > Obtenha API keys: [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM)
 > Busca web e **opcional** — obtenha a [Brave Search API](https://brave.com/search/api) gratuita (2000 consultas grátis/mês) ou use o fallback automático integrado.
 **1. Inicializar**
@ -223,8 +227,14 @@ picoclaw onboard
 {
  "model_list": [
    {
-      "model_name": "gpt4",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key",
      "api_base":"https://ark.cn-beijing.volces.com/api/coding/v3"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key",
      "request_timeout": 300,
      "api_base": "https://api.openai.com/v1"
@ -232,11 +242,14 @@ picoclaw onboard
  ],
  "agents": {
    "defaults": {
-      "model_name": "gpt4"
+      "model_name": "gpt-5.4"
    }
  },
  "tools": {
    "web": {
      "enabled": true,
      "fetch_limit_bytes": 10485760,
      "format": "plaintext",
      "brave": {
        "enabled": false,
        "api_key": "YOUR_BRAVE_API_KEY",
@ -645,7 +658,6 @@ O PicoClaw armazena dados no workspace configurado (padrão: `~/.picoclaw/worksp
 ├── HEARTBEAT.md       # Prompts de tarefas periodicas (verificado a cada 30 min)
 ├── IDENTITY.md        # Identidade do Agente
 ├── SOUL.md            # Alma do Agente
 ├── TOOLS.md           # Descrição das ferramentas
 └── USER.md            # Preferencias do usuario
 ```
@ -829,6 +841,7 @@ O subagente tem acesso às ferramentas (message, web_search, etc.) e pode se com
 | --- | --- | --- |
 | `gemini` | LLM (Gemini direto) | [aistudio.google.com](https://aistudio.google.com) |
 | `zhipu` | LLM (Zhipu direto) | [bigmodel.cn](bigmodel.cn) |
 | `volcengine`             | LLM(Volcengine direto)                   | [volcengine.com](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw)           |
 | `openrouter` (Em teste) | LLM (recomendado, acesso a todos os modelos) | [openrouter.ai](https://openrouter.ai) |
 | `anthropic` (Em teste) | LLM (Claude direto) | [console.anthropic.com](https://console.anthropic.com) |
 | `openai` (Em teste) | LLM (GPT direto) | [platform.openai.com](https://platform.openai.com) |
@ -974,9 +987,12 @@ Este design também possibilita o **suporte multi-agent** com seleção flexíve
 | **OpenRouter** | `openrouter/` | `https://openrouter.ai/api/v1` | OpenAI | [Obter Chave](https://openrouter.ai/keys) |
 | **VLLM** | `vllm/` | `http://localhost:8000/v1` | OpenAI | Local |
 | **Cerebras** | `cerebras/` | `https://api.cerebras.ai/v1` | OpenAI | [Obter Chave](https://cerebras.ai) |
-| **Volcengine** | `volcengine/` | `https://ark.cn-beijing.volces.com/api/v3` | OpenAI | [Obter Chave](https://console.volcengine.com) |
+| **VolcEngine (Doubao)** | `volcengine/` | `https://ark.cn-beijing.volces.com/api/v3` | OpenAI | [Obter Chave](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw) |
 | **ShengsuanYun** | `shengsuanyun/` | `https://router.shengsuanyun.com/api/v1` | OpenAI | - |
 | **BytePlus**        | `byteplus/`       | `https://ark.ap-southeast.bytepluses.com/api/v3`    | OpenAI    | [Obter Chave](https://www.byteplus.com)                    |
 | **LongCat**         | `longcat/`        | `https://api.longcat.chat/openai`                   | OpenAI    | [Obter Chave](https://longcat.chat/platform)                     |
 | **ModelScope (魔搭)**| `modelscope/`    | `https://api-inference.modelscope.cn/v1`            | OpenAI    | [Obter Token](https://modelscope.cn/my/tokens)                   |
 | **Azure OpenAI**    | `azure/`          | `https://{resource}.openai.azure.com`               | Azure     | [Obter Chave](https://portal.azure.com)                          |
 | **Antigravity** | `antigravity/` | Google Cloud | Custom | Apenas OAuth |
 | **GitHub Copilot** | `github-copilot/` | `localhost:4321` | gRPC | - |
@ -986,8 +1002,13 @@ Este design também possibilita o **suporte multi-agent** com seleção flexíve
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key"
    },
    {
@ -1003,7 +1024,7 @@ Este design também possibilita o **suporte multi-agent** com seleção flexíve
  ],
  "agents": {
    "defaults": {
-      "model": "gpt-5.2"
+      "model": "gpt-5.4"
    }
  }
 }
@ -1014,8 +1035,17 @@ Este design também possibilita o **suporte multi-agent** com seleção flexíve
 **OpenAI**
 ```json
 {
-  "model_name": "gpt-5.2",
+  "model_name": "gpt-5.4",
-  "model": "openai/gpt-5.2",
+  "model": "openai/gpt-5.4",
  "api_key": "sk-..."
 }
 ```
 **VolcEngine (Doubao)**
 ```json
 {
  "model_name": "ark-code-latest",
  "model": "volcengine/ark-code-latest",
  "api_key": "sk-..."
 }
 ```
@ -1058,14 +1088,14 @@ Configure vários endpoints para o mesmo nome de modelo—PicoClaw fará round-r
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api1.example.com/v1",
      "api_key": "sk-key1"
    },
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api2.example.com/v1",
      "api_key": "sk-key2"
    }
@ -1197,7 +1227,15 @@ Isso acontece quando outra instância do bot está em execução. Certifique-se
 | Serviço | Plano Gratuito | Caso de Uso |
 | --- | --- | --- |
 | **OpenRouter** | 200K tokens/mês | Múltiplos modelos (Claude, GPT-4, etc.) |
-| **Zhipu** | 200K tokens/mês | Melhor para usuários chineses |
+| **Volcengine CodingPlan** | ¥9,9/primeiro mês | Ideal para usuários chineses, múltiplos modelos SOTA (Doubao, DeepSeek, etc.) |
 | **Zhipu** | 200K tokens/mês | Adequado para usuários chineses |
 | **Brave Search** | 2000 consultas/mês | Funcionalidade de busca web |
 | **Groq** | Plano gratuito disponível | Inferência ultra-rápida (Llama, Mixtral) |
 | **Cerebras** | Plano gratuito disponível | Inferência ultra-rápida (Llama 3.3 70B) |
 | **ModelScope** | 2000 requisições/dia | Inferência gratuita (Qwen, GLM, DeepSeek, etc.) |
 ---
 <div align="center">
  <img src="assets/logo.jpg" alt="PicoClaw Meme" width="512">
 </div>
--- a/README.vi.md
+++ b/README.vi.md
@ -1,17 +1,21 @@
 <div align="center">
-<img src="assets/logo.jpg" alt="PicoClaw" width="512">
+<img src="assets/logo.webp" alt="PicoClaw" width="512">
 <h1>PicoClaw: Trợ lý AI Siêu Nhẹ viết bằng Go</h1>
 <h3>Phần cứng $10 · RAM 10MB · Khởi động 1 giây · Nào, xuất phát!</h3>
  <p>
    <img src="https://img.shields.io/badge/Go-1.21+-00ADD8?style=flat&logo=go&logoColor=white" alt="Go">
    <img src="https://img.shields.io/badge/Arch-x86__64%2C%20ARM64%2C%20MIPS%2C%20RISC--V-blue" alt="Hardware">
    <img src="https://img.shields.io/badge/license-MIT-green" alt="License">
    <br>
    <a href="https://picoclaw.io"><img src="https://img.shields.io/badge/Website-picoclaw.io-blue?style=flat&logo=google-chrome&logoColor=white" alt="Website"></a>
    <a href="https://docs.picoclaw.io/"><img src="https://img.shields.io/badge/Docs-Official-007acc?style=flat&logo=read-the-docs&logoColor=white" alt="Docs"></a>
    <a href="https://deepwiki.com/sipeed/picoclaw"><img src="https://img.shields.io/badge/Wiki-DeepWiki-FFA500?style=flat&logo=wikipedia&logoColor=white" alt="Wiki"></a>
    <br>
    <a href="https://x.com/SipeedIO"><img src="https://img.shields.io/badge/X_(Twitter)-SipeedIO-black?style=flat&logo=x&logoColor=white" alt="Twitter"></a>
    <a href="./assets/wechat.png"><img src="https://img.shields.io/badge/WeChat-Group-41d56b?style=flat&logo=wechat&logoColor=white"></a>
    <a href="https://discord.gg/V4sAZ9XWpN"><img src="https://img.shields.io/badge/Discord-Community-4c60eb?style=flat&logo=discord&logoColor=white" alt="Discord"></a>
  </p>
 [中文](README.zh.md) | [日本語](README.ja.md) | [Português](README.pt-br.md) | **Tiếng Việt** | [Français](README.fr.md) | [English](README.md)
@ -19,7 +23,9 @@
 ---
-🦐 **PicoClaw** là trợ lý AI cá nhân siêu nhẹ, lấy cảm hứng từ [nanobot](https://github.com/HKUDS/nanobot), được viết lại hoàn toàn bằng **Go** thông qua quá trình "tự khởi tạo" (self-bootstrapping) — nơi chính AI Agent đã tự dẫn dắt toàn bộ quá trình chuyển đổi kiến trúc và tối ưu hóa mã nguồn.
+> **PicoClaw** là dự án mã nguồn mở độc lập được khởi xướng bởi [Sipeed](https://sipeed.com). Được viết hoàn toàn bằng **Go** — không phải là bản fork của OpenClaw, NanoBot hay bất kỳ dự án nào khác.
 🦐 **PicoClaw** là trợ lý AI cá nhân siêu nhẹ, lấy cảm hứng từ [NanoBot](https://github.com/HKUDS/nanobot), được viết lại hoàn toàn bằng **Go** thông qua quá trình "tự khởi tạo" (self-bootstrapping) — nơi chính AI Agent đã tự dẫn dắt toàn bộ quá trình chuyển đổi kiến trúc và tối ưu hóa mã nguồn.
 ⚡️ **Cực kỳ nhẹ:** Chạy trên phần cứng chỉ **$10** với RAM **<10MB**. Tiết kiệm 99% bộ nhớ so với OpenClaw và rẻ hơn 98% so với Mac mini!
@ -187,9 +193,7 @@ docker compose -f docker/docker-compose.yml --profile gateway up -d
 ### 🚀 Bắt đầu nhanh
 > [!TIP]
-> Thiết lập API key trong `~/.picoclaw/config.json`.
+> Thiết lập API key trong `~/.picoclaw/config.json`. Lấy API key: [Volcengine (CodingPlan)](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw) (LLM) · [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM). Tìm kiếm web là **tùy chọn** — lấy [Tavily API](https://tavily.com) miễn phí (1000 truy vấn/tháng) hoặc [Brave Search API](https://brave.com/search/api) (2000 truy vấn/tháng).
 > Lấy API key: [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM)
 > Tìm kiếm web là **tùy chọn** — lấy [Brave Search API](https://brave.com/search/api) miễn phí (2000 truy vấn/tháng) hoặc dùng tính năng auto fallback tích hợp sẵn.
 **1. Khởi tạo**
@ -203,8 +207,14 @@ picoclaw onboard
 {
  "model_list": [
    {
-      "model_name": "gpt4",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key",
      "api_base":"https://ark.cn-beijing.volces.com/api/coding/v3"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key",
      "request_timeout": 300,
      "api_base": "https://api.openai.com/v1"
@ -617,7 +627,6 @@ PicoClaw lưu trữ dữ liệu trong workspace đã cấu hình (mặc định:
 ├── HEARTBEAT.md      # Prompt tác vụ định kỳ (kiểm tra mỗi 30 phút)
 ├── IDENTITY.md       # Danh tính Agent
 ├── SOUL.md           # Tâm hồn/Tính cách Agent
 ├── TOOLS.md          # Mô tả công cụ
 └── USER.md           # Tùy chọn người dùng
 ```
@ -801,6 +810,7 @@ Subagent có quyền truy cập các công cụ (message, web_search, v.v.) và
 | --- | --- | --- |
 | `gemini` | LLM (Gemini trực tiếp) | [aistudio.google.com](https://aistudio.google.com) |
 | `zhipu` | LLM (Zhipu trực tiếp) | [bigmodel.cn](bigmodel.cn) |
 | `volcengine`             | LLM(Volcengine trực tiếp)                   | [volcengine.com](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw)           |
 | `openrouter` (Đang thử nghiệm) | LLM (khuyên dùng, truy cập mọi model) | [openrouter.ai](https://openrouter.ai) |
 | `anthropic` (Đang thử nghiệm) | LLM (Claude trực tiếp) | [console.anthropic.com](https://console.anthropic.com) |
 | `openai` (Đang thử nghiệm) | LLM (GPT trực tiếp) | [platform.openai.com](https://platform.openai.com) |
@ -943,9 +953,12 @@ Thiết kế này cũng cho phép **hỗ trợ đa tác nhân** với lựa ch
 | **OpenRouter** | `openrouter/` | `https://openrouter.ai/api/v1` | OpenAI | [Lấy Khóa](https://openrouter.ai/keys) |
 | **VLLM** | `vllm/` | `http://localhost:8000/v1` | OpenAI | Local |
 | **Cerebras** | `cerebras/` | `https://api.cerebras.ai/v1` | OpenAI | [Lấy Khóa](https://cerebras.ai) |
-| **Volcengine** | `volcengine/` | `https://ark.cn-beijing.volces.com/api/v3` | OpenAI | [Lấy Khóa](https://console.volcengine.com) |
+| **VolcEngine (Doubao)** | `volcengine/` | `https://ark.cn-beijing.volces.com/api/v3` | OpenAI | [Lấy Khóa](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw) |
 | **ShengsuanYun** | `shengsuanyun/` | `https://router.shengsuanyun.com/api/v1` | OpenAI | - |
 | **BytePlus**        | `byteplus/`       | `https://ark.ap-southeast.bytepluses.com/api/v3`    | OpenAI    | [Lấy Khóa](https://www.byteplus.com)                      |
 | **LongCat**         | `longcat/`        | `https://api.longcat.chat/openai`                   | OpenAI    | [Lấy Key](https://longcat.chat/platform)                        |
 | **ModelScope (魔搭)**| `modelscope/`    | `https://api-inference.modelscope.cn/v1`            | OpenAI    | [Lấy Token](https://modelscope.cn/my/tokens)                    |
 | **Azure OpenAI**    | `azure/`          | `https://{resource}.openai.azure.com`               | Azure     | [Lấy Khóa](https://portal.azure.com)                             |
 | **Antigravity** | `antigravity/` | Google Cloud | Tùy chỉnh | Chỉ OAuth |
 | **GitHub Copilot** | `github-copilot/` | `localhost:4321` | gRPC | - |
@ -955,8 +968,13 @@ Thiết kế này cũng cho phép **hỗ trợ đa tác nhân** với lựa ch
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key"
    },
    {
@ -972,7 +990,7 @@ Thiết kế này cũng cho phép **hỗ trợ đa tác nhân** với lựa ch
  ],
  "agents": {
    "defaults": {
-      "model": "gpt-5.2"
+      "model": "gpt-5.4"
    }
  }
 }
@ -983,8 +1001,17 @@ Thiết kế này cũng cho phép **hỗ trợ đa tác nhân** với lựa ch
 **OpenAI**
 ```json
 {
-  "model_name": "gpt-5.2",
+  "model_name": "gpt-5.4",
-  "model": "openai/gpt-5.2",
+  "model": "openai/gpt-5.4",
  "api_key": "sk-..."
 }
 ```
 **VolcEngine (Doubao)**
 ```json
 {
  "model_name": "ark-code-latest",
  "model": "volcengine/ark-code-latest",
  "api_key": "sk-..."
 }
 ```
@ -1027,14 +1054,14 @@ Thiết kế này cũng cho phép **hỗ trợ đa tác nhân** với lựa ch
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api1.example.com/v1",
      "api_key": "sk-key1"
    },
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api2.example.com/v1",
      "api_key": "sk-key2"
    }
@ -1166,6 +1193,14 @@ Một số nhà cung cấp (như Zhipu) có bộ lọc nội dung nghiêm ngặt
 | Dịch vụ | Gói miễn phí | Trường hợp sử dụng |
 | --- | --- | --- |
 | **OpenRouter** | 200K tokens/tháng | Đa model (Claude, GPT-4, v.v.) |
-| **Zhipu** | 200K tokens/tháng | Tốt nhất cho người dùng Trung Quốc |
+| **Volcengine CodingPlan** | ¥9.9/tháng đầu | Tốt nhất cho người dùng Trung Quốc, nhiều mô hình SOTA (Doubao, DeepSeek, v.v.) |
 | **Zhipu** | 200K tokens/tháng | Phù hợp cho người dùng Trung Quốc |
 | **Brave Search** | 2000 truy vấn/tháng | Chức năng tìm kiếm web |
 | **Groq** | Có gói miễn phí | Suy luận siêu nhanh (Llama, Mixtral) |
 | **ModelScope** | 2000 yêu cầu/ngày | Suy luận miễn phí (Qwen, GLM, DeepSeek, v.v.) |
 ---
 <div align="center">
  <img src="assets/logo.jpg" alt="PicoClaw Meme" width="512">
 </div>
--- a/README.zh.md
+++ b/README.zh.md
@ -1,17 +1,21 @@
 <div align="center">
-<img src="assets/logo.jpg" alt="PicoClaw" width="512">
+<img src="assets/logo.webp" alt="PicoClaw" width="512">
 <h1>PicoClaw: 基于Go语言的超高效 AI 助手</h1>
 <h3>10$硬件 · 10MB内存 · 1秒启动 · 皮皮虾，我们走！</h3>
  <p>
    <img src="https://img.shields.io/badge/Go-1.21+-00ADD8?style=flat&logo=go&logoColor=white" alt="Go">
    <img src="https://img.shields.io/badge/Arch-x86__64%2C%20ARM64%2C%20MIPS%2C%20RISC--V-blue" alt="Hardware">
    <img src="https://img.shields.io/badge/license-MIT-green" alt="License">
    <br>
    <a href="https://picoclaw.io"><img src="https://img.shields.io/badge/Website-picoclaw.io-blue?style=flat&logo=google-chrome&logoColor=white" alt="Website"></a>
    <a href="https://docs.picoclaw.io/"><img src="https://img.shields.io/badge/Docs-Official-007acc?style=flat&logo=read-the-docs&logoColor=white" alt="Docs"></a>
    <a href="https://deepwiki.com/sipeed/picoclaw"><img src="https://img.shields.io/badge/Wiki-DeepWiki-FFA500?style=flat&logo=wikipedia&logoColor=white" alt="Wiki"></a>
    <br>
    <a href="https://x.com/SipeedIO"><img src="https://img.shields.io/badge/X_(Twitter)-SipeedIO-black?style=flat&logo=x&logoColor=white" alt="Twitter"></a>
    <a href="./assets/wechat.png"><img src="https://img.shields.io/badge/WeChat-Group-41d56b?style=flat&logo=wechat&logoColor=white"></a>
    <a href="https://discord.gg/V4sAZ9XWpN"><img src="https://img.shields.io/badge/Discord-Community-4c60eb?style=flat&logo=discord&logoColor=white" alt="Discord"></a>
  </p>
 **中文** | [日本語](README.ja.md) | [Português](README.pt-br.md) | [Tiếng Việt](README.vi.md) | [Français](README.fr.md) | [English](README.md)
@ -20,7 +24,9 @@
 ---
-🦐 **PicoClaw** 是一个受 [nanobot](https://github.com/HKUDS/nanobot) 启发的超轻量级个人 AI 助手。它采用 **Go 语言** 从零重构，经历了一个“自举”过程——即由 AI Agent 自身驱动了整个架构迁移和代码优化。
+> **PicoClaw** 是由 [矽速科技 (Sipeed)](https://sipeed.com) 发起的独立开源项目，完全使用 **Go 语言**从零编写——不是 OpenClaw、NanoBot 或其他项目的分支。
 🦐 **PicoClaw** 是一个受 [NanoBot](https://github.com/HKUDS/nanobot) 启发的超轻量级个人 AI 助手。它采用 **Go 语言** 从零重构，经历了一个“自举”过程——即由 AI Agent 自身驱动了整个架构迁移和代码优化。
 ⚡️ **极致轻量**：可在 **10 美元** 的硬件上运行，内存占用 **<10MB**。这意味着比 OpenClaw 节省 99% 的内存，比 Mac mini 便宜 98%！
@ -208,9 +214,7 @@ docker compose -f docker/docker-compose.yml --profile gateway up -d
 ### 🚀 快速开始
 > [!TIP]
-> 在 `~/.picoclaw/config.json` 中设置您的 API Key。
+> 在 `~/.picoclaw/config.json` 中设置您的 API Key。获取 API Key: [火山引擎 (CodingPlan)](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw) (LLM) · [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu (智谱)](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM)。网络搜索是 **可选的** — 获取免费的 [Tavily API](https://tavily.com) (每月 1000 次免费查询) 或 [Brave Search API](https://brave.com/search/api) (每月 2000 次免费查询)。
 > 获取 API Key: [OpenRouter](https://openrouter.ai/keys) (LLM) · [Zhipu (智谱)](https://open.bigmodel.cn/usercenter/proj-mgmt/apikeys) (LLM)
 > 网络搜索是 **可选的** - 获取免费的 [Tavily API](https://tavily.com) (每月 1000 次免费查询) 或 [Brave Search API](https://brave.com/search/api) (每月 2000 次免费查询)
 **1. 初始化 (Initialize)**
@ -226,7 +230,7 @@ picoclaw onboard
  "agents": {
    "defaults": {
      "workspace": "~/.picoclaw/workspace",
-      "model_name": "gpt4",
+      "model_name": "gpt-5.4",
      "max_tokens": 8192,
      "temperature": 0.7,
      "max_tool_iterations": 20
@ -234,8 +238,14 @@ picoclaw onboard
  },
  "model_list": [
    {
-      "model_name": "gpt4",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key",
      "api_base":"https://ark.cn-beijing.volces.com/api/coding/v3"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "your-api-key",
      "request_timeout": 300
    },
@ -247,6 +257,9 @@ picoclaw onboard
  ],
  "tools": {
    "web": {
      "enabled": true,
      "fetch_limit_bytes": 10485760,
      "format": "plaintext",
      "brave": {
        "enabled": false,
        "api_key": "YOUR_BRAVE_API_KEY",
@ -365,7 +378,6 @@ PicoClaw 将数据存储在您配置的工作区中（默认：`~/.picoclaw/work
 ├── HEARTBEAT.md      # 周期性任务提示词 (每 30 分钟检查一次)
 ├── IDENTITY.md       # Agent 身份设定
 ├── SOUL.md           # Agent 灵魂/性格
 ├── TOOLS.md          # 工具描述
 └── USER.md           # 用户偏好
 ```
@ -479,10 +491,11 @@ Agent 读取 HEARTBEAT.md
 | -------------------- | ---------------------------- | -------------------------------------------------------------------- |
 | `gemini`             | LLM (Gemini 直连)            | [aistudio.google.com](https://aistudio.google.com)                   |
 | `zhipu`              | LLM (智谱直连)               | [bigmodel.cn](bigmodel.cn)                                           |
-| `openrouter(待测试)` | LLM (推荐，可访问所有模型)   | [openrouter.ai](https://openrouter.ai)                               |
+| `volcengine` | LLM (火山引擎直连)                  | [volcengine.com](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw)                 |
-| `anthropic(待测试)`  | LLM (Claude 直连)            | [console.anthropic.com](https://console.anthropic.com)               |
+| `openrouter` | LLM (推荐，可访问所有模型)   | [openrouter.ai](https://openrouter.ai)                               |
-| `openai(待测试)`     | LLM (GPT 直连)               | [platform.openai.com](https://platform.openai.com)                   |
+| `anthropic`  | LLM (Claude 直连)            | [console.anthropic.com](https://console.anthropic.com)               |
-| `deepseek(待测试)`   | LLM (DeepSeek 直连)          | [platform.deepseek.com](https://platform.deepseek.com)               |
+| `openai`     | LLM (GPT 直连)               | [platform.openai.com](https://platform.openai.com)                   |
 | `deepseek`   | LLM (DeepSeek 直连)          | [platform.deepseek.com](https://platform.deepseek.com)               |
 | `qwen`               | LLM (通义千问)               | [dashscope.console.aliyun.com](https://dashscope.console.aliyun.com) |
 | `groq`               | LLM + **语音转录** (Whisper) | [console.groq.com](https://console.groq.com)                         |
 | `cerebras`           | LLM (Cerebras 直连)          | [cerebras.ai](https://cerebras.ai)                                   |
@ -515,9 +528,12 @@ Agent 读取 HEARTBEAT.md
 | **OpenRouter**      | `openrouter/`     | `https://openrouter.ai/api/v1`                      | OpenAI    | [获取密钥](https://openrouter.ai/keys)                            |
 | **VLLM**            | `vllm/`           | `http://localhost:8000/v1`                          | OpenAI    | 本地                                                              |
 | **Cerebras**        | `cerebras/`       | `https://api.cerebras.ai/v1`                        | OpenAI    | [获取密钥](https://cerebras.ai)                                   |
-| **火山引擎**        | `volcengine/`     | `https://ark.cn-beijing.volces.com/api/v3`          | OpenAI    | [获取密钥](https://console.volcengine.com)                        |
+| **火山引擎（Doubao）**        | `volcengine/`     | `https://ark.cn-beijing.volces.com/api/v3`          | OpenAI    | [获取密钥](https://www.volcengine.com/activity/codingplan?utm_campaign=PicoClaw&utm_content=PicoClaw&utm_medium=devrel&utm_source=OWO&utm_term=PicoClaw)                        |
 | **神算云**          | `shengsuanyun/`   | `https://router.shengsuanyun.com/api/v1`            | OpenAI    | -                                                                 |
 | **BytePlus**        | `byteplus/`       | `https://ark.ap-southeast.bytepluses.com/api/v3`    | OpenAI    | [获取密钥](https://www.byteplus.com)                        |
 | **LongCat**         | `longcat/`        | `https://api.longcat.chat/openai`                   | OpenAI    | [获取密钥](https://longcat.chat/platform)                        |
 | **ModelScope (魔搭)**| `modelscope/`    | `https://api-inference.modelscope.cn/v1`            | OpenAI    | [获取 Token](https://modelscope.cn/my/tokens)                    |
 | **Azure OpenAI**    | `azure/`          | `https://{resource}.openai.azure.com`               | Azure     | [获取密钥](https://portal.azure.com)                              |
 | **Antigravity**     | `antigravity/`    | Google Cloud                                        | 自定义    | 仅 OAuth                                                          |
 | **GitHub Copilot**  | `github-copilot/` | `localhost:4321`                                    | gRPC      | -                                                                 |
@ -527,8 +543,13 @@ Agent 读取 HEARTBEAT.md
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "ark-code-latest",
-      "model": "openai/gpt-5.2",
+      "model": "volcengine/ark-code-latest",
      "api_key": "sk-your-api-key"
    },
    {
      "model_name": "gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key"
    },
    {
@ -544,7 +565,7 @@ Agent 读取 HEARTBEAT.md
  ],
  "agents": {
    "defaults": {
-      "model": "gpt-5.2"
+      "model": "gpt-5.4"
    }
  }
 }
@ -556,8 +577,18 @@ Agent 读取 HEARTBEAT.md
 ```json
 {
-  "model_name": "gpt-5.2",
+  "model_name": "gpt-5.4",
-  "model": "openai/gpt-5.2",
+  "model": "openai/gpt-5.4",
  "api_key": "sk-..."
 }
 ```
 **火山引擎（Doubao）**
 ```json
 {
  "model_name": "ark-code-latest",
  "model": "volcengine/ark-code-latest",
  "api_key": "sk-..."
 }
 ```
@ -594,6 +625,26 @@ Agent 读取 HEARTBEAT.md
 > 运行 `picoclaw auth login --provider anthropic` 来设置 OAuth 凭证。
 **Anthropic Messages API（原生格式）**
 用于直接访问 Anthropic API 或仅支持 Anthropic 原生消息格式的自定义端点：
 ```json
 {
  "model_name": "claude-opus-4-6",
  "model": "anthropic-messages/claude-opus-4-6",
  "api_key": "sk-ant-your-key",
  "api_base": "https://api.anthropic.com"
 }
 ```
 > 使用 `anthropic-messages` 协议的场景：
 > - 使用仅支持 Anthropic 原生 `/v1/messages` 端点的第三方代理（不支持 OpenAI 兼容的 `/v1/chat/completions`）
 > - 连接到 MiniMax、Synthetic 等需要 Anthropic 原生消息格式的服务
 > - 现有的 `anthropic` 协议返回 404 错误（说明端点不支持 OpenAI 兼容格式）
 >
 > **注意：** `anthropic` 协议使用 OpenAI 兼容格式（`/v1/chat/completions`），而 `anthropic-messages` 使用 Anthropic 原生格式（`/v1/messages`）。请根据端点支持的格式选择。
 **Ollama (本地)**
 ```json
@ -623,14 +674,14 @@ Agent 读取 HEARTBEAT.md
 {
  "model_list": [
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api1.example.com/v1",
      "api_key": "sk-key1"
    },
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_base": "https://api2.example.com/v1",
      "api_key": "sk-key2"
    }
@ -876,8 +927,16 @@ Discord: [https://discord.gg/V4sAZ9XWpN](https://discord.gg/V4sAZ9XWpN)
 | 服务 | 免费层级 | 适用场景 |
 | --- | --- | --- |
 | **OpenRouter** | 200K tokens/月 | 多模型聚合 (Claude, GPT-4 等) |
-| **智谱 (Zhipu)** | 200K tokens/月 | 最适合中国用户 |
+| **火山引擎 CodingPlan** | 9.9 元/首月 | 最适合国内用户，多种 SOTA 模型（豆包、DeepSeek 等） |
 | **智谱 (Zhipu)** | 200K tokens/月 | 适合中国用户 |
 | **Brave Search** | 2000 次查询/月 | 网络搜索功能 |
 | **Tavily** | 1000 次查询/月 | AI Agent 搜索优化 |
 | **Groq** | 提供免费层级 | 极速推理 (Llama, Mixtral) |
 | **LongCat** | 最多 5M tokens/天 | 推理速度快 (免费额度) |
 | **ModelScope (魔搭)** | 2000 次请求/天 | 免费推理 (Qwen, GLM, DeepSeek 等) |
 ---
 <div align="center">
  <img src="assets/logo.jpg" alt="PicoClaw Meme" width="512">
 </div>
--- a/assets/logo.webp
+++ b/assets/logo.webp
--- a/assets/wechat.png
+++ b/assets/wechat.png
--- a/cmd/picoclaw-launcher-tui/internal/ui/model.go
+++ b/cmd/picoclaw-launcher-tui/internal/ui/model.go
@ -49,7 +49,7 @@ func (s *appState) modelMenu() tview.Primitive {
 			Action: func() {
 				newName := s.nextAvailableModelName("new-model")
 				s.addModel(
-					picoclawconfig.ModelConfig{ModelName: newName, Model: "openai/gpt-5.2"},
+					picoclawconfig.ModelConfig{ModelName: newName, Model: "openai/gpt-5.4"},
 				)
 				s.push(
 					fmt.Sprintf("model-%d", len(s.config.ModelList)-1),
@ -291,7 +291,7 @@ func refreshModelMenuFromState(menu *Menu, s *appState) {
 			Action: func() {
 				newName := s.nextAvailableModelName("new-model")
 				s.addModel(
-					picoclawconfig.ModelConfig{ModelName: newName, Model: "openai/gpt-5.2"},
+					picoclawconfig.ModelConfig{ModelName: newName, Model: "openai/gpt-5.4"},
 				)
 				s.push(fmt.Sprintf("model-%d", len(s.config.ModelList)-1), s.modelForm(len(s.config.ModelList)-1))
 			},
--- a/cmd/picoclaw/internal/agent/helpers.go
+++ b/cmd/picoclaw/internal/agent/helpers.go
@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
-	"github.com/chzyer/readline"
+	"github.com/ergochat/readline"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal"
 	"github.com/sipeed/picoclaw/pkg/agent"
--- a/cmd/picoclaw/internal/auth/helpers.go
+++ b/cmd/picoclaw/internal/auth/helpers.go
@ -72,14 +72,14 @@ func authLoginOpenAI(useDeviceCode bool) error {
 		// If no openai in ModelList, add it
 		if !foundOpenAI {
 			appCfg.ModelList = append(appCfg.ModelList, config.ModelConfig{
-				ModelName:  "gpt-5.2",
+				ModelName:  "gpt-5.4",
-				Model:      "openai/gpt-5.2",
+				Model:      "openai/gpt-5.4",
 				AuthMethod: "oauth",
 			})
 		}
 		// Update default model to use OpenAI
-		appCfg.Agents.Defaults.ModelName = "gpt-5.2"
+		appCfg.Agents.Defaults.ModelName = "gpt-5.4"
 		if err = config.SaveConfig(internal.GetConfigPath(), appCfg); err != nil {
 			return fmt.Errorf("could not update config: %w", err)
@ -90,7 +90,7 @@ func authLoginOpenAI(useDeviceCode bool) error {
 	if cred.AccountID != "" {
 		fmt.Printf("Account: %s\n", cred.AccountID)
 	}
-	fmt.Println("Default model set to: gpt-5.2")
+	fmt.Println("Default model set to: gpt-5.4")
 	return nil
 }
@ -318,13 +318,13 @@ func authLoginPasteToken(provider string) error {
 			}
 			if !found {
 				appCfg.ModelList = append(appCfg.ModelList, config.ModelConfig{
-					ModelName:  "gpt-5.2",
+					ModelName:  "gpt-5.4",
-					Model:      "openai/gpt-5.2",
+					Model:      "openai/gpt-5.4",
 					AuthMethod: "token",
 				})
 			}
 			// Update default model
-			appCfg.Agents.Defaults.ModelName = "gpt-5.2"
+			appCfg.Agents.Defaults.ModelName = "gpt-5.4"
 		}
 		if err := config.SaveConfig(internal.GetConfigPath(), appCfg); err != nil {
 			return fmt.Errorf("could not update config: %w", err)
--- a/cmd/picoclaw/internal/gateway/command.go
+++ b/cmd/picoclaw/internal/gateway/command.go
@ -5,6 +5,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal"
 	"github.com/sipeed/picoclaw/pkg/gateway"
 	"github.com/sipeed/picoclaw/pkg/logger"
 	"github.com/sipeed/picoclaw/pkg/utils"
 )
@ -12,6 +14,7 @@ import (
 func NewGatewayCommand() *cobra.Command {
 	var debug bool
 	var noTruncate bool
 	var allowEmpty bool
 	cmd := &cobra.Command{
 		Use:     "gateway",
@ -31,12 +34,19 @@ func NewGatewayCommand() *cobra.Command {
 			return nil
 		},
 		RunE: func(_ *cobra.Command, _ []string) error {
-			return gatewayCmd(debug)
+			return gateway.Run(debug, internal.GetConfigPath(), allowEmpty)
 		},
 	}
 	cmd.Flags().BoolVarP(&debug, "debug", "d", false, "Enable debug logging")
 	cmd.Flags().BoolVarP(&noTruncate, "no-truncate", "T", false, "Disable string truncation in debug logs")
 	cmd.Flags().BoolVarP(
 		&allowEmpty,
 		"allow-empty",
 		"E",
 		false,
 		"Continue starting even when no default model is configured",
 	)
 	return cmd
 }
--- a/cmd/picoclaw/internal/gateway/command_test.go
+++ b/cmd/picoclaw/internal/gateway/command_test.go
@ -28,4 +28,5 @@ func TestNewGatewayCommand(t *testing.T) {
 	assert.True(t, cmd.HasFlags())
 	assert.NotNil(t, cmd.Flags().Lookup("debug"))
 	assert.NotNil(t, cmd.Flags().Lookup("allow-empty"))
 }
--- a/cmd/picoclaw/internal/gateway/helpers.go
+++ b/cmd/picoclaw/internal/gateway/helpers.go
@ -1,257 +0,0 @@
 package gateway
 import (
 	"context"
 	"fmt"
 	"log"
 	"os"
 	"os/signal"
 	"path/filepath"
 	"time"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal"
 	"github.com/sipeed/picoclaw/pkg/agent"
 	"github.com/sipeed/picoclaw/pkg/bus"
 	"github.com/sipeed/picoclaw/pkg/channels"
 	_ "github.com/sipeed/picoclaw/pkg/channels/dingtalk"
 	_ "github.com/sipeed/picoclaw/pkg/channels/discord"
 	_ "github.com/sipeed/picoclaw/pkg/channels/feishu"
 	_ "github.com/sipeed/picoclaw/pkg/channels/irc"
 	_ "github.com/sipeed/picoclaw/pkg/channels/line"
 	_ "github.com/sipeed/picoclaw/pkg/channels/maixcam"
 	_ "github.com/sipeed/picoclaw/pkg/channels/matrix"
 	_ "github.com/sipeed/picoclaw/pkg/channels/onebot"
 	_ "github.com/sipeed/picoclaw/pkg/channels/pico"
 	_ "github.com/sipeed/picoclaw/pkg/channels/qq"
 	_ "github.com/sipeed/picoclaw/pkg/channels/slack"
 	_ "github.com/sipeed/picoclaw/pkg/channels/telegram"
 	_ "github.com/sipeed/picoclaw/pkg/channels/wecom"
 	_ "github.com/sipeed/picoclaw/pkg/channels/whatsapp"
 	_ "github.com/sipeed/picoclaw/pkg/channels/whatsapp_native"
 	"github.com/sipeed/picoclaw/pkg/config"
 	"github.com/sipeed/picoclaw/pkg/cron"
 	"github.com/sipeed/picoclaw/pkg/devices"
 	"github.com/sipeed/picoclaw/pkg/health"
 	"github.com/sipeed/picoclaw/pkg/heartbeat"
 	"github.com/sipeed/picoclaw/pkg/logger"
 	"github.com/sipeed/picoclaw/pkg/media"
 	"github.com/sipeed/picoclaw/pkg/providers"
 	"github.com/sipeed/picoclaw/pkg/state"
 	"github.com/sipeed/picoclaw/pkg/tools"
 	"github.com/sipeed/picoclaw/pkg/voice"
 )
 func gatewayCmd(debug bool) error {
 	if debug {
 		logger.SetLevel(logger.DEBUG)
 		fmt.Println("🔍 Debug mode enabled")
 	}
 	cfg, err := internal.LoadConfig()
 	if err != nil {
 		return fmt.Errorf("error loading config: %w", err)
 	}
 	provider, modelID, err := providers.CreateProvider(cfg)
 	if err != nil {
 		return fmt.Errorf("error creating provider: %w", err)
 	}
 	// Use the resolved model ID from provider creation
 	if modelID != "" {
 		cfg.Agents.Defaults.ModelName = modelID
 	}
 	msgBus := bus.NewMessageBus()
 	agentLoop := agent.NewAgentLoop(cfg, msgBus, provider)
 	// Print agent startup info
 	fmt.Println("\n📦 Agent Status:")
 	startupInfo := agentLoop.GetStartupInfo()
 	toolsInfo := startupInfo["tools"].(map[string]any)
 	skillsInfo := startupInfo["skills"].(map[string]any)
 	fmt.Printf("  • Tools: %d loaded\n", toolsInfo["count"])
 	fmt.Printf("  • Skills: %d/%d available\n",
 		skillsInfo["available"],
 		skillsInfo["total"])
 	// Log to file as well
 	logger.InfoCF("agent", "Agent initialized",
 		map[string]any{
 			"tools_count":      toolsInfo["count"],
 			"skills_total":     skillsInfo["total"],
 			"skills_available": skillsInfo["available"],
 		})
 	// Setup cron tool and service
 	execTimeout := time.Duration(cfg.Tools.Cron.ExecTimeoutMinutes) * time.Minute
 	cronService := setupCronTool(
 		agentLoop,
 		msgBus,
 		cfg.WorkspacePath(),
 		cfg.Agents.Defaults.RestrictToWorkspace,
 		execTimeout,
 		cfg,
 	)
 	heartbeatService := heartbeat.NewHeartbeatService(
 		cfg.WorkspacePath(),
 		cfg.Heartbeat.Interval,
 		cfg.Heartbeat.Enabled,
 	)
 	heartbeatService.SetBus(msgBus)
 	heartbeatService.SetHandler(func(prompt, channel, chatID string) *tools.ToolResult {
 		// Use cli:direct as fallback if no valid channel
 		if channel == "" || chatID == "" {
 			channel, chatID = "cli", "direct"
 		}
 		// Use ProcessHeartbeat - no session history, each heartbeat is independent
 		var response string
 		response, err = agentLoop.ProcessHeartbeat(context.Background(), prompt, channel, chatID)
 		if err != nil {
 			return tools.ErrorResult(fmt.Sprintf("Heartbeat error: %v", err))
 		}
 		if response == "HEARTBEAT_OK" {
 			return tools.SilentResult("Heartbeat OK")
 		}
 		// For heartbeat, always return silent - the subagent result will be
 		// sent to user via processSystemMessage when the async task completes
 		return tools.SilentResult(response)
 	})
 	// Create media store for file lifecycle management with TTL cleanup
 	mediaStore := media.NewFileMediaStoreWithCleanup(media.MediaCleanerConfig{
 		Enabled:  cfg.Tools.MediaCleanup.Enabled,
 		MaxAge:   time.Duration(cfg.Tools.MediaCleanup.MaxAge) * time.Minute,
 		Interval: time.Duration(cfg.Tools.MediaCleanup.Interval) * time.Minute,
 	})
 	mediaStore.Start()
 	channelManager, err := channels.NewManager(cfg, msgBus, mediaStore)
 	if err != nil {
 		mediaStore.Stop()
 		return fmt.Errorf("error creating channel manager: %w", err)
 	}
 	// Inject channel manager and media store into agent loop
 	agentLoop.SetChannelManager(channelManager)
 	agentLoop.SetMediaStore(mediaStore)
 	// Wire up voice transcription if a supported provider is configured.
 	if transcriber := voice.DetectTranscriber(cfg); transcriber != nil {
 		agentLoop.SetTranscriber(transcriber)
 		logger.InfoCF("voice", "Transcription enabled (agent-level)", map[string]any{"provider": transcriber.Name()})
 	}
 	enabledChannels := channelManager.GetEnabledChannels()
 	if len(enabledChannels) > 0 {
 		fmt.Printf("✓ Channels enabled: %s\n", enabledChannels)
 	} else {
 		fmt.Println("⚠ Warning: No channels enabled")
 	}
 	fmt.Printf("✓ Gateway started on %s:%d\n", cfg.Gateway.Host, cfg.Gateway.Port)
 	fmt.Println("Press Ctrl+C to stop")
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	if err := cronService.Start(); err != nil {
 		fmt.Printf("Error starting cron service: %v\n", err)
 	}
 	fmt.Println("✓ Cron service started")
 	if err := heartbeatService.Start(); err != nil {
 		fmt.Printf("Error starting heartbeat service: %v\n", err)
 	}
 	fmt.Println("✓ Heartbeat service started")
 	stateManager := state.NewManager(cfg.WorkspacePath())
 	deviceService := devices.NewService(devices.Config{
 		Enabled:    cfg.Devices.Enabled,
 		MonitorUSB: cfg.Devices.MonitorUSB,
 	}, stateManager)
 	deviceService.SetBus(msgBus)
 	if err := deviceService.Start(ctx); err != nil {
 		fmt.Printf("Error starting device service: %v\n", err)
 	} else if cfg.Devices.Enabled {
 		fmt.Println("✓ Device event service started")
 	}
 	// Setup shared HTTP server with health endpoints and webhook handlers
 	healthServer := health.NewServer(cfg.Gateway.Host, cfg.Gateway.Port)
 	addr := fmt.Sprintf("%s:%d", cfg.Gateway.Host, cfg.Gateway.Port)
 	channelManager.SetupHTTPServer(addr, healthServer)
 	if err := channelManager.StartAll(ctx); err != nil {
 		fmt.Printf("Error starting channels: %v\n", err)
 		return err
 	}
 	fmt.Printf("✓ Health endpoints available at http://%s:%d/health and /ready\n", cfg.Gateway.Host, cfg.Gateway.Port)
 	go agentLoop.Run(ctx)
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, os.Interrupt)
 	<-sigChan
 	fmt.Println("\nShutting down...")
 	if cp, ok := provider.(providers.StatefulProvider); ok {
 		cp.Close()
 	}
 	cancel()
 	msgBus.Close()
 	// Use a fresh context with timeout for graceful shutdown,
 	// since the original ctx is already canceled.
 	shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 15*time.Second)
 	defer shutdownCancel()
 	channelManager.StopAll(shutdownCtx)
 	deviceService.Stop()
 	heartbeatService.Stop()
 	cronService.Stop()
 	mediaStore.Stop()
 	agentLoop.Stop()
 	agentLoop.Close()
 	fmt.Println("✓ Gateway stopped")
 	return nil
 }
 func setupCronTool(
 	agentLoop *agent.AgentLoop,
 	msgBus *bus.MessageBus,
 	workspace string,
 	restrict bool,
 	execTimeout time.Duration,
 	cfg *config.Config,
 ) *cron.CronService {
 	cronStorePath := filepath.Join(workspace, "cron", "jobs.json")
 	// Create cron service
 	cronService := cron.NewCronService(cronStorePath, nil)
 	// Create and register CronTool if enabled
 	var cronTool *tools.CronTool
 	if cfg.Tools.IsToolEnabled("cron") {
 		var err error
 		cronTool, err = tools.NewCronTool(cronService, agentLoop, msgBus, workspace, restrict, execTimeout, cfg)
 		if err != nil {
 			log.Fatalf("Critical error during CronTool initialization: %v", err)
 		}
 		agentLoop.RegisterTool(cronTool)
 	}
 	// Set onJob handler
 	if cronTool != nil {
 		cronService.SetOnJob(func(job *cron.CronJob) (string, error) {
 			result := cronTool.ExecuteJob(context.Background(), job)
 			return result, nil
 		})
 	}
 	return cronService
 }
--- a/cmd/picoclaw/internal/model/command.go
+++ b/cmd/picoclaw/internal/model/command.go
@ -0,0 +1,138 @@
 package model
 import (
 	"fmt"
 	"github.com/spf13/cobra"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal"
 	"github.com/sipeed/picoclaw/pkg/config"
 )
 // LocalModel is a special model name that indicates that the model is local and with or without api_key.
 const LocalModel = "local-model"
 func NewModelCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "model [model_name]",
 		Short: "Show or change the default model",
 		Long: `Show or change the default model configuration.
 If no argument is provided, shows the current default model.
 If a model name is provided, sets it as the default model.
 Examples:
  picoclaw model                    # Show current default model
  picoclaw model gpt-5.2           # Set gpt-5.2 as default
  picoclaw model claude-sonnet-4.6 # Set claude-sonnet-4.6 as default
  picoclaw model local-model       # Set local VLLM server as default
 Note: 'local-model' is a special value for using a local VLLM server
 (running at localhost:8000 by default) which does not require an API key.`,
 		Args: cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			configPath := internal.GetConfigPath()
 			// Load current config
 			cfg, err := config.LoadConfig(configPath)
 			if err != nil {
 				return fmt.Errorf("failed to load config: %w", err)
 			}
 			if len(args) == 0 {
 				// Show current default model
 				showCurrentModel(cfg)
 				return nil
 			}
 			// Set new default model
 			modelName := args[0]
 			return setDefaultModel(configPath, cfg, modelName)
 		},
 	}
 	return cmd
 }
 func showCurrentModel(cfg *config.Config) {
 	defaultModel := cfg.Agents.Defaults.ModelName
 	if defaultModel == "" {
 		defaultModel = cfg.Agents.Defaults.Model
 	}
 	if defaultModel == "" {
 		fmt.Println("No default model is currently set.")
 		fmt.Println("\nAvailable models in your config:")
 		listAvailableModels(cfg)
 	} else {
 		fmt.Printf("Current default model: %s\n", defaultModel)
 		fmt.Println("\nAvailable models in your config:")
 		listAvailableModels(cfg)
 	}
 }
 func listAvailableModels(cfg *config.Config) {
 	if len(cfg.ModelList) == 0 {
 		fmt.Println("  No models configured in model_list")
 		return
 	}
 	defaultModel := cfg.Agents.Defaults.ModelName
 	if defaultModel == "" {
 		defaultModel = cfg.Agents.Defaults.Model
 	}
 	for _, model := range cfg.ModelList {
 		marker := "  "
 		if model.ModelName == defaultModel {
 			marker = "> "
 		}
 		if model.APIKey == "" {
 			continue
 		}
 		fmt.Printf("%s- %s (%s)\n", marker, model.ModelName, model.Model)
 	}
 }
 func setDefaultModel(configPath string, cfg *config.Config, modelName string) error {
 	// Validate that the model exists in model_list
 	modelFound := false
 	for _, model := range cfg.ModelList {
 		if model.APIKey != "" && model.ModelName == modelName {
 			modelFound = true
 			break
 		}
 	}
 	if !modelFound && modelName != LocalModel {
 		return fmt.Errorf("cannot found model '%s' in config", modelName)
 	}
 	// Update the default model
 	// Clear old model field and set new model_name
 	oldModel := cfg.Agents.Defaults.ModelName
 	if oldModel == "" {
 		oldModel = cfg.Agents.Defaults.Model
 	}
 	cfg.Agents.Defaults.ModelName = modelName
 	cfg.Agents.Defaults.Model = "" // Clear deprecated field
 	// Save config back to file
 	if err := config.SaveConfig(configPath, cfg); err != nil {
 		return fmt.Errorf("failed to save config: %w", err)
 	}
 	fmt.Printf("✓ Default model changed from '%s' to '%s'\n",
 		formatModelName(oldModel), modelName)
 	fmt.Println("\nThe new default model will be used for all agent interactions.")
 	return nil
 }
 func formatModelName(name string) string {
 	if name == "" {
 		return "(none)"
 	}
 	return name
 }
--- a/cmd/picoclaw/internal/model/command_test.go
+++ b/cmd/picoclaw/internal/model/command_test.go
@ -0,0 +1,369 @@
 package model
 import (
 	"bytes"
 	"io"
 	"os"
 	"path/filepath"
 	"testing"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/sipeed/picoclaw/pkg/config"
 )
 var configPath = ""
 func initTest(t *testing.T) {
 	tmpDir := t.TempDir()
 	configPath = filepath.Join(tmpDir, "config.json")
 	_ = os.Setenv("PICOCLAW_CONFIG", configPath)
 }
 // captureStdout captures stdout during the execution of fn and returns the captured output
 func captureStdout(fn func()) string {
 	oldStdout := os.Stdout
 	r, w, _ := os.Pipe()
 	os.Stdout = w
 	fn()
 	w.Close()
 	os.Stdout = oldStdout
 	var buf bytes.Buffer
 	io.Copy(&buf, r)
 	return buf.String()
 }
 func TestNewModelCommand(t *testing.T) {
 	cmd := NewModelCommand()
 	require.NotNil(t, cmd)
 	assert.Equal(t, "model [model_name]", cmd.Use)
 	assert.Equal(t, "Show or change the default model", cmd.Short)
 	assert.Len(t, cmd.Aliases, 0)
 	assert.False(t, cmd.HasFlags())
 	assert.Nil(t, cmd.Run)
 	assert.NotNil(t, cmd.RunE)
 	assert.Nil(t, cmd.PersistentPreRunE)
 	assert.Nil(t, cmd.PersistentPreRun)
 	assert.Nil(t, cmd.PersistentPostRun)
 }
 func TestShowCurrentModel_WithDefaultModel(t *testing.T) {
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				ModelName: "gpt-4",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "gpt-4", Model: "openai/gpt-4", APIKey: "test"},
 			{ModelName: "claude-3", Model: "anthropic/claude-3", APIKey: "test"},
 		},
 	}
 	output := captureStdout(func() {
 		showCurrentModel(cfg)
 	})
 	assert.Contains(t, output, "Current default model: gpt-4")
 	assert.Contains(t, output, "Available models in your config:")
 	assert.Contains(t, output, "gpt-4")
 	assert.Contains(t, output, "claude-3")
 }
 func TestShowCurrentModel_NoDefaultModel(t *testing.T) {
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				ModelName: "",
 				Model:     "",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "gpt-4", Model: "openai/gpt-4", APIKey: "test"},
 		},
 	}
 	output := captureStdout(func() {
 		showCurrentModel(cfg)
 	})
 	assert.Contains(t, output, "No default model is currently set.")
 	assert.Contains(t, output, "Available models in your config:")
 }
 func TestShowCurrentModel_BackwardCompatibility(t *testing.T) {
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				Model: "legacy-model",
 			},
 		},
 		ModelList: []config.ModelConfig{},
 	}
 	output := captureStdout(func() {
 		showCurrentModel(cfg)
 	})
 	assert.Contains(t, output, "Current default model: legacy-model")
 }
 func TestListAvailableModels_Empty(t *testing.T) {
 	cfg := &config.Config{
 		ModelList: []config.ModelConfig{},
 	}
 	output := captureStdout(func() {
 		listAvailableModels(cfg)
 	})
 	assert.Contains(t, output, "No models configured in model_list")
 }
 func TestListAvailableModels_WithModels(t *testing.T) {
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				ModelName: "gpt-4",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "gpt-4", Model: "openai/gpt-4", APIKey: "test"},
 			{ModelName: "claude-3", Model: "anthropic/claude-3", APIKey: "test"},
 			{ModelName: "no-key-model", Model: "openai/test", APIKey: ""},
 		},
 	}
 	output := captureStdout(func() {
 		listAvailableModels(cfg)
 	})
 	assert.NotEmpty(t, output)
 	assert.Contains(t, output, "> - gpt-4 (openai/gpt-4)")
 	assert.Contains(t, output, "claude-3 (anthropic/claude-3)")
 	assert.NotContains(t, output, "no-key-model")
 }
 func TestSetDefaultModel_ValidModel(t *testing.T) {
 	initTest(t)
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				ModelName: "old-model",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "new-model", Model: "openai/new-model", APIKey: "test"},
 			{ModelName: "old-model", Model: "openai/old-model", APIKey: "test"},
 		},
 	}
 	output := captureStdout(func() {
 		err := setDefaultModel(configPath, cfg, "new-model")
 		assert.NoError(t, err)
 	})
 	assert.Contains(t, output, "Default model changed from 'old-model' to 'new-model'")
 	// Verify config was updated
 	updatedCfg, err := config.LoadConfig(configPath)
 	require.NoError(t, err)
 	assert.Equal(t, "new-model", updatedCfg.Agents.Defaults.ModelName)
 	assert.Empty(t, updatedCfg.Agents.Defaults.Model)
 }
 func TestSetDefaultModel_LegacyModelField(t *testing.T) {
 	initTest(t)
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				Model: "legacy-old",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "new-model", Model: "openai/new-model", APIKey: "test"},
 		},
 	}
 	output := captureStdout(func() {
 		err := setDefaultModel(configPath, cfg, "new-model")
 		assert.NoError(t, err)
 	})
 	assert.Contains(t, output, "Default model changed from 'legacy-old' to 'new-model'")
 }
 func TestSetDefaultModel_InvalidModel(t *testing.T) {
 	initTest(t)
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				ModelName: "existing-model",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "existing-model", Model: "openai/existing", APIKey: "test"},
 		},
 	}
 	assert.Error(t, setDefaultModel(configPath, cfg, "nonexistent-model"))
 }
 func TestSetDefaultModel_ModelWithoutAPIKey(t *testing.T) {
 	initTest(t)
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				ModelName: "existing-model",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "existing-model", Model: "openai/existing", APIKey: "test"},
 			{ModelName: "no-key-model", Model: "openai/nokey", APIKey: ""},
 		},
 	}
 	assert.Error(t, setDefaultModel(configPath, cfg, "no-key-model"))
 }
 func TestSetDefaultModel_SaveConfigError(t *testing.T) {
 	// Use an invalid path to trigger save error
 	invalidPath := "/nonexistent/directory/config.json"
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				ModelName: "old-model",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "new-model", Model: "openai/new-model", APIKey: "test"},
 		},
 	}
 	err := setDefaultModel(invalidPath, cfg, "new-model")
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "failed to save config")
 }
 func TestFormatModelName(t *testing.T) {
 	tests := []struct {
 		name     string
 		input    string
 		expected string
 	}{
 		{"empty string", "", "(none)"},
 		{"simple model", "gpt-4", "gpt-4"},
 		{"model with version", "claude-sonnet-4.6", "claude-sonnet-4.6"},
 		{"model with spaces", "my model", "my model"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			result := formatModelName(tt.input)
 			assert.Equal(t, tt.expected, result)
 		})
 	}
 }
 func TestModelCommandExecution_Show(t *testing.T) {
 	initTest(t)
 	// Create a test config
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				ModelName: "test-model",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "test-model", Model: "openai/test", APIKey: "test"},
 		},
 	}
 	err := config.SaveConfig(configPath, cfg)
 	require.NoError(t, err)
 	cmd := NewModelCommand()
 	output := captureStdout(func() {
 		err = cmd.RunE(cmd, []string{})
 		assert.NoError(t, err)
 	})
 	assert.Contains(t, output, "Current default model: test-model")
 }
 func TestModelCommandExecution_Set(t *testing.T) {
 	initTest(t)
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				ModelName: "old-model",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "old-model", Model: "openai/old", APIKey: "test"},
 			{ModelName: "new-model", Model: "openai/new", APIKey: "test"},
 		},
 	}
 	err := config.SaveConfig(configPath, cfg)
 	require.NoError(t, err)
 	cmd := NewModelCommand()
 	output := captureStdout(func() {
 		err = cmd.RunE(cmd, []string{"new-model"})
 		assert.NoError(t, err)
 	})
 	assert.Contains(t, output, "Default model changed from 'old-model' to 'new-model'")
 }
 func TestModelCommandExecution_TooManyArgs(t *testing.T) {
 	cmd := NewModelCommand()
 	err := cmd.RunE(cmd, []string{"model1", "model2"})
 	assert.Error(t, err)
 }
 func TestListAvailableModels_MarkerLogic(t *testing.T) {
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				ModelName: "middle-model",
 			},
 		},
 		ModelList: []config.ModelConfig{
 			{ModelName: "first-model", Model: "openai/first", APIKey: "test"},
 			{ModelName: "middle-model", Model: "openai/middle", APIKey: "test"},
 			{ModelName: "last-model", Model: "openai/last", APIKey: "test"},
 		},
 	}
 	output := captureStdout(func() {
 		listAvailableModels(cfg)
 	})
 	assert.Contains(t, output, "  - first-model (openai/first)")
 	assert.Contains(t, output, "> - middle-model (openai/middle)")
 	assert.Contains(t, output, "  - last-model (openai/last)")
 }
--- a/cmd/picoclaw/internal/onboard/command.go
+++ b/cmd/picoclaw/internal/onboard/command.go
@ -11,14 +11,19 @@ import (
 var embeddedFiles embed.FS
 func NewOnboardCommand() *cobra.Command {
 	var encrypt bool
 	cmd := &cobra.Command{
 		Use:     "onboard",
 		Aliases: []string{"o"},
 		Short:   "Initialize picoclaw configuration and workspace",
 		Run: func(cmd *cobra.Command, args []string) {
-			onboard()
+			onboard(encrypt)
 		},
 	}
 	cmd.Flags().BoolVar(&encrypt, "enc", false,
 		"Enable credential encryption (generates SSH key and prompts for passphrase)")
 	return cmd
 }
--- a/cmd/picoclaw/internal/onboard/command_test.go
+++ b/cmd/picoclaw/internal/onboard/command_test.go
@ -24,6 +24,9 @@ func TestNewOnboardCommand(t *testing.T) {
 	assert.Nil(t, cmd.PersistentPreRun)
 	assert.Nil(t, cmd.PersistentPostRun)
-	assert.False(t, cmd.HasFlags())
+	assert.True(t, cmd.HasFlags())
 	encFlag := cmd.Flags().Lookup("enc")
 	require.NotNil(t, encFlag, "expected --enc flag to be registered")
 	assert.Equal(t, "false", encFlag.DefValue, "--enc should default to false")
 	assert.False(t, cmd.HasSubCommands())
 }
--- a/cmd/picoclaw/internal/onboard/helpers.go
+++ b/cmd/picoclaw/internal/onboard/helpers.go
@ -6,25 +6,71 @@ import (
 	"os"
 	"path/filepath"
 	"golang.org/x/term"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal"
 	"github.com/sipeed/picoclaw/pkg/config"
 	"github.com/sipeed/picoclaw/pkg/credential"
 )
-func onboard() {
+func onboard(encrypt bool) {
 	configPath := internal.GetConfigPath()
 	configExists := false
 	if _, err := os.Stat(configPath); err == nil {
 		configExists = true
 		if encrypt {
 			// Only ask for confirmation when *both* config and SSH key already exist,
 			// indicating a full re-onboard that would reset the config to defaults.
 			sshKeyPath, _ := credential.DefaultSSHKeyPath()
 			if _, err := os.Stat(sshKeyPath); err == nil {
 				// Both exist — confirm a full reset.
 				fmt.Printf("Config already exists at %s\n", configPath)
-		fmt.Print("Overwrite? (y/n): ")
+				fmt.Print("Overwrite config with defaults? (y/n): ")
 				var response string
 				fmt.Scanln(&response)
 				if response != "y" {
 					fmt.Println("Aborted.")
 					return
 				}
 				configExists = false // user agreed to reset; treat as fresh
 			}
 			// Config exists but SSH key is missing — keep existing config, only add SSH key.
 		}
 	}
-	cfg := config.DefaultConfig()
+	var err error
 	if encrypt {
 		fmt.Println("\nSet up credential encryption")
 		fmt.Println("-----------------------------")
 		passphrase, pErr := promptPassphrase()
 		if pErr != nil {
 			fmt.Printf("Error: %v\n", pErr)
 			os.Exit(1)
 		}
 		// Expose the passphrase to credential.PassphraseProvider (which calls
 		// os.Getenv by default) so that SaveConfig can encrypt api_keys.
 		// This process is a one-shot CLI tool; the env var is never exposed outside
 		// the current process and disappears when it exits.
 		os.Setenv(credential.PassphraseEnvVar, passphrase)
 		if err = setupSSHKey(); err != nil {
 			fmt.Printf("Error generating SSH key: %v\n", err)
 			os.Exit(1)
 		}
 	}
 	var cfg *config.Config
 	if configExists {
 		// Preserve the existing config; SaveConfig will re-encrypt api_keys with the new passphrase.
 		cfg, err = config.LoadConfig(configPath)
 		if err != nil {
 			fmt.Printf("Error loading existing config: %v\n", err)
 			os.Exit(1)
 		}
 	} else {
 		cfg = config.DefaultConfig()
 	}
 	if err := config.SaveConfig(configPath, cfg); err != nil {
 		fmt.Printf("Error saving config: %v\n", err)
 		os.Exit(1)
@ -33,9 +79,17 @@ func onboard() {
 	workspace := cfg.WorkspacePath()
 	createWorkspaceTemplates(workspace)
-	fmt.Printf("%s picoclaw is ready!\n", internal.Logo)
+	fmt.Printf("\n%s picoclaw is ready!\n", internal.Logo)
 	fmt.Println("\nNext steps:")
 	if encrypt {
 		fmt.Println("  1. Set your encryption passphrase before starting picoclaw:")
 		fmt.Println("       export PICOCLAW_KEY_PASSPHRASE=<your-passphrase>   # Linux/macOS")
 		fmt.Println("       set PICOCLAW_KEY_PASSPHRASE=<your-passphrase>      # Windows cmd")
 		fmt.Println("")
 		fmt.Println("  2. Add your API key to", configPath)
 	} else {
 		fmt.Println("  1. Add your API key to", configPath)
 	}
 	fmt.Println("")
 	fmt.Println("     Recommended:")
 	fmt.Println("     - OpenRouter: https://openrouter.ai/keys (access 100+ models)")
@ -43,7 +97,62 @@ func onboard() {
 	fmt.Println("")
 	fmt.Println("     See README.md for 17+ supported providers.")
 	fmt.Println("")
-	fmt.Println("  2. Chat: picoclaw agent -m \"Hello!\"")
+	fmt.Println("  3. Chat: picoclaw agent -m \"Hello!\"")
 }
 // promptPassphrase reads the encryption passphrase twice from the terminal
 // (with echo disabled) and returns it. Returns an error if the passphrase is
 // empty or if the two inputs do not match.
 func promptPassphrase() (string, error) {
 	fmt.Print("Enter passphrase for credential encryption: ")
 	p1, err := term.ReadPassword(int(os.Stdin.Fd()))
 	fmt.Println()
 	if err != nil {
 		return "", fmt.Errorf("reading passphrase: %w", err)
 	}
 	if len(p1) == 0 {
 		return "", fmt.Errorf("passphrase must not be empty")
 	}
 	fmt.Print("Confirm passphrase: ")
 	p2, err := term.ReadPassword(int(os.Stdin.Fd()))
 	fmt.Println()
 	if err != nil {
 		return "", fmt.Errorf("reading passphrase confirmation: %w", err)
 	}
 	if string(p1) != string(p2) {
 		return "", fmt.Errorf("passphrases do not match")
 	}
 	return string(p1), nil
 }
 // setupSSHKey generates the picoclaw-specific SSH key at ~/.ssh/picoclaw_ed25519.key.
 // If the key already exists the user is warned and asked to confirm overwrite.
 // Answering anything other than "y" keeps the existing key (not an error).
 func setupSSHKey() error {
 	keyPath, err := credential.DefaultSSHKeyPath()
 	if err != nil {
 		return fmt.Errorf("cannot determine SSH key path: %w", err)
 	}
 	if _, err := os.Stat(keyPath); err == nil {
 		fmt.Printf("\n⚠️  WARNING: %s already exists.\n", keyPath)
 		fmt.Println("    Overwriting will invalidate any credentials previously encrypted with this key.")
 		fmt.Print("    Overwrite? (y/n): ")
 		var response string
 		fmt.Scanln(&response)
 		if response != "y" {
 			fmt.Println("Keeping existing SSH key.")
 			return nil
 		}
 	}
 	if err := credential.GenerateSSHKey(keyPath); err != nil {
 		return err
 	}
 	fmt.Printf("SSH key generated: %s\n", keyPath)
 	return nil
 }
 func createWorkspaceTemplates(workspace string) {
--- a/cmd/picoclaw/internal/skills/command.go
+++ b/cmd/picoclaw/internal/skills/command.go
@ -29,7 +29,15 @@ func NewSkillsCommand() *cobra.Command {
 			}
 			d.workspace = cfg.WorkspacePath()
-			d.installer = skills.NewSkillInstaller(d.workspace)
+			installer, err := skills.NewSkillInstaller(
 				d.workspace,
 				cfg.Tools.Skills.Github.Token,
 				cfg.Tools.Skills.Github.Proxy,
 			)
 			if err != nil {
 				return fmt.Errorf("error creating skills installer: %w", err)
 			}
 			d.installer = installer
 			// get global config directory and builtin skills directory
 			globalDir := filepath.Dir(internal.GetConfigPath())
--- a/cmd/picoclaw/main.go
+++ b/cmd/picoclaw/main.go
@ -18,6 +18,7 @@ import (
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal/cron"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal/gateway"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal/migrate"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal/model"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal/onboard"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal/skills"
 	"github.com/sipeed/picoclaw/cmd/picoclaw/internal/status"
@ -43,6 +44,7 @@ func NewPicoclawCommand() *cobra.Command {
 		cron.NewCronCommand(),
 		migrate.NewMigrateCommand(),
 		skills.NewSkillsCommand(),
 		model.NewModelCommand(),
 		version.NewVersionCommand(),
 	)
--- a/cmd/picoclaw/main_test.go
+++ b/cmd/picoclaw/main_test.go
@ -39,6 +39,7 @@ func TestNewPicoclawCommand(t *testing.T) {
 		"cron",
 		"gateway",
 		"migrate",
 		"model",
 		"onboard",
 		"skills",
 		"status",
--- a/config/config.example.json
+++ b/config/config.example.json
@ -3,7 +3,7 @@
    "defaults": {
      "workspace": "~/.picoclaw/workspace",
      "restrict_to_workspace": true,
-      "model_name": "gpt4",
+      "model_name": "gpt-5.4",
      "max_tokens": 8192,
      "temperature": 0.7,
      "max_tool_iterations": 20,
@ -13,8 +13,8 @@
  },
  "model_list": [
    {
-      "model_name": "gpt4",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key",
      "api_base": "https://api.openai.com/v1"
    },
@ -25,6 +25,13 @@
      "api_base": "https://api.anthropic.com/v1",
      "thinking_level": "high"
    },
    {
      "_comment": "Anthropic Messages API - use native format for direct Anthropic API access",
      "model_name": "claude-opus-4-6",
      "model": "anthropic-messages/claude-opus-4-6",
      "api_key": "sk-ant-your-key",
      "api_base": "https://api.anthropic.com"
    },
    {
      "model_name": "gemini",
      "model": "antigravity/gemini-2.0-flash",
@ -41,14 +48,26 @@
      "api_key": "your-longcat-api-key"
    },
    {
-      "model_name": "loadbalanced-gpt4",
+      "model_name": "modelscope-qwen",
-      "model": "openai/gpt-5.2",
+      "model": "modelscope/Qwen/Qwen3-235B-A22B-Instruct-2507",
      "api_key": "your-modelscope-access-token",
      "api_base": "https://api-inference.modelscope.cn/v1"
    },
    {
      "model_name": "azure-gpt5",
      "model": "azure/my-gpt5-deployment",
      "api_key": "your-azure-api-key",
      "api_base": "https://your-resource.openai.azure.com"
    },
    {
      "model_name": "loadbalanced-gpt-5.4",
      "model": "openai/gpt-5.4",
      "api_key": "sk-key1",
      "api_base": "https://api1.example.com/v1"
    },
    {
-      "model_name": "loadbalanced-gpt4",
+      "model_name": "loadbalanced-gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_key": "sk-key2",
      "api_base": "https://api2.example.com/v1"
    }
@ -283,6 +302,10 @@
    "longcat": {
      "api_key": "",
      "api_base": "https://api.longcat.chat/openai"
    },
    "modelscope": {
      "api_key": "",
      "api_base": "https://api-inference.modelscope.cn/v1"
    }
  },
  "tools": {
@ -290,6 +313,9 @@
    "allow_write_paths": null,
    "web": {
      "enabled": true,
      "prefer_native": true,
      "fetch_limit_bytes": 10485760,
      "format": "plaintext",
      "brave": {
        "enabled": false,
        "api_key": "YOUR_BRAVE_API_KEY",
@ -328,7 +354,8 @@
        "search_engine": "search_std",
        "max_results": 5
      },
-      "fetch_limit_bytes": 10485760
+      "fetch_limit_bytes": 10485760,
      "private_host_whitelist": []
    },
    "cron": {
      "enabled": true,
@ -427,6 +454,10 @@
          "max_response_size": 0
        }
      },
      "github": {
        "proxy": "http://127.0.0.1:7891",
        "token": ""
      },
      "max_concurrent_searches": 2,
      "search_cache": {
        "max_size": 50,
@ -491,6 +522,7 @@
  },
  "gateway": {
    "host": "127.0.0.1",
-    "port": 18790
+    "port": 18790,
    "hot_reload": false
  }
 }
--- a/docs/credential_encryption.md
+++ b/docs/credential_encryption.md
@ -0,0 +1,168 @@
 # Credential Encryption
 PicoClaw supports encrypting `api_key` values in `model_list` configuration entries.
 Encrypted keys are stored as `enc://<base64>` strings and decrypted automatically at startup.
 ---
 ## Quick Start
 **1. Set your passphrase**
 ```bash
 export PICOCLAW_KEY_PASSPHRASE="your-passphrase"
 ```
 **2. Encrypt an API key**
 Run `picoclaw onboard` — it prompts for your passphrase and generates the SSH key,
 then automatically re-encrypts any plaintext `api_key` entries in your config on
 the next `SaveConfig` call. The resulting `enc://` value will look like:
 ```
 enc://AAAA...base64...
 ```
 **3. Paste the output into your config**
 ```json
 {
  "model_list": [
    {
      "model_name": "gpt-4o",
      "api_key": "enc://AAAA...base64...",
      "base_url": "https://api.openai.com/v1"
    }
  ]
 }
 ```
 ---
 ## Supported `api_key` Formats
 | Format | Example | Behaviour |
 |--------|---------|-----------|
 | Plaintext | `sk-abc123` | Used as-is |
 | File reference | `file://openai.key` | Content read from the same directory as the config file |
 | Encrypted | `enc://<base64>` | Decrypted at startup using `PICOCLAW_KEY_PASSPHRASE` |
 | Empty | `""` | Passed through unchanged (used with `auth_method: oauth`) |
 ---
 ## Cryptographic Design
 ### Key Derivation
 Encryption uses **HKDF-SHA256** with an optional SSH private key as a second factor.
 ```
 Without SSH key (passphrase only):
  ikm     = SHA256(passphrase)
  aes_key = HKDF-SHA256(ikm, salt, info="picoclaw-credential-v1", 32 bytes)
 With SSH key (recommended):
  sshHash = SHA256(ssh_private_key_file_bytes)
  ikm     = HMAC-SHA256(key=sshHash, message=passphrase)
  aes_key = HKDF-SHA256(ikm, salt, info="picoclaw-credential-v1", 32 bytes)
 ```
 ### Encryption
 ```
 AES-256-GCM(key=aes_key, nonce=random[12], plaintext=api_key)
 ```
 ### Wire Format
 ```
 enc://<base64( salt[16] + nonce[12] + ciphertext )>
 ```
 | Field | Size | Description |
 |-------|------|-------------|
 | `salt` | 16 bytes | Random per encryption; fed into HKDF |
 | `nonce` | 12 bytes | Random per encryption; AES-GCM IV |
 | `ciphertext` | variable | AES-256-GCM ciphertext + 16-byte authentication tag |
 The GCM authentication tag is appended to the ciphertext automatically. Any tampering causes decryption to fail with an error rather than returning corrupt plaintext.
 ### Performance
 | Operation | Time (ARM Cortex-A) |
 |-----------|---------------------|
 | Key derivation (HKDF) | < 1 ms |
 | AES-256-GCM decrypt | < 1 ms |
 | **Total startup overhead** | **< 2 ms per key** |
 ---
 ## Two-Factor Security with SSH Key
 When a SSH private key is provided, breaking the encryption requires **both**:
 1. The **passphrase** (`PICOCLAW_KEY_PASSPHRASE`)
 2. The **SSH private key file**
 This means a leaked config file alone is not sufficient to recover the API key, even if the passphrase is weak. The SSH key contributes 256 bits of entropy (Ed25519) regardless of passphrase strength.
 ### Threat Model
 | Attacker Has | Can Decrypt? |
 |---|---|
 | Config file only | No — needs passphrase + SSH key |
 | SSH key only | No — needs passphrase |
 | Passphrase only | No — needs SSH key |
 | Config file + SSH key + passphrase | Yes — full compromise |
 ---
 ## Environment Variables
 | Variable | Required | Description |
 |----------|----------|-------------|
 | `PICOCLAW_KEY_PASSPHRASE` | Yes (for `enc://`) | Passphrase used for key derivation |
 | `PICOCLAW_SSH_KEY_PATH` | No | Path to SSH private key. Set to `""` to disable auto-detection and use passphrase-only mode |
 ### SSH Key Auto-Detection
 If `PICOCLAW_SSH_KEY_PATH` is not set, PicoClaw looks for the picoclaw-specific key:
 ```
 ~/.ssh/picoclaw_ed25519.key
 ```
 This dedicated file avoids conflicts with the user's existing SSH keys.
 Run `picoclaw onboard` to generate it automatically.
 `os.UserHomeDir()` is used for cross-platform home directory resolution (reads `USERPROFILE` on Windows, `HOME` on Unix/macOS).
 To explicitly disable SSH key usage and use passphrase-only mode:
 ```bash
 export PICOCLAW_SSH_KEY_PATH=""
 ```
 ---
 ## Migration
 Because the only secret material is `PICOCLAW_KEY_PASSPHRASE` and the SSH private key file, migration is straightforward:
 1. Copy the config file to the new machine.
 2. Set `PICOCLAW_KEY_PASSPHRASE` to the same value.
 3. Copy the SSH private key file to the same path (or set `PICOCLAW_SSH_KEY_PATH` to its new location).
 No re-encryption is needed.
 ---
 ## Security Considerations
 - **Passphrase strength matters in passphrase-only mode.** Without an SSH key, a weak passphrase can be brute-forced offline. Use `PICOCLAW_SSH_KEY_PATH=""` only in environments where no SSH key is available and the passphrase is sufficiently strong (≥ 32 random characters).
 - **The SSH key is read-only at runtime.** PicoClaw never writes to or modifies the SSH key file.
 - **Plaintext keys remain supported.** Existing configs without `enc://` are unaffected.
 - **The `enc://` format is versioned** via the HKDF `info` field (`picoclaw-credential-v1`), allowing future algorithm upgrades without breaking existing encrypted values.
--- a/docs/design/provider-refactoring.md
+++ b/docs/design/provider-refactoring.md
@ -66,7 +66,7 @@ Problem: Agent needs to know both `provider` and `model`, adding complexity.
 Inspired by [LiteLLM](https://docs.litellm.ai/docs/proxy/configs) design:
 1. **Model-centric**: Users care about models, not providers
-2. **Protocol prefix**: Use `protocol/model_name` format, e.g., `openai/gpt-5.2`, `anthropic/claude-sonnet-4.6`
+2. **Protocol prefix**: Use `protocol/model_name` format, e.g., `openai/gpt-5.4`, `anthropic/claude-sonnet-4.6`
 3. **Configuration-driven**: Adding new Providers only requires config changes, no code changes
 ### 2.2 New Configuration Structure
@ -81,8 +81,8 @@ Inspired by [LiteLLM](https://docs.litellm.ai/docs/proxy/configs) design:
      "api_key": "sk-xxx"
    },
    {
-      "model_name": "gpt-5.2",
+      "model_name": "gpt-5.4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_key": "sk-xxx"
    },
    {
@ -128,7 +128,7 @@ type Config struct {
 type ModelConfig struct {
    // Required
    ModelName string `json:"model_name"`  // user-facing name (alias)
-    Model     string `json:"model"`       // protocol/model, e.g., openai/gpt-5.2
+    Model     string `json:"model"`       // protocol/model, e.g., openai/gpt-5.4
    // Common config
    APIBase   string `json:"api_base,omitempty"`
@ -180,7 +180,7 @@ Identify protocol via prefix in `model` field:
      "model": "deepseek-chat"
    },
    "coder": {
-      "model": "gpt-5.2",
+      "model": "gpt-5.4",
      "system_prompt": "You are a coding assistant..."
    },
    "translator": {
@ -200,7 +200,7 @@ Each Agent only needs to specify `model` (corresponds to `model_name` in `model_
 model_list:
  - model_name: gpt-4o
    litellm_params:
-      model: openai/gpt-5.2
+      model: openai/gpt-5.4
      api_key: xxx
  - model_name: my-custom
    litellm_params:
--- a/docs/migration/model-list-migration.md
+++ b/docs/migration/model-list-migration.md
@ -40,7 +40,7 @@ The new `model_list` configuration offers several advantages:
  "agents": {
    "defaults": {
      "provider": "openai",
-      "model": "gpt-5.2"
+      "model": "gpt-5.4"
    }
  }
 }
@ -53,7 +53,7 @@ The new `model_list` configuration offers several advantages:
  "model_list": [
    {
      "model_name": "gpt4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_key": "sk-your-openai-key",
      "api_base": "https://api.openai.com/v1"
    },
@ -82,7 +82,7 @@ The `model` field uses a protocol prefix format: `[protocol/]model-identifier`
 | Prefix | Description | Example |
 |--------|-------------|---------|
-| `openai/` | OpenAI API (default) | `openai/gpt-5.2` |
+| `openai/` | OpenAI API (default) | `openai/gpt-5.4` |
 | `anthropic/` | Anthropic API | `anthropic/claude-opus-4` |
 | `antigravity/` | Google via Antigravity OAuth | `antigravity/gemini-2.0-flash` |
 | `gemini/` | Google Gemini API | `gemini/gemini-2.0-flash-exp` |
@ -109,7 +109,7 @@ The `model` field uses a protocol prefix format: `[protocol/]model-identifier`
 | Field | Required | Description |
 |-------|----------|-------------|
 | `model_name` | Yes | User-facing alias for the model |
-| `model` | Yes | Protocol and model identifier (e.g., `openai/gpt-5.2`) |
+| `model` | Yes | Protocol and model identifier (e.g., `openai/gpt-5.4`) |
 | `api_base` | No | API endpoint URL |
 | `api_key` | No* | API authentication key |
 | `proxy` | No | HTTP proxy URL |
@ -130,19 +130,19 @@ Configure multiple endpoints for the same model to distribute load:
  "model_list": [
    {
      "model_name": "gpt4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_key": "sk-key1",
      "api_base": "https://api1.example.com/v1"
    },
    {
      "model_name": "gpt4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_key": "sk-key2",
      "api_base": "https://api2.example.com/v1"
    },
    {
      "model_name": "gpt4",
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.4",
      "api_key": "sk-key3",
      "api_base": "https://api3.example.com/v1"
    }
--- a/docs/tools_configuration.md
+++ b/docs/tools_configuration.md
@ -30,6 +30,15 @@ PicoClaw's tools configuration is located in the `tools` field of `config.json`.
 Web tools are used for web search and fetching.
 ### Web Fetcher
 General settings for fetching and processing webpage content.
 | Config              | Type   | Default       | Description                                                                                   |
 |---------------------|--------|---------------|-----------------------------------------------------------------------------------------------|
 | `enabled`           | bool   | true          | Enable the webpage fetching capability.                                                       |
 | `fetch_limit_bytes` | int    | 10485760      | Maximum size of the webpage payload to fetch, in bytes (default is 10MB).                     |
 | `format`            | string | "plaintext"   | Output format of the fetched content. Options: `plaintext` or `markdown` (recommended).       |
 ### Brave
 | Config        | Type   | Default | Description               |
@ -84,6 +93,22 @@ By default, PicoClaw blocks the following dangerous commands:
 - Git: `git push`, `git force`
 - Other: `eval`, `source *.sh`
 ### Known Architectural Limitation
 The exec guard only validates the top-level command sent to PicoClaw. It does **not** recursively inspect child
 processes spawned by build tools or scripts after that command starts running.
 Examples of workflows that can bypass the direct command guard once the initial command is allowed:
 - `make run`
 - `go run ./cmd/...`
 - `cargo run`
 - `npm run build`
 This means the guard is useful for blocking obviously dangerous direct commands, but it is **not** a full sandbox for
 unreviewed build pipelines. If your threat model includes untrusted code in the workspace, use stronger isolation such
 as containers, VMs, or an approval flow around build-and-run commands.
 ### Configuration Example
 ```json
--- a/go.mod
+++ b/go.mod
@ -3,21 +3,22 @@ module github.com/sipeed/picoclaw
 go 1.25.7
 require (
 	fyne.io/systray v1.12.0
 	github.com/adhocore/gronx v1.19.6
-	github.com/anthropics/anthropic-sdk-go v1.22.1
+	github.com/anthropics/anthropic-sdk-go v1.26.0
 	github.com/bwmarrin/discordgo v0.29.0
-	github.com/caarlos0/env/v11 v11.3.1
+	github.com/caarlos0/env/v11 v11.4.0
 	github.com/chzyer/readline v1.5.1
 	github.com/ergochat/irc-go v0.5.0
 	github.com/ergochat/readline v0.1.3
 	github.com/gdamore/tcell/v2 v2.13.8
 	github.com/google/uuid v1.6.0
 	github.com/gomarkdown/markdown v0.0.0-20260217112301-37c66b85d6ab
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/h2non/filetype v1.1.3
 	github.com/larksuite/oapi-sdk-go/v3 v3.5.3
 	github.com/mdp/qrterminal/v3 v3.2.1
 	github.com/modelcontextprotocol/go-sdk v1.3.1
-	github.com/mymmrac/telego v1.6.0
+	github.com/mymmrac/telego v1.7.0
 	github.com/open-dingtalk/dingtalk-stream-sdk-go v0.9.1
 	github.com/openai/openai-go/v3 v3.22.0
 	github.com/rivo/tview v0.42.0
@ -27,9 +28,11 @@ require (
 	github.com/stretchr/testify v1.11.1
 	github.com/tencent-connect/botgo v0.2.1
 	go.mau.fi/whatsmeow v0.0.0-20260219150138-7ae702b1eed4
-	golang.org/x/oauth2 v0.35.0
+	golang.org/x/oauth2 v0.36.0
 	golang.org/x/term v0.40.0
 	golang.org/x/time v0.14.0
 	google.golang.org/protobuf v1.36.11
 	gopkg.in/yaml.v3 v3.0.1
 	maunium.net/go/mautrix v0.26.3
 	modernc.org/sqlite v1.46.1
 )
@ -42,6 +45,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/elliotchance/orderedmap/v3 v3.1.0 // indirect
 	github.com/gdamore/encoding v1.0.1 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
@ -58,9 +62,7 @@ require (
 	go.mau.fi/libsignal v0.2.1 // indirect
 	go.mau.fi/util v0.9.6 // indirect
 	golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a // indirect
 	golang.org/x/term v0.40.0 // indirect
 	golang.org/x/text v0.34.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/libc v1.67.6 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
@ -73,7 +75,7 @@ require (
 	github.com/bytedance/sonic v1.15.0 // indirect
 	github.com/bytedance/sonic/loader v0.5.0 // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect
-	github.com/github/copilot-sdk/go v0.1.23
+	github.com/github/copilot-sdk/go v0.1.32
 	github.com/go-resty/resty/v2 v2.17.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/jsonschema-go v0.4.2 // indirect
@ -87,10 +89,10 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.69.0 // indirect
-	github.com/valyala/fastjson v1.6.7 // indirect
+	github.com/valyala/fastjson v1.6.10 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	golang.org/x/arch v0.24.0 // indirect
-	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/crypto v0.48.0
 	golang.org/x/net v0.51.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.41.0 // indirect
--- a/go.sum
+++ b/go.sum
@ -1,6 +1,8 @@
 cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
 filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw=
 filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 fyne.io/systray v1.12.0 h1:CA1Kk0e2zwFlxtc02L3QFSiIbxJ/P0n582YrZHT7aTM=
 fyne.io/systray v1.12.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
 github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
 github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
 github.com/adhocore/gronx v1.19.6 h1:5KNVcoR9ACgL9HhEqCm5QXsab/gI4QDIybTAWcXDKDc=
@ -11,8 +13,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNg
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
 github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
-github.com/anthropics/anthropic-sdk-go v1.22.1 h1:xbsc3vJKCX/ELDZSpTNfz9wCgrFsamwFewPb1iI0Xh0=
+github.com/anthropics/anthropic-sdk-go v1.26.0 h1:oUTzFaUpAevfuELAP1sjL6CQJ9HHAfT7CoSYSac11PY=
-github.com/anthropics/anthropic-sdk-go v1.22.1/go.mod h1:WTz31rIUHUHqai2UslPpw5CwXrQP3geYBioRV4WOLvE=
+github.com/anthropics/anthropic-sdk-go v1.26.0/go.mod h1:qUKmaW+uuPB64iy1l+4kOSvaLqPXnHTTBKH6RVZ7q5Q=
 github.com/beeper/argo-go v1.1.2 h1:UQI2G8F+NLfGTOmTUI0254pGKx/HUU/etbUGTJv91Fs=
 github.com/beeper/argo-go v1.1.2/go.mod h1:M+LJAnyowKVQ6Rdj6XYGEn+qcVFkb3R/MUpqkGR0hM4=
 github.com/bwmarrin/discordgo v0.29.0 h1:FmWeXFaKUwrcL3Cx65c20bTRW+vOb6k8AnaP+EgjDno=
@ -23,16 +25,10 @@ github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uS
 github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k=
 github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE=
 github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo=
-github.com/caarlos0/env/v11 v11.3.1 h1:cArPWC15hWmEt+gWk7YBi7lEXTXCvpaSdCiZE2X5mCA=
+github.com/caarlos0/env/v11 v11.4.0 h1:Kcb6t5kIIr4XkoQC9AF2j+8E1Jsrl3Wz/hhm1LtoGAc=
-github.com/caarlos0/env/v11 v11.3.1/go.mod h1:qupehSf/Y0TUTsxKywqRt/vJjN5nz6vauiYEUUr8P4U=
+github.com/caarlos0/env/v11 v11.4.0/go.mod h1:qupehSf/Y0TUTsxKywqRt/vJjN5nz6vauiYEUUr8P4U=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM=
 github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
 github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
 github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
 github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
 github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
 github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
 github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
 github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g=
@ -44,20 +40,24 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 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/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/elliotchance/orderedmap/v3 v3.1.0 h1:j4DJ5ObEmMBt/lcwIecKcoRxIQUEnw0L804lXYDt/pg=
 github.com/elliotchance/orderedmap/v3 v3.1.0/go.mod h1:G+Hc2RwaZvJMcS4JpGCOyViCnGeKf0bTYCGTO4uhjSo=
 github.com/ergochat/irc-go v0.5.0 h1:woQ1RS9YbfgqPgSpPBBQeczXGIGzR0aC7dEgk469fTw=
 github.com/ergochat/irc-go v0.5.0/go.mod h1:2vi7KNpIPWnReB5hmLpl92eMywQvuIeIIGdt/FQCph0=
 github.com/ergochat/readline v0.1.3 h1:/DytGTmwdUJcLAe3k3VJgowh5vNnsdifYT6uVaf4pSo=
 github.com/ergochat/readline v0.1.3/go.mod h1:o3ux9QLHLm77bq7hDB21UTm6HlV2++IPDMfIfKDuOgY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
 github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
 github.com/gdamore/tcell/v2 v2.13.8 h1:Mys/Kl5wfC/GcC5Cx4C2BIQH9dbnhnkPgS9/wF3RlfU=
 github.com/gdamore/tcell/v2 v2.13.8/go.mod h1:+Wfe208WDdB7INEtCsNrAN6O2m+wsTPk1RAovjaILlo=
-github.com/github/copilot-sdk/go v0.1.23 h1:uExtO/inZQndCZMiSAA1hvXINiz9tqo/MZgQzFzurxw=
+github.com/github/copilot-sdk/go v0.1.32 h1:wc9SFWwxXhJts6vyzzboPLJqcEJGnHE8rMCAY1RrUgo=
-github.com/github/copilot-sdk/go v0.1.23/go.mod h1:GdwwBfMbm9AABLEM3x5IZKw4ZfwCYxZ1BgyytmZenQ0=
+github.com/github/copilot-sdk/go v0.1.32/go.mod h1:qc2iEF7hdO8kzSvbyGvrcGhuk2fzdW4xTtT0+1EH2ts=
 github.com/go-redis/redis/v8 v8.11.4/go.mod h1:2Z2wHZXdQpCDXEGzqMockDpNyYvi2l4Pxt6RJr792+w=
 github.com/go-resty/resty/v2 v2.6.0/go.mod h1:PwvJS6hvaPkjtjNg9ph+VrSD92bi5Zq73w/BIH7cC3Q=
 github.com/go-resty/resty/v2 v2.17.1 h1:x3aMpHK1YM9e4va/TMDRlusDDoZiQ+ViDu/WpA6xTM4=
@ -66,6 +66,8 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78
 github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
 github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
@ -140,8 +142,8 @@ github.com/mdp/qrterminal/v3 v3.2.1 h1:6+yQjiiOsSuXT5n9/m60E54vdgFsw0zhADHhHLrFe
 github.com/mdp/qrterminal/v3 v3.2.1/go.mod h1:jOTmXvnBsMy5xqLniO0R++Jmjs2sTm9dFSuQ5kpz/SU=
 github.com/modelcontextprotocol/go-sdk v1.3.1 h1:TfqtNKOIWN4Z1oqmPAiWDC2Jq7K9OdJaooe0teoXASI=
 github.com/modelcontextprotocol/go-sdk v1.3.1/go.mod h1:DgVX498dMD8UJlseK1S5i1T4tFz2fkBk4xogC3D15nw=
-github.com/mymmrac/telego v1.6.0 h1:Zc8rgyHozvd/7ZgyrigyHdAF9koHYMfilYfyB6wlFC0=
+github.com/mymmrac/telego v1.7.0 h1:yRO/l00tFGG4nY66ufUKb4ARqv7qx9+LsjQv/b0NEyo=
-github.com/mymmrac/telego v1.6.0/go.mod h1:xt6ZWA8zi8KmuzryE1ImEdl9JSwjHNpM4yhC7D8hU4Y=
+github.com/mymmrac/telego v1.7.0/go.mod h1:pdLV346EgVuq7Xrh3kMggeBiazeHhsdEoK0RTEOPXRM=
 github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
 github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@ -220,8 +222,8 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.69.0 h1:fNLLESD2SooWeh2cidsuFtOcrEi4uB4m1mPrkJMZyVI=
 github.com/valyala/fasthttp v1.69.0/go.mod h1:4wA4PfAraPlAsJ5jMSqCE2ug5tqUPwKXxVj8oNECGcw=
-github.com/valyala/fastjson v1.6.7 h1:ZE4tRy0CIkh+qDc5McjatheGX2czdn8slQjomexVpBM=
+github.com/valyala/fastjson v1.6.10 h1:/yjJg8jaVQdYR3arGxPE2X5z89xrlhS0eGXdv+ADTh4=
-github.com/valyala/fastjson v1.6.7/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
+github.com/valyala/fastjson v1.6.10/go.mod h1:e6FubmQouUNP73jtMLmcbxS6ydWIpOfhz34TSfO3JaE=
 github.com/vektah/gqlparser/v2 v2.5.27 h1:RHPD3JOplpk5mP5JGX8RKZkt2/Vwj/PZv0HxTdwFp0s=
 github.com/vektah/gqlparser/v2 v2.5.27/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
@ -271,13 +273,11 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
 golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
 golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
 golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
-golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ=
+golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
-golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
+golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -299,7 +299,6 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@ -361,6 +360,7 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 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=
--- a/pkg/agent/context.go
+++ b/pkg/agent/context.go
@ -458,7 +458,23 @@ func (cb *ContextBuilder) LoadBootstrapFiles() string {
 //
 // See: https://docs.anthropic.com/en/docs/build-with-claude/prompt-caching
 // See: https://platform.openai.com/docs/guides/prompt-caching
-func (cb *ContextBuilder) buildDynamicContext(channel, chatID string) string {
+func formatCurrentSenderLine(senderID, senderDisplayName string) string {
 	senderID = strings.TrimSpace(senderID)
 	senderDisplayName = strings.TrimSpace(senderDisplayName)
 	switch {
 	case senderDisplayName != "" && senderID != "":
 		return fmt.Sprintf("Current sender: %s (ID: %s)", senderDisplayName, senderID)
 	case senderDisplayName != "":
 		return fmt.Sprintf("Current sender: %s", senderDisplayName)
 	case senderID != "":
 		return fmt.Sprintf("Current sender: %s", senderID)
 	default:
 		return ""
 	}
 }
 func (cb *ContextBuilder) buildDynamicContext(channel, chatID, senderID, senderDisplayName string) string {
 	now := time.Now().Format("2006-01-02 15:04 (Monday)")
 	rt := fmt.Sprintf("%s %s, Go %s", runtime.GOOS, runtime.GOARCH, runtime.Version())
@ -468,6 +484,9 @@ func (cb *ContextBuilder) buildDynamicContext(channel, chatID string) string {
 	if channel != "" && chatID != "" {
 		fmt.Fprintf(&sb, "\n\n## Current Session\nChannel: %s\nChat ID: %s", channel, chatID)
 	}
 	if senderLine := formatCurrentSenderLine(senderID, senderDisplayName); senderLine != "" {
 		fmt.Fprintf(&sb, "\n\n## Current Sender\n%s", senderLine)
 	}
 	return sb.String()
 }
@ -477,7 +496,7 @@ func (cb *ContextBuilder) BuildMessages(
 	summary string,
 	currentMessage string,
 	media []string,
-	channel, chatID string,
+	channel, chatID, senderID, senderDisplayName string,
 ) []providers.Message {
 	messages := []providers.Message{}
@ -493,7 +512,7 @@ func (cb *ContextBuilder) BuildMessages(
 	staticPrompt := cb.BuildSystemPromptWithCache()
 	// Build short dynamic context (time, runtime, session) — changes per request
-	dynamicCtx := cb.buildDynamicContext(channel, chatID)
+	dynamicCtx := cb.buildDynamicContext(channel, chatID, senderID, senderDisplayName)
 	// Compose a single system message: static (cached) + dynamic + optional summary.
 	// Keeping all system content in one message ensures every provider adapter can
--- a/pkg/agent/context_cache_test.go
+++ b/pkg/agent/context_cache_test.go
@ -82,7 +82,7 @@ func TestSingleSystemMessage(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			msgs := cb.BuildMessages(tt.history, tt.summary, tt.message, nil, "test", "chat1")
+			msgs := cb.BuildMessages(tt.history, tt.summary, tt.message, nil, "test", "chat1", "", "")
 			systemCount := 0
 			for _, m := range msgs {
@ -126,6 +126,68 @@ func TestSingleSystemMessage(t *testing.T) {
 	}
 }
 func TestBuildMessages_CurrentSenderDynamicContext(t *testing.T) {
 	tmpDir := setupWorkspace(t, map[string]string{
 		"IDENTITY.md": "# Identity\nTest agent.",
 	})
 	defer os.RemoveAll(tmpDir)
 	cb := NewContextBuilder(tmpDir)
 	tests := []struct {
 		name              string
 		senderID          string
 		senderDisplayName string
 		wantLine          string
 		wantSection       bool
 	}{
 		{
 			name:              "both id and display name",
 			senderID:          "feishu:ou_xxx",
 			senderDisplayName: "Zhang San",
 			wantLine:          "Current sender: Zhang San (ID: feishu:ou_xxx)",
 			wantSection:       true,
 		},
 		{
 			name:              "display name only",
 			senderDisplayName: "Alice",
 			wantLine:          "Current sender: Alice",
 			wantSection:       true,
 		},
 		{
 			name:        "id only",
 			senderID:    "discord:123",
 			wantLine:    "Current sender: discord:123",
 			wantSection: true,
 		},
 		{
 			name:        "no sender info",
 			wantSection: false,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			msgs := cb.BuildMessages(nil, "", "hello", nil, "discord", "chat1", tt.senderID, tt.senderDisplayName)
 			sys := msgs[0].Content
 			if tt.wantSection {
 				if !strings.Contains(sys, "## Current Sender") {
 					t.Fatalf("system prompt missing Current Sender section:\n%s", sys)
 				}
 				if !strings.Contains(sys, tt.wantLine) {
 					t.Fatalf("system prompt missing sender line %q:\n%s", tt.wantLine, sys)
 				}
 				return
 			}
 			if strings.Contains(sys, "## Current Sender") {
 				t.Fatalf("system prompt should omit Current Sender section:\n%s", sys)
 			}
 		})
 	}
 }
 // TestMtimeAutoInvalidation verifies that the cache detects source file changes
 // via mtime without requiring explicit InvalidateCache().
 // Fix: original implementation had no auto-invalidation — edits to bootstrap files,
@ -576,7 +638,7 @@ func TestConcurrentBuildSystemPromptWithCache(t *testing.T) {
 				}
 				// Also exercise BuildMessages concurrently
-				msgs := cb.BuildMessages(nil, "", "hello", nil, "test", "chat")
+				msgs := cb.BuildMessages(nil, "", "hello", nil, "test", "chat", "", "")
 				if len(msgs) < 2 {
 					errs <- "BuildMessages returned fewer than 2 messages"
 					return
@ -664,6 +726,6 @@ func BenchmarkBuildMessagesWithCache(b *testing.B) {
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		_ = cb.BuildMessages(history, "summary", "new message", nil, "cli", "test")
+		_ = cb.BuildMessages(history, "summary", "new message", nil, "cli", "test", "", "")
 	}
 }
--- a/pkg/agent/instance.go
+++ b/pkg/agent/instance.go
@ -10,6 +10,7 @@ import (
 	"strings"
 	"github.com/sipeed/picoclaw/pkg/config"
 	"github.com/sipeed/picoclaw/pkg/media"
 	"github.com/sipeed/picoclaw/pkg/memory"
 	"github.com/sipeed/picoclaw/pkg/providers"
 	"github.com/sipeed/picoclaw/pkg/routing"
@ -66,7 +67,7 @@ func NewAgentInstance(
 	readRestrict := restrict && !defaults.AllowReadOutsideWorkspace
 	// Compile path whitelist patterns from config.
-	allowReadPaths := compilePatterns(cfg.Tools.AllowReadPaths)
+	allowReadPaths := buildAllowReadPatterns(cfg)
 	allowWritePaths := compilePatterns(cfg.Tools.AllowWritePaths)
 	toolsRegistry := tools.NewToolRegistry()
@ -82,7 +83,7 @@ func NewAgentInstance(
 		toolsRegistry.Register(tools.NewListDirTool(workspace, readRestrict, allowReadPaths))
 	}
 	if cfg.Tools.IsToolEnabled("exec") {
-		execTool, err := tools.NewExecToolWithConfig(workspace, restrict, cfg)
+		execTool, err := tools.NewExecToolWithConfig(workspace, restrict, cfg, allowReadPaths)
 		if err != nil {
 			log.Fatalf("Critical error: unable to initialize exec tool: %v", err)
 		}
@ -282,6 +283,28 @@ func compilePatterns(patterns []string) []*regexp.Regexp {
 	return compiled
 }
 func buildAllowReadPatterns(cfg *config.Config) []*regexp.Regexp {
 	var configured []string
 	if cfg != nil {
 		configured = cfg.Tools.AllowReadPaths
 	}
 	compiled := compilePatterns(configured)
 	mediaDirPattern := regexp.MustCompile(mediaTempDirPattern())
 	for _, pattern := range compiled {
 		if pattern.String() == mediaDirPattern.String() {
 			return compiled
 		}
 	}
 	return append(compiled, mediaDirPattern)
 }
 func mediaTempDirPattern() string {
 	sep := regexp.QuoteMeta(string(os.PathSeparator))
 	return "^" + regexp.QuoteMeta(filepath.Clean(media.TempDir())) + "(?:" + sep + "|$)"
 }
 // Close releases resources held by the agent's session store.
 func (a *AgentInstance) Close() error {
 	if a.Sessions != nil {
--- a/pkg/agent/instance_test.go
+++ b/pkg/agent/instance_test.go
@ -1,10 +1,14 @@
 package agent
 import (
 	"context"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 	"github.com/sipeed/picoclaw/pkg/config"
 	"github.com/sipeed/picoclaw/pkg/media"
 )
 func TestNewAgentInstance_UsesDefaultsTemperatureAndMaxTokens(t *testing.T) {
@ -160,3 +164,85 @@ func TestNewAgentInstance_ResolveCandidatesFromModelListAlias(t *testing.T) {
 		})
 	}
 }
 func TestNewAgentInstance_AllowsMediaTempDirForReadListAndExec(t *testing.T) {
 	workspace := t.TempDir()
 	mediaDir := media.TempDir()
 	if err := os.MkdirAll(mediaDir, 0o700); err != nil {
 		t.Fatalf("MkdirAll(mediaDir) error = %v", err)
 	}
 	mediaFile, err := os.CreateTemp(mediaDir, "instance-tool-*.txt")
 	if err != nil {
 		t.Fatalf("CreateTemp(mediaDir) error = %v", err)
 	}
 	mediaPath := mediaFile.Name()
 	if _, err := mediaFile.WriteString("attachment content"); err != nil {
 		mediaFile.Close()
 		t.Fatalf("WriteString(mediaFile) error = %v", err)
 	}
 	if err := mediaFile.Close(); err != nil {
 		t.Fatalf("Close(mediaFile) error = %v", err)
 	}
 	t.Cleanup(func() { _ = os.Remove(mediaPath) })
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				Workspace:           workspace,
 				ModelName:           "test-model",
 				RestrictToWorkspace: true,
 			},
 		},
 		Tools: config.ToolsConfig{
 			ReadFile: config.ReadFileToolConfig{Enabled: true},
 			ListDir:  config.ToolConfig{Enabled: true},
 			Exec: config.ExecConfig{
 				ToolConfig:         config.ToolConfig{Enabled: true},
 				EnableDenyPatterns: true,
 				AllowRemote:        true,
 			},
 		},
 	}
 	agent := NewAgentInstance(nil, &cfg.Agents.Defaults, cfg, &mockProvider{})
 	readTool, ok := agent.Tools.Get("read_file")
 	if !ok {
 		t.Fatal("read_file tool not registered")
 	}
 	readResult := readTool.Execute(context.Background(), map[string]any{"path": mediaPath})
 	if readResult.IsError {
 		t.Fatalf("read_file should allow media temp dir, got: %s", readResult.ForLLM)
 	}
 	if !strings.Contains(readResult.ForLLM, "attachment content") {
 		t.Fatalf("read_file output missing media content: %s", readResult.ForLLM)
 	}
 	listTool, ok := agent.Tools.Get("list_dir")
 	if !ok {
 		t.Fatal("list_dir tool not registered")
 	}
 	listResult := listTool.Execute(context.Background(), map[string]any{"path": mediaDir})
 	if listResult.IsError {
 		t.Fatalf("list_dir should allow media temp dir, got: %s", listResult.ForLLM)
 	}
 	if !strings.Contains(listResult.ForLLM, filepath.Base(mediaPath)) {
 		t.Fatalf("list_dir output missing media file: %s", listResult.ForLLM)
 	}
 	execTool, ok := agent.Tools.Get("exec")
 	if !ok {
 		t.Fatal("exec tool not registered")
 	}
 	execResult := execTool.Execute(context.Background(), map[string]any{
 		"command":     "cat " + filepath.Base(mediaPath),
 		"working_dir": mediaDir,
 	})
 	if execResult.IsError {
 		t.Fatalf("exec should allow media temp dir, got: %s", execResult.ForLLM)
 	}
 	if !strings.Contains(execResult.ForLLM, "attachment content") {
 		t.Fatalf("exec output missing media content: %s", execResult.ForLLM)
 	}
 }
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@ -48,6 +48,9 @@ type AgentLoop struct {
 	transcriber    voice.Transcriber
 	cmdRegistry    *commands.Registry
 	mcp            mcpRuntime
 	mu             sync.RWMutex
 	// Track active requests for safe provider cleanup
 	activeRequests sync.WaitGroup
 }
 // processOptions configures how a message is processed
@ -55,6 +58,8 @@ type processOptions struct {
 	SessionKey        string   // Session identifier for history/context
 	Channel           string   // Target channel for tool execution
 	ChatID            string   // Target chat ID for tool execution
 	SenderID          string   // Current sender ID for dynamic context
 	SenderDisplayName string   // Current sender display name for dynamic context
 	UserMessage       string   // User message content (may include prefix)
 	Media             []string // media:// refs from inbound message
 	DefaultResponse   string   // Response when LLM returns empty
@ -114,6 +119,8 @@ func registerSharedTools(
 	registry *AgentRegistry,
 	provider providers.LLMProvider,
 ) {
 	allowReadPaths := buildAllowReadPatterns(cfg)
 	for _, agentID := range registry.ListAgentIDs() {
 		agent, ok := registry.GetAgent(agentID)
 		if !ok {
@ -154,7 +161,12 @@ func registerSharedTools(
 			}
 		}
 		if cfg.Tools.IsToolEnabled("web_fetch") {
-			fetchTool, err := tools.NewWebFetchToolWithProxy(50000, cfg.Tools.Web.Proxy, cfg.Tools.Web.FetchLimitBytes)
+			fetchTool, err := tools.NewWebFetchToolWithProxy(
 				50000,
 				cfg.Tools.Web.Proxy,
 				cfg.Tools.Web.Format,
 				cfg.Tools.Web.FetchLimitBytes,
 				cfg.Tools.Web.PrivateHostWhitelist)
 			if err != nil {
 				logger.ErrorCF("agent", "Failed to create web fetch tool", map[string]any{"error": err.Error()})
 			} else {
@ -192,6 +204,7 @@ func registerSharedTools(
 				cfg.Agents.Defaults.RestrictToWorkspace,
 				cfg.Agents.Defaults.GetMaxMediaSize(),
 				nil,
 				allowReadPaths,
 			)
 			agent.Tools.Register(sendFileTool)
 		}
@ -219,26 +232,33 @@ func registerSharedTools(
 			}
 		}
-		// Spawn tool with allowlist checker
+		// Spawn and spawn_status tools share a SubagentManager.
-		if cfg.Tools.IsToolEnabled("spawn") {
+		// Construct it when either tool is enabled (both require subagent).
-			if cfg.Tools.IsToolEnabled("subagent") {
+		spawnEnabled := cfg.Tools.IsToolEnabled("spawn")
 		spawnStatusEnabled := cfg.Tools.IsToolEnabled("spawn_status")
 		if (spawnEnabled || spawnStatusEnabled) && cfg.Tools.IsToolEnabled("subagent") {
 			subagentManager := tools.NewSubagentManager(provider, agent.Model, agent.Workspace)
 			subagentManager.SetLLMOptions(agent.MaxTokens, agent.Temperature)
 			if spawnEnabled {
 				spawnTool := tools.NewSpawnTool(subagentManager)
 				currentAgentID := agentID
 				spawnTool.SetAllowlistChecker(func(targetAgentID string) bool {
 					return registry.CanSpawnSubagent(currentAgentID, targetAgentID)
 				})
 				agent.Tools.Register(spawnTool)
 			} else {
 				logger.WarnCF("agent", "spawn tool requires subagent to be enabled", nil)
 			}
 			if spawnStatusEnabled {
 				agent.Tools.Register(tools.NewSpawnStatusTool(subagentManager))
 			}
 		} else if (spawnEnabled || spawnStatusEnabled) && !cfg.Tools.IsToolEnabled("subagent") {
 			logger.WarnCF("agent", "spawn/spawn_status tools require subagent to be enabled", nil)
 		}
 	}
 }
 func (al *AgentLoop) Run(ctx context.Context) error {
 	al.running.Store(true)
 	if err := al.ensureMCPInitialized(ctx); err != nil {
 		return err
 	}
@ -247,12 +267,10 @@ func (al *AgentLoop) Run(ctx context.Context) error {
 		select {
 		case <-ctx.Done():
 			return nil
-		default:
+		case msg, ok := <-al.bus.InboundChan():
 			msg, ok := al.bus.ConsumeInbound(ctx)
 			if !ok {
-				continue
+				return nil
 			}
 			// Process message
 			func() {
 				defer func() {
@ -283,7 +301,7 @@ func (al *AgentLoop) Run(ctx context.Context) error {
 				// If so, skip publishing to avoid duplicate messages to the user.
 				// Use default agent's tools to check (message tool is shared).
 				alreadySent := false
-					defaultAgent := al.registry.GetDefaultAgent()
+				defaultAgent := al.GetRegistry().GetDefaultAgent()
 				if defaultAgent != nil {
 					if tool, ok := defaultAgent.Tools.Get("message"); ok {
 						if mt, ok := tool.(*tools.MessageTool); ok {
@ -312,7 +330,8 @@ func (al *AgentLoop) Run(ctx context.Context) error {
 					)
 				}
 			}
-			}()
+		default:
 			time.Sleep(time.Microsecond * 200)
 		}
 	}
@ -336,12 +355,13 @@ func (al *AgentLoop) Close() {
 		}
 	}
-	al.registry.Close()
+	al.GetRegistry().Close()
 }
 func (al *AgentLoop) RegisterTool(tool tools.Tool) {
-	for _, agentID := range al.registry.ListAgentIDs() {
+	registry := al.GetRegistry()
-		if agent, ok := al.registry.GetAgent(agentID); ok {
+	for _, agentID := range registry.ListAgentIDs() {
 		if agent, ok := registry.GetAgent(agentID); ok {
 			agent.Tools.Register(tool)
 		}
 	}
@ -351,12 +371,123 @@ func (al *AgentLoop) SetChannelManager(cm *channels.Manager) {
 	al.channelManager = cm
 }
 // ReloadProviderAndConfig atomically swaps the provider and config with proper synchronization.
 // It uses a context to allow timeout control from the caller.
 // Returns an error if the reload fails or context is canceled.
 func (al *AgentLoop) ReloadProviderAndConfig(
 	ctx context.Context,
 	provider providers.LLMProvider,
 	cfg *config.Config,
 ) error {
 	// Validate inputs
 	if provider == nil {
 		return fmt.Errorf("provider cannot be nil")
 	}
 	if cfg == nil {
 		return fmt.Errorf("config cannot be nil")
 	}
 	// Create new registry with updated config and provider
 	// Wrap in defer/recover to handle any panics gracefully
 	var registry *AgentRegistry
 	var panicErr error
 	done := make(chan struct{}, 1)
 	go func() {
 		defer func() {
 			if r := recover(); r != nil {
 				panicErr = fmt.Errorf("panic during registry creation: %v", r)
 				logger.ErrorCF("agent", "Panic during registry creation",
 					map[string]any{"panic": r})
 			}
 			close(done)
 		}()
 		registry = NewAgentRegistry(cfg, provider)
 	}()
 	// Wait for completion or context cancellation
 	select {
 	case <-done:
 		if registry == nil {
 			if panicErr != nil {
 				return fmt.Errorf("registry creation failed: %w", panicErr)
 			}
 			return fmt.Errorf("registry creation failed (nil result)")
 		}
 	case <-ctx.Done():
 		return fmt.Errorf("context canceled during registry creation: %w", ctx.Err())
 	}
 	// Check context again before proceeding
 	if err := ctx.Err(); err != nil {
 		return fmt.Errorf("context canceled after registry creation: %w", err)
 	}
 	// Ensure shared tools are re-registered on the new registry
 	registerSharedTools(cfg, al.bus, registry, provider)
 	// Atomically swap the config and registry under write lock
 	// This ensures readers see a consistent pair
 	al.mu.Lock()
 	oldRegistry := al.registry
 	// Store new values
 	al.cfg = cfg
 	al.registry = registry
 	// Also update fallback chain with new config
 	al.fallback = providers.NewFallbackChain(providers.NewCooldownTracker())
 	al.mu.Unlock()
 	// Close old provider after releasing the lock
 	// This prevents blocking readers while closing
 	if oldProvider, ok := extractProvider(oldRegistry); ok {
 		if stateful, ok := oldProvider.(providers.StatefulProvider); ok {
 			// Give in-flight requests a moment to complete
 			// Use a reasonable timeout that balances cleanup vs resource usage
 			select {
 			case <-time.After(100 * time.Millisecond):
 				stateful.Close()
 			case <-ctx.Done():
 				// Context canceled, close immediately but log warning
 				logger.WarnCF("agent", "Context canceled during provider cleanup, forcing close",
 					map[string]any{"error": ctx.Err()})
 				stateful.Close()
 			}
 		}
 	}
 	logger.InfoCF("agent", "Provider and config reloaded successfully",
 		map[string]any{
 			"model": cfg.Agents.Defaults.GetModelName(),
 		})
 	return nil
 }
 // GetRegistry returns the current registry (thread-safe)
 func (al *AgentLoop) GetRegistry() *AgentRegistry {
 	al.mu.RLock()
 	defer al.mu.RUnlock()
 	return al.registry
 }
 // GetConfig returns the current config (thread-safe)
 func (al *AgentLoop) GetConfig() *config.Config {
 	al.mu.RLock()
 	defer al.mu.RUnlock()
 	return al.cfg
 }
 // SetMediaStore injects a MediaStore for media lifecycle management.
 func (al *AgentLoop) SetMediaStore(s media.MediaStore) {
 	al.mediaStore = s
 	// Propagate store to send_file tools in all agents.
-	al.registry.ForEachTool("send_file", func(t tools.Tool) {
+	registry := al.GetRegistry()
 	registry.ForEachTool("send_file", func(t tools.Tool) {
 		if sf, ok := t.(*tools.SendFileTool); ok {
 			sf.SetMediaStore(s)
 		}
@ -545,7 +676,7 @@ func (al *AgentLoop) ProcessHeartbeat(
 	ctx context.Context,
 	content, channel, chatID string,
 ) (string, error) {
-	agent := al.registry.GetDefaultAgent()
+	agent := al.GetRegistry().GetDefaultAgent()
 	if agent == nil {
 		return "", fmt.Errorf("no default agent for heartbeat")
 	}
@ -624,6 +755,8 @@ func (al *AgentLoop) processMessage(ctx context.Context, msg bus.InboundMessage)
 		SessionKey:        sessionKey,
 		Channel:           msg.Channel,
 		ChatID:            msg.ChatID,
 		SenderID:          msg.SenderID,
 		SenderDisplayName: msg.Sender.DisplayName,
 		UserMessage:       msg.Content,
 		Media:             msg.Media,
 		DefaultResponse:   defaultResponse,
@ -641,7 +774,8 @@ func (al *AgentLoop) processMessage(ctx context.Context, msg bus.InboundMessage)
 }
 func (al *AgentLoop) resolveMessageRoute(msg bus.InboundMessage) (routing.ResolvedRoute, *AgentInstance, error) {
-	route := al.registry.ResolveRoute(routing.RouteInput{
+	registry := al.GetRegistry()
 	route := registry.ResolveRoute(routing.RouteInput{
 		Channel:    msg.Channel,
 		AccountID:  inboundMetadata(msg, metadataKeyAccountID),
 		Peer:       extractPeer(msg),
@ -650,9 +784,9 @@ func (al *AgentLoop) resolveMessageRoute(msg bus.InboundMessage) (routing.Resolv
 		TeamID:     inboundMetadata(msg, metadataKeyTeamID),
 	})
-	agent, ok := al.registry.GetAgent(route.AgentID)
+	agent, ok := registry.GetAgent(route.AgentID)
 	if !ok {
-		agent = al.registry.GetDefaultAgent()
+		agent = registry.GetDefaultAgent()
 	}
 	if agent == nil {
 		return routing.ResolvedRoute{}, nil, fmt.Errorf("no agent available for route (agent_id=%s)", route.AgentID)
@ -714,7 +848,7 @@ func (al *AgentLoop) processSystemMessage(
 	}
 	// Use default agent for system messages
-	agent := al.registry.GetDefaultAgent()
+	agent := al.GetRegistry().GetDefaultAgent()
 	if agent == nil {
 		return "", fmt.Errorf("no default agent for system message")
 	}
@ -767,10 +901,13 @@ func (al *AgentLoop) runAgentLoop(
 		opts.Media,
 		opts.Channel,
 		opts.ChatID,
 		opts.SenderID,
 		opts.SenderDisplayName,
 	)
-	// Resolve media:// refs to base64 data URLs (streaming)
+	// Resolve media:// refs: images→base64 data URLs, non-images→local paths in content
-	maxMediaSize := al.cfg.Agents.Defaults.GetMaxMediaSize()
+	cfg := al.GetConfig()
 	maxMediaSize := cfg.Agents.Defaults.GetMaxMediaSize()
 	messages = resolveMediaRefs(messages, al.mediaStore, maxMediaSize)
 	// 2. Save user message to session
@ -906,6 +1043,19 @@ func (al *AgentLoop) runLLMIteration(
 		// Build tool definitions
 		providerToolDefs := agent.Tools.ToProviderDefs()
 		// Determine whether the provider's native web search should replace
 		// the client-side web_search tool for this request. Only enable when web
 		// search is actually enabled and registered (so users who disabled web
 		// access do not get provider-side search or billing).
 		_, hasWebSearch := agent.Tools.Get("web_search")
 		useNativeSearch := al.cfg.Tools.Web.PreferNative &&
 			isNativeSearchProvider(agent.Provider) &&
 			hasWebSearch
 		if useNativeSearch {
 			providerToolDefs = filterClientWebSearch(providerToolDefs)
 		}
 		// Log LLM request details
 		logger.DebugCF("agent", "LLM request",
 			map[string]any{
@ -914,6 +1064,7 @@ func (al *AgentLoop) runLLMIteration(
 				"model":             activeModel,
 				"messages_count":    len(messages),
 				"tools_count":       len(providerToolDefs),
 				"native_search":     useNativeSearch,
 				"max_tokens":        agent.MaxTokens,
 				"temperature":       agent.Temperature,
 				"system_prompt_len": len(messages[0].Content),
@ -936,6 +1087,9 @@ func (al *AgentLoop) runLLMIteration(
 			"temperature":      agent.Temperature,
 			"prompt_cache_key": agent.ID,
 		}
 		if useNativeSearch {
 			llmOpts["native_search"] = true
 		}
 		// parseThinkingLevel guarantees ThinkingOff for empty/unknown values,
 		// so checking != ThinkingOff is sufficient.
 		if agent.ThinkingLevel != ThinkingOff {
@ -948,6 +1102,9 @@ func (al *AgentLoop) runLLMIteration(
 		}
 		callLLM := func() (*providers.LLMResponse, error) {
 			al.activeRequests.Add(1)
 			defer al.activeRequests.Done()
 			if len(activeCandidates) > 1 && al.fallback != nil {
 				fbResult, fbErr := al.fallback.Execute(
 					ctx,
@ -1034,7 +1191,7 @@ func (al *AgentLoop) runLLMIteration(
 				newSummary := agent.Sessions.GetSummary(opts.SessionKey)
 				messages = agent.ContextBuilder.BuildMessages(
 					newHistory, newSummary, "",
-					nil, opts.Channel, opts.ChatID,
+					nil, opts.Channel, opts.ChatID, opts.SenderID, opts.SenderDisplayName,
 				)
 				continue
 			}
@ -1046,6 +1203,7 @@ func (al *AgentLoop) runLLMIteration(
 				map[string]any{
 					"agent_id":  agent.ID,
 					"iteration": iteration,
 					"model":     activeModel,
 					"error":     err.Error(),
 				})
 			return "", iteration, fmt.Errorf("LLM call failed after retries: %w", err)
@ -1397,7 +1555,8 @@ func (al *AgentLoop) forceCompression(agent *AgentInstance, sessionKey string) {
 func (al *AgentLoop) GetStartupInfo() map[string]any {
 	info := make(map[string]any)
-	agent := al.registry.GetDefaultAgent()
+	registry := al.GetRegistry()
 	agent := registry.GetDefaultAgent()
 	if agent == nil {
 		return info
 	}
@ -1414,8 +1573,8 @@ func (al *AgentLoop) GetStartupInfo() map[string]any {
 	// Agents info
 	info["agents"] = map[string]any{
-		"count": len(al.registry.ListAgentIDs()),
+		"count": len(registry.ListAgentIDs()),
-		"ids":   al.registry.ListAgentIDs(),
+		"ids":   registry.ListAgentIDs(),
 	}
 	return info
@ -1603,7 +1762,10 @@ func (al *AgentLoop) retryLLMCall(
 	var err error
 	for attempt := 0; attempt < maxRetries; attempt++ {
-		resp, err = agent.Provider.Chat(
+		al.activeRequests.Add(1)
 		resp, err = func() (*providers.LLMResponse, error) {
 			defer al.activeRequests.Done()
 			return agent.Provider.Chat(
 				ctx,
 				[]providers.Message{{Role: "user", Content: prompt}},
 				nil,
@ -1614,6 +1776,8 @@ func (al *AgentLoop) retryLLMCall(
 					"prompt_cache_key": agent.ID,
 				},
 			)
 		}()
 		if err == nil && resp != nil && resp.Content != "" {
 			return resp, nil
 		}
@ -1746,9 +1910,11 @@ func (al *AgentLoop) handleCommand(
 }
 func (al *AgentLoop) buildCommandsRuntime(agent *AgentInstance, opts *processOptions) *commands.Runtime {
 	registry := al.GetRegistry()
 	cfg := al.GetConfig()
 	rt := &commands.Runtime{
-		Config:          al.cfg,
+		Config:          cfg,
-		ListAgentIDs:    al.registry.ListAgentIDs,
+		ListAgentIDs:    registry.ListAgentIDs,
 		ListDefinitions: al.cmdRegistry.Definitions,
 		GetEnabledChannels: func() []string {
 			if al.channelManager == nil {
@ -1768,7 +1934,7 @@ func (al *AgentLoop) buildCommandsRuntime(agent *AgentInstance, opts *processOpt
 	}
 	if agent != nil {
 		rt.GetModelInfo = func() (string, string) {
-			return agent.Model, al.cfg.Agents.Defaults.Provider
+			return agent.Model, cfg.Agents.Defaults.Provider
 		}
 		rt.SwitchModel = func(value string) (string, error) {
 			oldModel := agent.Model
@ -1832,3 +1998,38 @@ func extractParentPeer(msg bus.InboundMessage) *routing.RoutePeer {
 	}
 	return &routing.RoutePeer{Kind: parentKind, ID: parentID}
 }
 // isNativeSearchProvider reports whether the given LLM provider implements
 // NativeSearchCapable and returns true for SupportsNativeSearch.
 func isNativeSearchProvider(p providers.LLMProvider) bool {
 	if ns, ok := p.(providers.NativeSearchCapable); ok {
 		return ns.SupportsNativeSearch()
 	}
 	return false
 }
 // filterClientWebSearch returns a copy of tools with the client-side
 // web_search tool removed. Used when native provider search is preferred.
 func filterClientWebSearch(tools []providers.ToolDefinition) []providers.ToolDefinition {
 	result := make([]providers.ToolDefinition, 0, len(tools))
 	for _, t := range tools {
 		if strings.EqualFold(t.Function.Name, "web_search") {
 			continue
 		}
 		result = append(result, t)
 	}
 	return result
 }
 // Helper to extract provider from registry for cleanup
 func extractProvider(registry *AgentRegistry) (providers.LLMProvider, bool) {
 	if registry == nil {
 		return nil, false
 	}
 	// Get any agent to access the provider
 	defaultAgent := registry.GetDefaultAgent()
 	if defaultAgent == nil {
 		return nil, false
 	}
 	return defaultAgent.Provider, true
 }
--- a/pkg/agent/loop_mcp.go
+++ b/pkg/agent/loop_mcp.go
@ -63,6 +63,22 @@ func (al *AgentLoop) ensureMCPInitialized(ctx context.Context) error {
 		return nil
 	}
 	if al.cfg.Tools.MCP.Servers == nil || len(al.cfg.Tools.MCP.Servers) == 0 {
 		logger.WarnCF("agent", "MCP is enabled but no servers are configured, skipping MCP initialization", nil)
 		return nil
 	}
 	findValidServer := false
 	for _, serverCfg := range al.cfg.Tools.MCP.Servers {
 		if serverCfg.Enabled {
 			findValidServer = true
 		}
 	}
 	if !findValidServer {
 		logger.WarnCF("agent", "MCP is enabled but no valid servers are configured, skipping MCP initialization", nil)
 		return nil
 	}
 	al.mcp.initOnce.Do(func() {
 		mcpManager := mcp.NewManager()
--- a/pkg/agent/loop_media.go
+++ b/pkg/agent/loop_media.go
@ -20,9 +20,10 @@ import (
 	"github.com/sipeed/picoclaw/pkg/providers"
 )
-// resolveMediaRefs replaces media:// refs in message Media fields with base64 data URLs.
+// resolveMediaRefs resolves media:// refs in messages.
-// Uses streaming base64 encoding (file handle → encoder → buffer) to avoid holding
+// Images are base64-encoded into the Media array for multimodal LLMs.
-// both raw bytes and encoded string in memory simultaneously.
+// Non-image files (documents, audio, video) have their local path injected
 // into Content so the agent can access them via file tools like read_file.
 // Returns a new slice; original messages are not mutated.
 func resolveMediaRefs(messages []providers.Message, store media.MediaStore, maxSize int) []providers.Message {
 	if store == nil {
@ -38,6 +39,8 @@ func resolveMediaRefs(messages []providers.Message, store media.MediaStore, maxS
 		}
 		resolved := make([]string, 0, len(m.Media))
 		var pathTags []string
 		for _, ref := range m.Media {
 			if !strings.HasPrefix(ref, "media://") {
 				resolved = append(resolved, ref)
@ -61,38 +64,63 @@ func resolveMediaRefs(messages []providers.Message, store media.MediaStore, maxS
 				})
 				continue
 			}
 			mime := detectMIME(localPath, meta)
 			if strings.HasPrefix(mime, "image/") {
 				dataURL := encodeImageToDataURL(localPath, mime, info, maxSize)
 				if dataURL != "" {
 					resolved = append(resolved, dataURL)
 				}
 				continue
 			}
 			pathTags = append(pathTags, buildPathTag(mime, localPath))
 		}
 		result[i].Media = resolved
 		if len(pathTags) > 0 {
 			result[i].Content = injectPathTags(result[i].Content, pathTags)
 		}
 	}
 	return result
 }
 // detectMIME determines the MIME type from metadata or magic-bytes detection.
 // Returns empty string if detection fails.
 func detectMIME(localPath string, meta media.MediaMeta) string {
 	if meta.ContentType != "" {
 		return meta.ContentType
 	}
 	kind, err := filetype.MatchFile(localPath)
 	if err != nil || kind == filetype.Unknown {
 		return ""
 	}
 	return kind.MIME.Value
 }
 // encodeImageToDataURL base64-encodes an image file into a data URL.
 // Returns empty string if the file exceeds maxSize or encoding fails.
 func encodeImageToDataURL(localPath, mime string, info os.FileInfo, maxSize int) string {
 	if info.Size() > int64(maxSize) {
 		logger.WarnCF("agent", "Media file too large, skipping", map[string]any{
 			"path":     localPath,
 			"size":     info.Size(),
 			"max_size": maxSize,
 		})
-				continue
+		return ""
 	}
 			// Determine MIME type: prefer metadata, fallback to magic-bytes detection
 			mime := meta.ContentType
 			if mime == "" {
 				kind, ftErr := filetype.MatchFile(localPath)
 				if ftErr != nil || kind == filetype.Unknown {
 					logger.WarnCF("agent", "Unknown media type, skipping", map[string]any{
 						"path": localPath,
 					})
 					continue
 				}
 				mime = kind.MIME.Value
 			}
 			// Streaming base64: open file → base64 encoder → buffer
 			// Peak memory: ~1.33x file size (buffer only, no raw bytes copy)
 	f, err := os.Open(localPath)
 	if err != nil {
 		logger.WarnCF("agent", "Failed to open media file", map[string]any{
 			"path":  localPath,
 			"error": err.Error(),
 		})
-				continue
+		return ""
 	}
 	defer f.Close()
 	prefix := "data:" + mime + ";base64,"
 	encodedLen := base64.StdEncoding.EncodedLen(int(info.Size()))
@ -102,21 +130,51 @@ func resolveMediaRefs(messages []providers.Message, store media.MediaStore, maxS
 	encoder := base64.NewEncoder(base64.StdEncoding, &buf)
 	if _, err := io.Copy(encoder, f); err != nil {
 				f.Close()
 		logger.WarnCF("agent", "Failed to encode media file", map[string]any{
 			"path":  localPath,
 			"error": err.Error(),
 		})
-				continue
+		return ""
 	}
 	encoder.Close()
 			f.Close()
-			resolved = append(resolved, buf.String())
+	return buf.String()
 }
-		result[i].Media = resolved
+// buildPathTag creates a structured tag exposing the local file path.
 // Tag type is derived from MIME: [audio:/path], [video:/path], or [file:/path].
 func buildPathTag(mime, localPath string) string {
 	switch {
 	case strings.HasPrefix(mime, "audio/"):
 		return "[audio:" + localPath + "]"
 	case strings.HasPrefix(mime, "video/"):
 		return "[video:" + localPath + "]"
 	default:
 		return "[file:" + localPath + "]"
 	}
 }
-	return result
+// injectPathTags replaces generic media tags in content with path-bearing versions,
 // or appends if no matching generic tag is found.
 func injectPathTags(content string, tags []string) string {
 	for _, tag := range tags {
 		var generic string
 		switch {
 		case strings.HasPrefix(tag, "[audio:"):
 			generic = "[audio]"
 		case strings.HasPrefix(tag, "[video:"):
 			generic = "[video]"
 		case strings.HasPrefix(tag, "[file:"):
 			generic = "[file]"
 		}
 		if generic != "" && strings.Contains(content, generic) {
 			content = strings.Replace(content, generic, tag, 1)
 		} else if content == "" {
 			content = tag
 		} else {
 			content += " " + tag
 		}
 	}
 	return content
 }
--- a/pkg/agent/loop_test.go
+++ b/pkg/agent/loop_test.go
@ -30,6 +30,28 @@ func (f *fakeChannel) IsAllowed(string) bool                                   {
 func (f *fakeChannel) IsAllowedSender(sender bus.SenderInfo) bool              { return true }
 func (f *fakeChannel) ReasoningChannelID() string                              { return f.id }
 type recordingProvider struct {
 	lastMessages []providers.Message
 }
 func (r *recordingProvider) Chat(
 	ctx context.Context,
 	messages []providers.Message,
 	tools []providers.ToolDefinition,
 	model string,
 	opts map[string]any,
 ) (*providers.LLMResponse, error) {
 	r.lastMessages = append([]providers.Message(nil), messages...)
 	return &providers.LLMResponse{
 		Content:   "Mock response",
 		ToolCalls: []providers.ToolCall{},
 	}, nil
 }
 func (r *recordingProvider) GetDefaultModel() string {
 	return "mock-model"
 }
 func newTestAgentLoop(
 	t *testing.T,
 ) (al *AgentLoop, cfg *config.Config, msgBus *bus.MessageBus, provider *mockProvider, cleanup func()) {
@ -54,6 +76,59 @@ func newTestAgentLoop(
 	return al, cfg, msgBus, provider, func() { os.RemoveAll(tmpDir) }
 }
 func TestProcessMessage_IncludesCurrentSenderInDynamicContext(t *testing.T) {
 	tmpDir, err := os.MkdirTemp("", "agent-test-*")
 	if err != nil {
 		t.Fatalf("Failed to create temp dir: %v", err)
 	}
 	defer os.RemoveAll(tmpDir)
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
 				Workspace:         tmpDir,
 				Model:             "test-model",
 				MaxTokens:         4096,
 				MaxToolIterations: 10,
 			},
 		},
 	}
 	msgBus := bus.NewMessageBus()
 	provider := &recordingProvider{}
 	al := NewAgentLoop(cfg, msgBus, provider)
 	response, err := al.processMessage(context.Background(), bus.InboundMessage{
 		Channel:  "discord",
 		SenderID: "discord:123",
 		Sender: bus.SenderInfo{
 			DisplayName: "Alice",
 		},
 		ChatID:  "group-1",
 		Content: "hello",
 	})
 	if err != nil {
 		t.Fatalf("processMessage() error = %v", err)
 	}
 	if response != "Mock response" {
 		t.Fatalf("processMessage() response = %q, want %q", response, "Mock response")
 	}
 	if len(provider.lastMessages) == 0 {
 		t.Fatal("provider did not receive any messages")
 	}
 	systemPrompt := provider.lastMessages[0].Content
 	wantSender := "## Current Sender\nCurrent sender: Alice (ID: discord:123)"
 	if !strings.Contains(systemPrompt, wantSender) {
 		t.Fatalf("system prompt missing sender context %q:\n%s", wantSender, systemPrompt)
 	}
 	lastMessage := provider.lastMessages[len(provider.lastMessages)-1]
 	if lastMessage.Role != "user" || lastMessage.Content != "hello" {
 		t.Fatalf("last provider message = %+v, want unchanged user message", lastMessage)
 	}
 }
 func TestRecordLastChannel(t *testing.T) {
 	al, cfg, msgBus, provider, cleanup := newTestAgentLoop(t)
 	defer cleanup()
@ -770,13 +845,18 @@ func TestAgentLoop_ContextExhaustionRetry(t *testing.T) {
 	}
 }
-func TestProcessDirectWithChannel_InitializesMCPInAgentMode(t *testing.T) {
+// TestProcessDirectWithChannel_TriggersMCPInitialization verifies that
 // ProcessDirectWithChannel triggers MCP initialization when MCP is enabled.
 // Note: Manager is only initialized when at least one MCP server is configured
 // and successfully connected.
 func TestProcessDirectWithChannel_TriggersMCPInitialization(t *testing.T) {
 	tmpDir, err := os.MkdirTemp("", "agent-test-*")
 	if err != nil {
 		t.Fatalf("Failed to create temp dir: %v", err)
 	}
 	defer os.RemoveAll(tmpDir)
 	// Test with MCP enabled but no servers - should not initialize manager
 	cfg := &config.Config{
 		Agents: config.AgentsConfig{
 			Defaults: config.AgentDefaults{
@ -791,6 +871,7 @@ func TestProcessDirectWithChannel_InitializesMCPInAgentMode(t *testing.T) {
 				ToolConfig: config.ToolConfig{
 					Enabled: true,
 				},
 				// No servers configured - manager should not be initialized
 			},
 		},
 	}
@ -815,8 +896,9 @@ func TestProcessDirectWithChannel_InitializesMCPInAgentMode(t *testing.T) {
 		t.Fatalf("ProcessDirectWithChannel failed: %v", err)
 	}
-	if !al.mcp.hasManager() {
+	// Manager should not be initialized when no servers are configured
-		t.Fatal("expected MCP manager to be initialized in direct agent mode")
+	if al.mcp.hasManager() {
 		t.Fatal("expected MCP manager to be nil when no servers are configured")
 	}
 }
@ -915,20 +997,33 @@ func TestHandleReasoning(t *testing.T) {
 		al, msgBus := newLoop(t)
 		al.handleReasoning(context.Background(), "reasoning", "telegram", "")
-		ctx, cancel := context.WithTimeout(context.Background(), 20*time.Millisecond)
+		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 		defer cancel()
-		if msg, ok := msgBus.SubscribeOutbound(ctx); ok {
+		for {
 			select {
 			case msg, ok := <-msgBus.OutboundChan():
 				if !ok {
 					t.Fatalf("expected no outbound message, got %+v", msg)
 				}
 				if msg.Content == "reasoning" {
 					t.Fatalf("expected no message for empty chatID, got %+v", msg)
 				}
 				return
 			case <-ctx.Done():
 				t.Log("expected an outbound message, got none within timeout")
 				return
 			default:
 				// Continue to check for message
 				time.Sleep(5 * time.Millisecond) // Avoid busy loop
 			}
 		}
 	})
 	t.Run("publishes one message for non telegram", func(t *testing.T) {
 		al, msgBus := newLoop(t)
 		al.handleReasoning(context.Background(), "hello reasoning", "slack", "channel-1")
-		ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond)
+		msg, ok := <-msgBus.OutboundChan()
 		defer cancel()
 		msg, ok := msgBus.SubscribeOutbound(ctx)
 		if !ok {
 			t.Fatal("expected an outbound message")
 		}
@ -942,9 +1037,14 @@ func TestHandleReasoning(t *testing.T) {
 		reasoning := "hello telegram reasoning"
 		al.handleReasoning(context.Background(), reasoning, "telegram", "tg-chat")
-		ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond)
+		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 		defer cancel()
-		msg, ok := msgBus.SubscribeOutbound(ctx)
+		for {
 			select {
 			case <-ctx.Done():
 				t.Fatal("expected an outbound message, got none within timeout")
 				return
 			case msg, ok := <-msgBus.OutboundChan():
 				if !ok {
 					t.Fatal("expected outbound message")
 				}
@ -958,19 +1058,31 @@ func TestHandleReasoning(t *testing.T) {
 				if msg.Content != reasoning {
 					t.Fatalf("content mismatch: got %q want %q", msg.Content, reasoning)
 				}
 				return
 			}
 		}
 	})
 	t.Run("expired ctx", func(t *testing.T) {
 		al, msgBus := newLoop(t)
 		reasoning := "hello telegram reasoning"
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
 		al.handleReasoning(ctx, reasoning, "telegram", "tg-chat")
-		ctx, cancel = context.WithTimeout(context.Background(), 200*time.Millisecond)
+		al.handleReasoning(context.Background(), reasoning, "telegram", "tg-chat")
-		defer cancel()
+
-		msg, ok := msgBus.SubscribeOutbound(ctx)
+		consumeCtx, consumeCancel := context.WithTimeout(context.Background(), 2*time.Second)
-		if ok {
+		defer consumeCancel()
-			t.Fatalf("expected no outbound message, got %+v", msg)
+
 		for {
 			select {
 			case msg, ok := <-msgBus.OutboundChan():
 				if !ok {
 					t.Fatalf("expected no outbound message, but received: %+v", msg)
 				}
 				t.Logf("Received unexpected outbound message: %+v", msg)
 				return
 			case <-consumeCtx.Done():
 				t.Fatalf("failed: no message received within timeout")
 				return
 			}
 		}
 	})
@ -1010,21 +1122,24 @@ func TestHandleReasoning(t *testing.T) {
 		// Drain the bus and verify the reasoning message was NOT published
 		// (it should have been dropped due to timeout).
-		drainCtx, drainCancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+		timeer := time.After(1 * time.Second)
 		defer drainCancel()
 		foundReasoning := false
 		for {
-			msg, ok := msgBus.SubscribeOutbound(drainCtx)
+			select {
 			case <-timeer:
 				t.Logf(
 					"no reasoning message received after draining bus for 1s, as expected,length=%d",
 					len(msgBus.OutboundChan()),
 				)
 				return
 			case msg, ok := <-msgBus.OutboundChan():
 				if !ok {
 					break
 				}
 				if msg.Content == "should timeout" {
 				foundReasoning = true
 			}
 		}
 		if foundReasoning {
 					t.Fatal("expected reasoning message to be dropped when bus is full, but it was published")
 				}
 			}
 		}
 	})
 }
@ -1088,7 +1203,7 @@ func TestResolveMediaRefs_SkipsOversizedFile(t *testing.T) {
 	}
 }
-func TestResolveMediaRefs_SkipsUnknownType(t *testing.T) {
+func TestResolveMediaRefs_UnknownTypeInjectsPath(t *testing.T) {
 	store := media.NewFileMediaStore()
 	dir := t.TempDir()
@ -1104,7 +1219,11 @@ func TestResolveMediaRefs_SkipsUnknownType(t *testing.T) {
 	result := resolveMediaRefs(messages, store, config.DefaultMaxMediaSize)
 	if len(result[0].Media) != 0 {
-		t.Fatalf("expected 0 media (unknown type), got %d", len(result[0].Media))
+		t.Fatalf("expected 0 media entries, got %d", len(result[0].Media))
 	}
 	expected := "hi [file:" + txtPath + "]"
 	if result[0].Content != expected {
 		t.Fatalf("expected content %q, got %q", expected, result[0].Content)
 	}
 }
@ -1166,3 +1285,225 @@ func TestResolveMediaRefs_UsesMetaContentType(t *testing.T) {
 		t.Fatalf("expected jpeg prefix, got %q", result[0].Media[0][:30])
 	}
 }
 func TestResolveMediaRefs_PDFInjectsFilePath(t *testing.T) {
 	store := media.NewFileMediaStore()
 	dir := t.TempDir()
 	pdfPath := filepath.Join(dir, "report.pdf")
 	// PDF magic bytes
 	os.WriteFile(pdfPath, []byte("%PDF-1.4 test content"), 0o644)
 	ref, _ := store.Store(pdfPath, media.MediaMeta{ContentType: "application/pdf"}, "test")
 	messages := []providers.Message{
 		{Role: "user", Content: "report.pdf [file]", Media: []string{ref}},
 	}
 	result := resolveMediaRefs(messages, store, config.DefaultMaxMediaSize)
 	if len(result[0].Media) != 0 {
 		t.Fatalf("expected 0 media (non-image), got %d", len(result[0].Media))
 	}
 	expected := "report.pdf [file:" + pdfPath + "]"
 	if result[0].Content != expected {
 		t.Fatalf("expected content %q, got %q", expected, result[0].Content)
 	}
 }
 func TestResolveMediaRefs_AudioInjectsAudioPath(t *testing.T) {
 	store := media.NewFileMediaStore()
 	dir := t.TempDir()
 	oggPath := filepath.Join(dir, "voice.ogg")
 	os.WriteFile(oggPath, []byte("fake audio"), 0o644)
 	ref, _ := store.Store(oggPath, media.MediaMeta{ContentType: "audio/ogg"}, "test")
 	messages := []providers.Message{
 		{Role: "user", Content: "voice.ogg [audio]", Media: []string{ref}},
 	}
 	result := resolveMediaRefs(messages, store, config.DefaultMaxMediaSize)
 	if len(result[0].Media) != 0 {
 		t.Fatalf("expected 0 media, got %d", len(result[0].Media))
 	}
 	expected := "voice.ogg [audio:" + oggPath + "]"
 	if result[0].Content != expected {
 		t.Fatalf("expected content %q, got %q", expected, result[0].Content)
 	}
 }
 func TestResolveMediaRefs_VideoInjectsVideoPath(t *testing.T) {
 	store := media.NewFileMediaStore()
 	dir := t.TempDir()
 	mp4Path := filepath.Join(dir, "clip.mp4")
 	os.WriteFile(mp4Path, []byte("fake video"), 0o644)
 	ref, _ := store.Store(mp4Path, media.MediaMeta{ContentType: "video/mp4"}, "test")
 	messages := []providers.Message{
 		{Role: "user", Content: "clip.mp4 [video]", Media: []string{ref}},
 	}
 	result := resolveMediaRefs(messages, store, config.DefaultMaxMediaSize)
 	if len(result[0].Media) != 0 {
 		t.Fatalf("expected 0 media, got %d", len(result[0].Media))
 	}
 	expected := "clip.mp4 [video:" + mp4Path + "]"
 	if result[0].Content != expected {
 		t.Fatalf("expected content %q, got %q", expected, result[0].Content)
 	}
 }
 func TestResolveMediaRefs_NoGenericTagAppendsPath(t *testing.T) {
 	store := media.NewFileMediaStore()
 	dir := t.TempDir()
 	csvPath := filepath.Join(dir, "data.csv")
 	os.WriteFile(csvPath, []byte("a,b,c"), 0o644)
 	ref, _ := store.Store(csvPath, media.MediaMeta{ContentType: "text/csv"}, "test")
 	messages := []providers.Message{
 		{Role: "user", Content: "here is my data", Media: []string{ref}},
 	}
 	result := resolveMediaRefs(messages, store, config.DefaultMaxMediaSize)
 	expected := "here is my data [file:" + csvPath + "]"
 	if result[0].Content != expected {
 		t.Fatalf("expected content %q, got %q", expected, result[0].Content)
 	}
 }
 func TestResolveMediaRefs_EmptyContentGetsPathTag(t *testing.T) {
 	store := media.NewFileMediaStore()
 	dir := t.TempDir()
 	docPath := filepath.Join(dir, "doc.docx")
 	os.WriteFile(docPath, []byte("fake docx"), 0o644)
 	docxMIME := "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
 	ref, _ := store.Store(docPath, media.MediaMeta{ContentType: docxMIME}, "test")
 	messages := []providers.Message{
 		{Role: "user", Content: "", Media: []string{ref}},
 	}
 	result := resolveMediaRefs(messages, store, config.DefaultMaxMediaSize)
 	expected := "[file:" + docPath + "]"
 	if result[0].Content != expected {
 		t.Fatalf("expected content %q, got %q", expected, result[0].Content)
 	}
 }
 func TestResolveMediaRefs_MixedImageAndFile(t *testing.T) {
 	store := media.NewFileMediaStore()
 	dir := t.TempDir()
 	pngPath := filepath.Join(dir, "photo.png")
 	pngHeader := []byte{
 		0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A,
 		0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52,
 		0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x02,
 		0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xDE,
 	}
 	os.WriteFile(pngPath, pngHeader, 0o644)
 	imgRef, _ := store.Store(pngPath, media.MediaMeta{}, "test")
 	pdfPath := filepath.Join(dir, "report.pdf")
 	os.WriteFile(pdfPath, []byte("%PDF-1.4 test"), 0o644)
 	fileRef, _ := store.Store(pdfPath, media.MediaMeta{ContentType: "application/pdf"}, "test")
 	messages := []providers.Message{
 		{Role: "user", Content: "check these [file]", Media: []string{imgRef, fileRef}},
 	}
 	result := resolveMediaRefs(messages, store, config.DefaultMaxMediaSize)
 	if len(result[0].Media) != 1 {
 		t.Fatalf("expected 1 media (image only), got %d", len(result[0].Media))
 	}
 	if !strings.HasPrefix(result[0].Media[0], "data:image/png;base64,") {
 		t.Fatal("expected image to be base64 encoded")
 	}
 	expectedContent := "check these [file:" + pdfPath + "]"
 	if result[0].Content != expectedContent {
 		t.Fatalf("expected content %q, got %q", expectedContent, result[0].Content)
 	}
 }
 // --- Native search helper tests ---
 type nativeSearchProvider struct {
 	supported bool
 }
 func (p *nativeSearchProvider) Chat(
 	ctx context.Context, msgs []providers.Message, tools []providers.ToolDefinition,
 	model string, opts map[string]any,
 ) (*providers.LLMResponse, error) {
 	return &providers.LLMResponse{Content: "ok"}, nil
 }
 func (p *nativeSearchProvider) GetDefaultModel() string { return "test-model" }
 func (p *nativeSearchProvider) SupportsNativeSearch() bool { return p.supported }
 type plainProvider struct{}
 func (p *plainProvider) Chat(
 	ctx context.Context, msgs []providers.Message, tools []providers.ToolDefinition,
 	model string, opts map[string]any,
 ) (*providers.LLMResponse, error) {
 	return &providers.LLMResponse{Content: "ok"}, nil
 }
 func (p *plainProvider) GetDefaultModel() string { return "test-model" }
 func TestIsNativeSearchProvider_Supported(t *testing.T) {
 	if !isNativeSearchProvider(&nativeSearchProvider{supported: true}) {
 		t.Fatal("expected true for provider that supports native search")
 	}
 }
 func TestIsNativeSearchProvider_NotSupported(t *testing.T) {
 	if isNativeSearchProvider(&nativeSearchProvider{supported: false}) {
 		t.Fatal("expected false for provider that does not support native search")
 	}
 }
 func TestIsNativeSearchProvider_NoInterface(t *testing.T) {
 	if isNativeSearchProvider(&plainProvider{}) {
 		t.Fatal("expected false for provider that does not implement NativeSearchCapable")
 	}
 }
 func TestFilterClientWebSearch_RemovesWebSearch(t *testing.T) {
 	defs := []providers.ToolDefinition{
 		{Type: "function", Function: providers.ToolFunctionDefinition{Name: "web_search"}},
 		{Type: "function", Function: providers.ToolFunctionDefinition{Name: "read_file"}},
 		{Type: "function", Function: providers.ToolFunctionDefinition{Name: "exec"}},
 	}
 	result := filterClientWebSearch(defs)
 	if len(result) != 2 {
 		t.Fatalf("len(result) = %d, want 2", len(result))
 	}
 	for _, td := range result {
 		if td.Function.Name == "web_search" {
 			t.Fatal("web_search should be filtered out")
 		}
 	}
 }
 func TestFilterClientWebSearch_NoWebSearch(t *testing.T) {
 	defs := []providers.ToolDefinition{
 		{Type: "function", Function: providers.ToolFunctionDefinition{Name: "read_file"}},
 		{Type: "function", Function: providers.ToolFunctionDefinition{Name: "exec"}},
 	}
 	result := filterClientWebSearch(defs)
 	if len(result) != 2 {
 		t.Fatalf("len(result) = %d, want 2", len(result))
 	}
 }
 func TestFilterClientWebSearch_EmptyInput(t *testing.T) {
 	result := filterClientWebSearch(nil)
 	if len(result) != 0 {
 		t.Fatalf("len(result) = %d, want 0", len(result))
 	}
 }
--- a/pkg/bus/bus.go
+++ b/pkg/bus/bus.go
@ -3,6 +3,7 @@ package bus
 import (
 	"context"
 	"errors"
 	"sync"
 	"sync/atomic"
 	"github.com/sipeed/picoclaw/pkg/logger"
@ -17,8 +18,11 @@ type MessageBus struct {
 	inbound       chan InboundMessage
 	outbound      chan OutboundMessage
 	outboundMedia chan OutboundMediaMessage
 	closeOnce sync.Once
 	done      chan struct{}
 	closed    atomic.Bool
 	wg        sync.WaitGroup
 }
 func NewMessageBus() *MessageBus {
@ -30,128 +34,91 @@ func NewMessageBus() *MessageBus {
 	}
 }
-func (mb *MessageBus) PublishInbound(ctx context.Context, msg InboundMessage) error {
+func publish[T any](ctx context.Context, mb *MessageBus, ch chan T, msg T) error {
 	// check bus closed before acquiring wg, to avoid unnecessary wg.Add and potential deadlock
 	if mb.closed.Load() {
 		return ErrBusClosed
 	}
-	if err := ctx.Err(); err != nil {
+
-		return err
+	// check again,before sending message, to avoid sending to closed channel
 	}
 	select {
 	case mb.inbound <- msg:
 		return nil
 	case <-mb.done:
 		return ErrBusClosed
 	case <-ctx.Done():
 		return ctx.Err()
 	case <-mb.done:
 		return ErrBusClosed
 	default:
 	}
 	mb.wg.Add(1)
 	defer mb.wg.Done()
 	select {
 	case ch <- msg:
 		return nil
 	case <-ctx.Done():
 		return ctx.Err()
 	case <-mb.done:
 		return ErrBusClosed
 	}
 }
-func (mb *MessageBus) ConsumeInbound(ctx context.Context) (InboundMessage, bool) {
+func (mb *MessageBus) PublishInbound(ctx context.Context, msg InboundMessage) error {
-	select {
+	return publish(ctx, mb, mb.inbound, msg)
 	case msg, ok := <-mb.inbound:
 		return msg, ok
 	case <-mb.done:
 		return InboundMessage{}, false
 	case <-ctx.Done():
 		return InboundMessage{}, false
 }
 func (mb *MessageBus) InboundChan() <-chan InboundMessage {
 	return mb.inbound
 }
 func (mb *MessageBus) PublishOutbound(ctx context.Context, msg OutboundMessage) error {
-	if mb.closed.Load() {
+	return publish(ctx, mb, mb.outbound, msg)
 		return ErrBusClosed
 	}
 	if err := ctx.Err(); err != nil {
 		return err
 	}
 	select {
 	case mb.outbound <- msg:
 		return nil
 	case <-mb.done:
 		return ErrBusClosed
 	case <-ctx.Done():
 		return ctx.Err()
 	}
 }
-func (mb *MessageBus) SubscribeOutbound(ctx context.Context) (OutboundMessage, bool) {
+func (mb *MessageBus) OutboundChan() <-chan OutboundMessage {
-	select {
+	return mb.outbound
 	case msg, ok := <-mb.outbound:
 		return msg, ok
 	case <-mb.done:
 		return OutboundMessage{}, false
 	case <-ctx.Done():
 		return OutboundMessage{}, false
 	}
 }
 func (mb *MessageBus) PublishOutboundMedia(ctx context.Context, msg OutboundMediaMessage) error {
-	if mb.closed.Load() {
+	return publish(ctx, mb, mb.outboundMedia, msg)
 		return ErrBusClosed
 	}
 	if err := ctx.Err(); err != nil {
 		return err
 	}
 	select {
 	case mb.outboundMedia <- msg:
 		return nil
 	case <-mb.done:
 		return ErrBusClosed
 	case <-ctx.Done():
 		return ctx.Err()
 	}
 }
-func (mb *MessageBus) SubscribeOutboundMedia(ctx context.Context) (OutboundMediaMessage, bool) {
+func (mb *MessageBus) OutboundMediaChan() <-chan OutboundMediaMessage {
-	select {
+	return mb.outboundMedia
 	case msg, ok := <-mb.outboundMedia:
 		return msg, ok
 	case <-mb.done:
 		return OutboundMediaMessage{}, false
 	case <-ctx.Done():
 		return OutboundMediaMessage{}, false
 	}
 }
 func (mb *MessageBus) Close() {
-	if mb.closed.CompareAndSwap(false, true) {
+	mb.closeOnce.Do(func() {
 		// notify all blocked publishers to exit
 		close(mb.done)
-		// Drain buffered channels so messages aren't silently lost.
+		// because every publisher will check mb.closed before acquiring wg
-		// Channels are NOT closed to avoid send-on-closed panics from concurrent publishers.
+		// so we can be sure that new publishers will not be added new messages after this point
 		mb.closed.Store(true)
 		// wait for all ongoing Publish calls to finish, ensuring all messages have been sent to channels or exited
 		mb.wg.Wait()
 		// close channels safely
 		close(mb.inbound)
 		close(mb.outbound)
 		close(mb.outboundMedia)
 		// clean up any remaining messages in channels
 		drained := 0
-		for {
+		for range mb.inbound {
 			select {
 			case <-mb.inbound:
 			drained++
 			default:
 				goto doneInbound
 		}
-		}
+		for range mb.outbound {
 	doneInbound:
 		for {
 			select {
 			case <-mb.outbound:
 			drained++
 			default:
 				goto doneOutbound
 		}
-		}
+		for range mb.outboundMedia {
 	doneOutbound:
 		for {
 			select {
 			case <-mb.outboundMedia:
 			drained++
 			default:
 				goto doneMedia
 		}
-		}
+
 	doneMedia:
 		if drained > 0 {
 			logger.DebugCF("bus", "Drained buffered messages during close", map[string]any{
 				"count": drained,
 			})
 		}
-	}
+	})
 }
--- a/pkg/bus/bus_test.go
+++ b/pkg/bus/bus_test.go
@ -24,7 +24,7 @@ func TestPublishConsume(t *testing.T) {
 		t.Fatalf("PublishInbound failed: %v", err)
 	}
-	got, ok := mb.ConsumeInbound(ctx)
+	got, ok := <-mb.InboundChan()
 	if !ok {
 		t.Fatal("ConsumeInbound returned ok=false")
 	}
@ -52,7 +52,7 @@ func TestPublishOutboundSubscribe(t *testing.T) {
 		t.Fatalf("PublishOutbound failed: %v", err)
 	}
-	got, ok := mb.SubscribeOutbound(ctx)
+	got, ok := <-mb.OutboundChan()
 	if !ok {
 		t.Fatal("SubscribeOutbound returned ok=false")
 	}
@ -108,27 +108,48 @@ func TestPublishOutbound_BusClosed(t *testing.T) {
 func TestConsumeInbound_ContextCancel(t *testing.T) {
 	mb := NewMessageBus()
 	defer mb.Close()
-	ctx, cancel := context.WithCancel(context.Background())
+	for i := range defaultBusBufferSize {
-	cancel()
+		if err := mb.PublishInbound(context.Background(), InboundMessage{Content: "fill"}); err != nil {
 			t.Fatalf("fill failed at %d: %v", i, err)
 		}
 	}
-	_, ok := mb.ConsumeInbound(ctx)
+	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
-	if ok {
+	defer cancel()
 	mb.PublishInbound(ctx, InboundMessage{Content: "ContextCancel"})
 	select {
 	case <-ctx.Done():
 		t.Log("context canceled, as expected")
 	case msg, ok := <-mb.InboundChan():
 		if !ok {
 			t.Fatal("expected ok=false when context is canceled")
 		}
 		if msg.Content == "ContextCancel" {
 			t.Fatalf("expected content 'ContextCancel', got %q", msg.Content)
 		}
 	}
 }
 func TestConsumeInbound_BusClosed(t *testing.T) {
 	mb := NewMessageBus()
 	timer := time.AfterFunc(100*time.Millisecond, func() {
 		mb.Close()
 	})
-	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+	select {
-	defer cancel()
+	case <-timer.C:
 		t.Log("context canceled, as expected")
-	_, ok := mb.ConsumeInbound(ctx)
+	case _, ok := <-mb.InboundChan():
 		if ok {
-		t.Fatal("expected ok=false when bus is closed")
+			t.Fatal("expected ok=false when context is canceled")
 		}
 	}
 }
@ -136,10 +157,7 @@ func TestSubscribeOutbound_BusClosed(t *testing.T) {
 	mb := NewMessageBus()
 	mb.Close()
-	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+	_, ok := <-mb.OutboundChan()
 	defer cancel()
 	_, ok := mb.SubscribeOutbound(ctx)
 	if ok {
 		t.Fatal("expected ok=false when bus is closed")
 	}
--- a/pkg/channels/feishu/feishu_64.go
+++ b/pkg/channels/feishu/feishu_64.go
@ -618,7 +618,7 @@ func (c *FeishuChannel) downloadResource(
 	}
 	// Write to the shared picoclaw_media directory using a unique name to avoid collisions.
-	mediaDir := filepath.Join(os.TempDir(), "picoclaw_media")
+	mediaDir := media.TempDir()
 	if mkdirErr := os.MkdirAll(mediaDir, 0o700); mkdirErr != nil {
 		logger.ErrorCF("feishu", "Failed to create media directory", map[string]any{
 			"error": mkdirErr.Error(),
--- a/pkg/channels/line/line.go
+++ b/pkg/channels/line/line.go
@ -32,6 +32,10 @@ const (
 	lineBotInfoEndpoint  = lineAPIBase + "/info"
 	lineLoadingEndpoint  = lineAPIBase + "/chat/loading/start"
 	lineReplyTokenMaxAge = 25 * time.Second
 	// Limit request body to prevent memory exhaustion (DoS).
 	// LINE webhook payloads are typically a few KB; 1 MiB is generous.
 	maxWebhookBodySize = 1 << 20 // 1 MiB
 )
 type replyTokenEntry struct {
@ -166,7 +170,7 @@ func (c *LINEChannel) webhookHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
-	body, err := io.ReadAll(r.Body)
+	body, err := io.ReadAll(io.LimitReader(r.Body, maxWebhookBodySize+1))
 	if err != nil {
 		logger.ErrorCF("line", "Failed to read request body", map[string]any{
 			"error": err.Error(),
@ -174,6 +178,11 @@ func (c *LINEChannel) webhookHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Bad request", http.StatusBadRequest)
 		return
 	}
 	if int64(len(body)) > maxWebhookBodySize {
 		logger.WarnC("line", "Webhook request body too large, rejected")
 		http.Error(w, "Request entity too large", http.StatusRequestEntityTooLarge)
 		return
 	}
 	signature := r.Header.Get("X-Line-Signature")
 	if !c.verifySignature(body, signature) {
--- a/pkg/channels/line/line_test.go
+++ b/pkg/channels/line/line_test.go
@ -0,0 +1,81 @@
 package line
 import (
 	"bytes"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
 )
 func TestWebhookRejectsOversizedBody(t *testing.T) {
 	ch := &LINEChannel{}
 	oversized := bytes.Repeat([]byte("A"), maxWebhookBodySize+1)
 	req := httptest.NewRequest(http.MethodPost, "/webhook", bytes.NewReader(oversized))
 	rec := httptest.NewRecorder()
 	ch.webhookHandler(rec, req)
 	if rec.Code != http.StatusRequestEntityTooLarge {
 		t.Errorf("expected status %d, got %d", http.StatusRequestEntityTooLarge, rec.Code)
 	}
 }
 func TestWebhookAcceptsMaxBodySize(t *testing.T) {
 	ch := &LINEChannel{}
 	body := bytes.Repeat([]byte("A"), maxWebhookBodySize)
 	req := httptest.NewRequest(http.MethodPost, "/webhook", bytes.NewReader(body))
 	rec := httptest.NewRecorder()
 	ch.webhookHandler(rec, req)
 	// Missing signature should be rejected, but the body size should not trigger 413.
 	if rec.Code != http.StatusForbidden {
 		t.Errorf("expected status %d, got %d", http.StatusForbidden, rec.Code)
 	}
 }
 func TestWebhookRejectsOversizedBodyBeforeSignatureCheck(t *testing.T) {
 	ch := &LINEChannel{}
 	oversized := bytes.Repeat([]byte("A"), maxWebhookBodySize+1)
 	req := httptest.NewRequest(http.MethodPost, "/webhook", bytes.NewReader(oversized))
 	req.Header.Set("X-Line-Signature", "invalidsignature")
 	rec := httptest.NewRecorder()
 	ch.webhookHandler(rec, req)
 	if rec.Code != http.StatusRequestEntityTooLarge {
 		t.Errorf("expected status %d, got %d", http.StatusRequestEntityTooLarge, rec.Code)
 	}
 }
 func TestWebhookRejectsNonPostMethod(t *testing.T) {
 	ch := &LINEChannel{}
 	req := httptest.NewRequest(http.MethodGet, "/webhook", nil)
 	rec := httptest.NewRecorder()
 	ch.webhookHandler(rec, req)
 	if rec.Code != http.StatusMethodNotAllowed {
 		t.Errorf("expected status %d, got %d", http.StatusMethodNotAllowed, rec.Code)
 	}
 }
 func TestWebhookRejectsInvalidSignature(t *testing.T) {
 	ch := &LINEChannel{}
 	body := `{"events":[]}`
 	req := httptest.NewRequest(http.MethodPost, "/webhook", strings.NewReader(body))
 	req.Header.Set("X-Line-Signature", "invalidsignature")
 	rec := httptest.NewRecorder()
 	ch.webhookHandler(rec, req)
 	if rec.Code != http.StatusForbidden {
 		t.Errorf("expected status %d, got %d", http.StatusForbidden, rec.Code)
 	}
 }
--- a/pkg/channels/manager.go
+++ b/pkg/channels/manager.go
@ -127,7 +127,12 @@ func (m *Manager) SendPlaceholder(ctx context.Context, channel, chatID string) b
 // Implements PlaceholderRecorder.
 func (m *Manager) RecordTypingStop(channel, chatID string, stop func()) {
 	key := channel + ":" + chatID
-	m.typingStops.Store(key, typingEntry{stop: stop, createdAt: time.Now()})
+	entry := typingEntry{stop: stop, createdAt: time.Now()}
 	if previous, loaded := m.typingStops.Swap(key, entry); loaded {
 		if oldEntry, ok := previous.(typingEntry); ok && oldEntry.stop != nil {
 			oldEntry.stop()
 		}
 	}
 }
 // InvokeTypingStop invokes the registered typing stop function for the given channel and chatID.
@ -365,7 +370,6 @@ func (m *Manager) StartAll(ctx context.Context) error {
 	if len(m.channels) == 0 {
 		logger.WarnC("channels", "No channels enabled")
 		return errors.New("no channels enabled")
 	}
 	logger.InfoC("channels", "Starting all channels")
@ -405,7 +409,7 @@ func (m *Manager) StartAll(ctx context.Context) error {
 				"addr": m.httpServer.Addr,
 			})
 			if err := m.httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-				logger.ErrorCF("channels", "Shared HTTP server error", map[string]any{
+				logger.FatalCF("channels", "Shared HTTP server error", map[string]any{
 					"error": err.Error(),
 				})
 			}
@ -594,7 +598,7 @@ func (m *Manager) sendWithRetry(ctx context.Context, name string, w *channelWork
 func dispatchLoop[M any](
 	ctx context.Context,
 	m *Manager,
-	subscribe func(context.Context) (M, bool),
+	ch <-chan M,
 	getChannel func(M) string,
 	enqueue func(context.Context, *channelWorker, M) bool,
 	startMsg, stopMsg, unknownMsg, noWorkerMsg string,
@ -602,7 +606,12 @@ func dispatchLoop[M any](
 	logger.InfoC("channels", startMsg)
 	for {
-		msg, ok := subscribe(ctx)
+		select {
 		case <-ctx.Done():
 			logger.InfoC("channels", stopMsg)
 			return
 		case msg, ok := <-ch:
 			if !ok {
 				logger.InfoC("channels", stopMsg)
 				return
@ -634,11 +643,12 @@ func dispatchLoop[M any](
 			}
 		}
 	}
 }
 func (m *Manager) dispatchOutbound(ctx context.Context) {
 	dispatchLoop(
 		ctx, m,
-		m.bus.SubscribeOutbound,
+		m.bus.OutboundChan(),
 		func(msg bus.OutboundMessage) string { return msg.Channel },
 		func(ctx context.Context, w *channelWorker, msg bus.OutboundMessage) bool {
 			select {
@ -658,7 +668,7 @@ func (m *Manager) dispatchOutbound(ctx context.Context) {
 func (m *Manager) dispatchOutboundMedia(ctx context.Context) {
 	dispatchLoop(
 		ctx, m,
-		m.bus.SubscribeOutboundMedia,
+		m.bus.OutboundMediaChan(),
 		func(msg bus.OutboundMediaMessage) string { return msg.Channel },
 		func(ctx context.Context, w *channelWorker, msg bus.OutboundMediaMessage) bool {
 			select {
--- a/pkg/channels/manager_test.go
+++ b/pkg/channels/manager_test.go
@ -653,6 +653,37 @@ func TestRecordTypingStop_ConcurrentSafe(t *testing.T) {
 	wg.Wait()
 }
 func TestRecordTypingStop_ReplacesExistingStop(t *testing.T) {
 	m := newTestManager()
 	var oldStopCalls int
 	var newStopCalls int
 	m.RecordTypingStop("test", "123", func() {
 		oldStopCalls++
 	})
 	m.RecordTypingStop("test", "123", func() {
 		newStopCalls++
 	})
 	if oldStopCalls != 1 {
 		t.Fatalf("expected previous typing stop to be called once when replaced, got %d", oldStopCalls)
 	}
 	if newStopCalls != 0 {
 		t.Fatalf("expected replacement typing stop to stay active until preSend, got %d calls", newStopCalls)
 	}
 	msg := bus.OutboundMessage{Channel: "test", ChatID: "123", Content: "hello"}
 	m.preSend(context.Background(), "test", msg, &mockChannel{})
 	if newStopCalls != 1 {
 		t.Fatalf("expected replacement typing stop to be called by preSend, got %d", newStopCalls)
 	}
 	if oldStopCalls != 1 {
 		t.Fatalf("expected previous typing stop to not be called again, got %d", oldStopCalls)
 	}
 }
 func TestSendWithRetry_PreSendEditsPlaceholder(t *testing.T) {
 	m := newTestManager()
 	var sendCalled bool
--- a/pkg/channels/matrix/matrix.go
+++ b/pkg/channels/matrix/matrix.go
@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"html"
 	"io"
 	"mime"
 	"net/url"
 	"os"
@ -34,8 +35,6 @@ const (
 	roomKindCacheTTL           = 5 * time.Minute
 	roomKindCacheCleanupPeriod = 1 * time.Minute
 	roomKindCacheMaxEntries    = 2048
 	matrixMediaTempDirName = "picoclaw_media"
 )
 var matrixMentionHrefRegexp = regexp.MustCompile(`(?i)<a[^>]+href=["']([^"']+)["']`)
@ -726,17 +725,23 @@ func (c *MatrixChannel) downloadMedia(
 	reqCtx, cancel := context.WithTimeout(dlCtx, 20*time.Second)
 	defer cancel()
-	data, err := c.client.DownloadBytes(reqCtx, parsed)
+	resp, err := c.client.Download(reqCtx, parsed)
 	if err != nil {
 		return "", err
 	}
 	defer resp.Body.Close()
 	reader := resp.Body
 	readerClose := func() error { return nil }
 	// Encrypted attachments put URL in msgEvt.File and require client-side decryption.
 	if msgEvt != nil && msgEvt.File != nil && msgEvt.URL == "" {
-		err = msgEvt.File.DecryptInPlace(data)
+		if err = msgEvt.File.PrepareForDecryption(); err != nil {
 		if err != nil {
 			return "", fmt.Errorf("decrypt matrix media: %w", err)
 		}
 		decryptReader := msgEvt.File.DecryptStream(resp.Body)
 		reader = decryptReader
 		readerClose = decryptReader.Close
 	}
 	label := matrixMediaLabel(msgEvt, mediaKind)
@ -749,14 +754,28 @@ func (c *MatrixChannel) downloadMedia(
 	if err != nil {
 		return "", err
 	}
-	defer tmp.Close()
+	tmpPath := tmp.Name()
 	cleanup := true
 	defer func() {
 		_ = tmp.Close()
 		if cleanup {
 			_ = os.Remove(tmpPath)
 		}
 	}()
-	if _, err = tmp.Write(data); err != nil {
+	_, err = io.Copy(tmp, reader)
-		_ = os.Remove(tmp.Name())
+	if err != nil {
 		return "", err
 	}
 	if err = readerClose(); err != nil {
 		return "", fmt.Errorf("decrypt matrix media: %w", err)
 	}
 	if err = tmp.Close(); err != nil {
 		return "", err
 	}
-	return tmp.Name(), nil
+	cleanup = false
 	return tmpPath, nil
 }
 func matrixContentType(msgEvt *event.MessageEventContent) string {
@ -1084,7 +1103,7 @@ func (c *MatrixChannel) stripSelfMention(text string) string {
 }
 func matrixMediaTempDir() (string, error) {
-	mediaDir := filepath.Join(os.TempDir(), matrixMediaTempDirName)
+	mediaDir := media.TempDir()
 	if err := os.MkdirAll(mediaDir, 0o700); err != nil {
 		return "", err
 	}
--- a/pkg/channels/matrix/matrix_test.go
+++ b/pkg/channels/matrix/matrix_test.go
@ -2,6 +2,8 @@ package matrix
 import (
 	"context"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"strings"
@ -13,6 +15,7 @@ import (
 	"maunium.net/go/mautrix/id"
 	"github.com/sipeed/picoclaw/pkg/config"
 	"github.com/sipeed/picoclaw/pkg/media"
 )
 func TestMatrixLocalpartMentionRegexp(t *testing.T) {
@ -163,7 +166,7 @@ func TestMatrixMediaTempDir(t *testing.T) {
 	if err != nil {
 		t.Fatalf("matrixMediaTempDir failed: %v", err)
 	}
-	if filepath.Base(dir) != matrixMediaTempDirName {
+	if filepath.Base(dir) != media.TempDirName {
 		t.Fatalf("unexpected media dir base: %q", filepath.Base(dir))
 	}
@ -197,6 +200,50 @@ func TestMatrixMediaExt(t *testing.T) {
 	}
 }
 func TestDownloadMedia_WritesResponseToTempFile(t *testing.T) {
 	const wantBody = "matrix-media-payload"
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if !strings.HasSuffix(r.URL.Path, "/_matrix/client/v1/media/download/matrix.test/abc123") {
 			t.Fatalf("unexpected download path: %s", r.URL.Path)
 		}
 		w.Header().Set("Content-Type", "image/png")
 		_, _ = w.Write([]byte(wantBody))
 	}))
 	defer server.Close()
 	client, err := mautrix.NewClient(server.URL, id.UserID("@picoclaw:matrix.test"), "")
 	if err != nil {
 		t.Fatalf("NewClient: %v", err)
 	}
 	ch := &MatrixChannel{client: client}
 	msg := &event.MessageEventContent{
 		MsgType: event.MsgImage,
 		Body:    "image.png",
 		URL:     id.ContentURIString("mxc://matrix.test/abc123"),
 		Info:    &event.FileInfo{MimeType: "image/png"},
 	}
 	path, err := ch.downloadMedia(context.Background(), msg, "image")
 	if err != nil {
 		t.Fatalf("downloadMedia: %v", err)
 	}
 	defer os.Remove(path)
 	if ext := filepath.Ext(path); ext != ".png" {
 		t.Fatalf("temp file extension=%q want=.png", ext)
 	}
 	got, err := os.ReadFile(path)
 	if err != nil {
 		t.Fatalf("ReadFile: %v", err)
 	}
 	if string(got) != wantBody {
 		t.Fatalf("file contents=%q want=%q", string(got), wantBody)
 	}
 }
 func TestExtractInboundContent_ImageNoURLFallback(t *testing.T) {
 	ch := &MatrixChannel{}
 	msg := &event.MessageEventContent{
--- a/pkg/channels/pico/pico.go
+++ b/pkg/channels/pico/pico.go
@ -251,7 +251,13 @@ func (c *PicoChannel) handleWebSocket(w http.ResponseWriter, r *http.Request) {
 		return
 	}
-	conn, err := c.upgrader.Upgrade(w, r, nil)
+	// Echo the matched subprotocol back so the browser accepts the upgrade.
 	var responseHeader http.Header
 	if proto := c.matchedSubprotocol(r); proto != "" {
 		responseHeader = http.Header{"Sec-WebSocket-Protocol": {proto}}
 	}
 	conn, err := c.upgrader.Upgrade(w, r, responseHeader)
 	if err != nil {
 		logger.ErrorCF("pico", "WebSocket upgrade failed", map[string]any{
 			"error": err.Error(),
@ -282,8 +288,10 @@ func (c *PicoChannel) handleWebSocket(w http.ResponseWriter, r *http.Request) {
 	go c.readLoop(pc)
 }
-// authenticate checks the Bearer token from the Authorization header.
+// authenticate checks the request for a valid token:
-// Query parameter authentication is only allowed when AllowTokenQuery is explicitly enabled.
+//  1. Authorization: Bearer <token> header
 //  2. Sec-WebSocket-Protocol "token.<value>" (for browsers that can't set headers)
 //  3. Query parameter "token" (only when AllowTokenQuery is on)
 func (c *PicoChannel) authenticate(r *http.Request) bool {
 	token := c.config.Token
 	if token == "" {
@ -298,6 +306,11 @@ func (c *PicoChannel) authenticate(r *http.Request) bool {
 		}
 	}
 	// Check Sec-WebSocket-Protocol subprotocol ("token.<value>")
 	if c.matchedSubprotocol(r) != "" {
 		return true
 	}
 	// Check query parameter only when explicitly allowed
 	if c.config.AllowTokenQuery {
 		if r.URL.Query().Get("token") == token {
@ -308,6 +321,18 @@ func (c *PicoChannel) authenticate(r *http.Request) bool {
 	return false
 }
 // matchedSubprotocol returns the "token.<value>" subprotocol that matches
 // the configured token, or "" if none do.
 func (c *PicoChannel) matchedSubprotocol(r *http.Request) string {
 	token := c.config.Token
 	for _, proto := range websocket.Subprotocols(r) {
 		if after, ok := strings.CutPrefix(proto, "token."); ok && after == token {
 			return proto
 		}
 	}
 	return ""
 }
 // readLoop reads messages from a WebSocket connection.
 func (c *PicoChannel) readLoop(pc *picoConn) {
 	defer func() {
--- a/pkg/channels/qq/qq.go
+++ b/pkg/channels/qq/qq.go
@ -423,7 +423,9 @@ func (c *QQChannel) handleC2CMessage() event.C2CMessageEventHandler {
 		// Reset msg_seq counter for new inbound message.
 		c.msgSeqCounters.Store(senderID, new(atomic.Uint64))
-		metadata := map[string]string{}
+		metadata := map[string]string{
 			"account_id": senderID,
 		}
 		sender := bus.SenderInfo{
 			Platform:    "qq",
@ -495,6 +497,7 @@ func (c *QQChannel) handleGroupATMessage() event.GroupATMessageEventHandler {
 		c.msgSeqCounters.Store(data.GroupID, new(atomic.Uint64))
 		metadata := map[string]string{
 			"account_id": senderID,
 			"group_id":   data.GroupID,
 		}
--- a/pkg/channels/qq/qq_test.go
+++ b/pkg/channels/qq/qq_test.go
@ -0,0 +1,52 @@
 package qq
 import (
 	"context"
 	"testing"
 	"time"
 	"github.com/tencent-connect/botgo/dto"
 	"github.com/sipeed/picoclaw/pkg/bus"
 	"github.com/sipeed/picoclaw/pkg/channels"
 )
 func TestHandleC2CMessage_IncludesAccountIDMetadata(t *testing.T) {
 	messageBus := bus.NewMessageBus()
 	ch := &QQChannel{
 		BaseChannel: channels.NewBaseChannel("qq", nil, messageBus, nil),
 		dedup:       make(map[string]time.Time),
 		done:        make(chan struct{}),
 		ctx:         context.Background(),
 	}
 	err := ch.handleC2CMessage()(nil, &dto.WSC2CMessageData{
 		ID:      "msg-1",
 		Content: "hello",
 		Author: &dto.User{
 			ID: "7750283E123456",
 		},
 	})
 	if err != nil {
 		t.Fatalf("handleC2CMessage() error = %v", err)
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 	for {
 		select {
 		case <-ctx.Done():
 			t.Fatal("timeout waiting for inbound message")
 			return
 		case inbound, ok := <-messageBus.InboundChan():
 			if !ok {
 				t.Fatal("expected inbound message")
 			}
 			if inbound.Metadata["account_id"] != "7750283E123456" {
 				t.Fatalf("account_id metadata = %q, want %q", inbound.Metadata["account_id"], "7750283E123456")
 			}
 			return
 		}
 	}
 }
--- a/pkg/channels/telegram/telegram.go
+++ b/pkg/channels/telegram/telegram.go
@ -3,6 +3,7 @@ package telegram
 import (
 	"context"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
 	"os"
@ -377,6 +378,20 @@ func (c *TelegramChannel) SendMedia(ctx context.Context, msg bus.OutboundMediaMe
 				Caption:         part.Caption,
 			}
 			_, err = c.bot.SendPhoto(ctx, params)
 			if err != nil && strings.Contains(err.Error(), "PHOTO_INVALID_DIMENSIONS") {
 				if _, seekErr := file.Seek(0, io.SeekStart); seekErr != nil {
 					file.Close()
 					return fmt.Errorf("telegram rewind media after photo failure: %w", channels.ErrTemporary)
 				}
 				docParams := &telego.SendDocumentParams{
 					ChatID:          tu.ID(chatID),
 					MessageThreadID: threadID,
 					Document:        telego.InputFile{File: file},
 					Caption:         part.Caption,
 				}
 				_, err = c.bot.SendDocument(ctx, docParams)
 			}
 		case "audio":
 			params := &telego.SendAudioParams{
 				ChatID:          tu.ID(chatID),
--- a/pkg/channels/telegram/telegram_dispatch_test.go
+++ b/pkg/channels/telegram/telegram_dispatch_test.go
@ -3,7 +3,6 @@ package telegram
 import (
 	"context"
 	"testing"
 	"time"
 	"github.com/mymmrac/telego"
@ -36,10 +35,7 @@ func TestHandleMessage_DoesNotConsumeGenericCommandsLocally(t *testing.T) {
 		t.Fatalf("handleMessage error: %v", err)
 	}
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	inbound, ok := <-messageBus.InboundChan()
 	defer cancel()
 	inbound, ok := messageBus.ConsumeInbound(ctx)
 	if !ok {
 		t.Fatal("expected inbound message to be forwarded")
 	}
--- a/pkg/channels/telegram/telegram_group_command_filter_test.go
+++ b/pkg/channels/telegram/telegram_group_command_filter_test.go
@ -108,10 +108,15 @@ func TestHandleMessage_GroupMentionOnly_BotCommandEntity(t *testing.T) {
 				t.Fatalf("handleMessage error: %v", err)
 			}
-			ctx, cancel := context.WithTimeout(context.Background(), 150*time.Millisecond)
+			ctx, cancel := context.WithTimeout(context.Background(), 200*time.Microsecond)
 			defer cancel()
-
+			select {
-			inbound, ok := messageBus.ConsumeInbound(ctx)
+			case <-ctx.Done():
 				if tc.wantForwarded {
 					t.Fatal("timeout waiting for message to be forwarded")
 					return
 				}
 			case inbound, ok := <-messageBus.InboundChan():
 				if tc.wantForwarded {
 					if !ok {
 						t.Fatal("expected inbound message to be forwarded")
@ -121,9 +126,6 @@ func TestHandleMessage_GroupMentionOnly_BotCommandEntity(t *testing.T) {
 					}
 					return
 				}
 			if ok {
 				t.Fatalf("expected message to be filtered, got content=%q", inbound.Content)
 			}
 		})
 	}
--- a/pkg/channels/telegram/telegram_test.go
+++ b/pkg/channels/telegram/telegram_test.go
@ -4,9 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
 	"io"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 	"time"
 	"github.com/mymmrac/telego"
 	ta "github.com/mymmrac/telego/telegoapi"
@ -15,6 +17,7 @@ import (
 	"github.com/sipeed/picoclaw/pkg/bus"
 	"github.com/sipeed/picoclaw/pkg/channels"
 	"github.com/sipeed/picoclaw/pkg/media"
 )
 const testToken = "1234567890:aaaabbbbaaaabbbbaaaabbbbaaaabbbbccc"
@ -38,6 +41,11 @@ func (s *stubCaller) Call(ctx context.Context, url string, data *ta.RequestData)
 // stubConstructor implements ta.RequestConstructor for testing.
 type stubConstructor struct{}
 type multipartCall struct {
 	Parameters map[string]string
 	FileSizes  map[string]int
 }
 func (s *stubConstructor) JSONRequest(parameters any) (*ta.RequestData, error) {
 	return &ta.RequestData{}, nil
 }
@ -49,6 +57,36 @@ func (s *stubConstructor) MultipartRequest(
 	return &ta.RequestData{}, nil
 }
 type multipartRecordingConstructor struct {
 	stubConstructor
 	calls []multipartCall
 }
 func (s *multipartRecordingConstructor) MultipartRequest(
 	parameters map[string]string,
 	files map[string]ta.NamedReader,
 ) (*ta.RequestData, error) {
 	call := multipartCall{
 		Parameters: make(map[string]string, len(parameters)),
 		FileSizes:  make(map[string]int, len(files)),
 	}
 	for k, v := range parameters {
 		call.Parameters[k] = v
 	}
 	for field, file := range files {
 		if file == nil {
 			continue
 		}
 		data, err := io.ReadAll(file)
 		if err != nil {
 			return nil, err
 		}
 		call.FileSizes[field] = len(data)
 	}
 	s.calls = append(s.calls, call)
 	return &ta.RequestData{}, nil
 }
 // successResponse returns a ta.Response that telego will treat as a successful SendMessage.
 func successResponse(t *testing.T) *ta.Response {
 	t.Helper()
@ -60,11 +98,19 @@ func successResponse(t *testing.T) *ta.Response {
 // newTestChannel creates a TelegramChannel with a mocked bot for unit testing.
 func newTestChannel(t *testing.T, caller *stubCaller) *TelegramChannel {
 	return newTestChannelWithConstructor(t, caller, &stubConstructor{})
 }
 func newTestChannelWithConstructor(
 	t *testing.T,
 	caller *stubCaller,
 	constructor ta.RequestConstructor,
 ) *TelegramChannel {
 	t.Helper()
 	bot, err := telego.NewBot(testToken,
 		telego.WithAPICaller(caller),
-		telego.WithRequestConstructor(&stubConstructor{}),
+		telego.WithRequestConstructor(constructor),
 		telego.WithDiscardLogger(),
 	)
 	require.NoError(t, err)
@ -81,6 +127,92 @@ func newTestChannel(t *testing.T, caller *stubCaller) *TelegramChannel {
 	}
 }
 func TestSendMedia_ImageFallbacksToDocumentOnInvalidDimensions(t *testing.T) {
 	constructor := &multipartRecordingConstructor{}
 	caller := &stubCaller{
 		callFn: func(ctx context.Context, url string, data *ta.RequestData) (*ta.Response, error) {
 			switch {
 			case strings.Contains(url, "sendPhoto"):
 				return nil, errors.New(`api: 400 "Bad Request: PHOTO_INVALID_DIMENSIONS"`)
 			case strings.Contains(url, "sendDocument"):
 				return successResponse(t), nil
 			default:
 				t.Fatalf("unexpected API call: %s", url)
 				return nil, nil
 			}
 		},
 	}
 	ch := newTestChannelWithConstructor(t, caller, constructor)
 	store := media.NewFileMediaStore()
 	ch.SetMediaStore(store)
 	tmpDir := t.TempDir()
 	localPath := filepath.Join(tmpDir, "woodstock-en-10s.png")
 	content := []byte("fake-png-content")
 	require.NoError(t, os.WriteFile(localPath, content, 0o644))
 	ref, err := store.Store(
 		localPath,
 		media.MediaMeta{Filename: "woodstock-en-10s.png", ContentType: "image/png"},
 		"scope-1",
 	)
 	require.NoError(t, err)
 	err = ch.SendMedia(context.Background(), bus.OutboundMediaMessage{
 		ChatID: "12345",
 		Parts: []bus.MediaPart{{
 			Type:    "image",
 			Ref:     ref,
 			Caption: "caption",
 		}},
 	})
 	require.NoError(t, err)
 	require.Len(t, caller.calls, 2)
 	assert.Contains(t, caller.calls[0].URL, "sendPhoto")
 	assert.Contains(t, caller.calls[1].URL, "sendDocument")
 	require.Len(t, constructor.calls, 2)
 	assert.Equal(t, len(content), constructor.calls[0].FileSizes["photo"])
 	assert.Equal(t, len(content), constructor.calls[1].FileSizes["document"])
 	assert.Equal(t, "caption", constructor.calls[1].Parameters["caption"])
 }
 func TestSendMedia_ImageNonDimensionErrorDoesNotFallback(t *testing.T) {
 	constructor := &multipartRecordingConstructor{}
 	caller := &stubCaller{
 		callFn: func(ctx context.Context, url string, data *ta.RequestData) (*ta.Response, error) {
 			return nil, errors.New("api: 500 \"server exploded\"")
 		},
 	}
 	ch := newTestChannelWithConstructor(t, caller, constructor)
 	store := media.NewFileMediaStore()
 	ch.SetMediaStore(store)
 	tmpDir := t.TempDir()
 	localPath := filepath.Join(tmpDir, "image.png")
 	require.NoError(t, os.WriteFile(localPath, []byte("fake-png-content"), 0o644))
 	ref, err := store.Store(localPath, media.MediaMeta{Filename: "image.png", ContentType: "image/png"}, "scope-1")
 	require.NoError(t, err)
 	err = ch.SendMedia(context.Background(), bus.OutboundMediaMessage{
 		ChatID: "12345",
 		Parts: []bus.MediaPart{{
 			Type: "image",
 			Ref:  ref,
 		}},
 	})
 	require.Error(t, err)
 	assert.ErrorIs(t, err, channels.ErrTemporary)
 	require.Len(t, caller.calls, 1)
 	assert.Contains(t, caller.calls[0].URL, "sendPhoto")
 	require.Len(t, constructor.calls, 1)
 	assert.NotContains(t, caller.calls[0].URL, "sendDocument")
 }
 func TestSend_EmptyContent(t *testing.T) {
 	caller := &stubCaller{
 		callFn: func(ctx context.Context, url string, data *ta.RequestData) (*ta.Response, error) {
@ -355,10 +487,7 @@ func TestHandleMessage_ForumTopic_SetsMetadata(t *testing.T) {
 	err := ch.handleMessage(context.Background(), msg)
 	require.NoError(t, err)
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	inbound, ok := <-messageBus.InboundChan()
 	defer cancel()
 	inbound, ok := messageBus.ConsumeInbound(ctx)
 	require.True(t, ok, "expected inbound message")
 	// Composite chatID should include thread ID
@ -397,10 +526,7 @@ func TestHandleMessage_NoForum_NoThreadMetadata(t *testing.T) {
 	err := ch.handleMessage(context.Background(), msg)
 	require.NoError(t, err)
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	inbound, ok := <-messageBus.InboundChan()
 	defer cancel()
 	inbound, ok := messageBus.ConsumeInbound(ctx)
 	require.True(t, ok)
 	// Plain chatID without thread suffix
@ -443,10 +569,7 @@ func TestHandleMessage_ReplyThread_NonForum_NoIsolation(t *testing.T) {
 	err := ch.handleMessage(context.Background(), msg)
 	require.NoError(t, err)
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	inbound, ok := <-messageBus.InboundChan()
 	defer cancel()
 	inbound, ok := messageBus.ConsumeInbound(ctx)
 	require.True(t, ok)
 	// chatID should NOT include thread suffix for non-forum groups
--- a/pkg/channels/whatsapp/whatsapp_command_test.go
+++ b/pkg/channels/whatsapp/whatsapp_command_test.go
@ -3,7 +3,6 @@ package whatsapp
 import (
 	"context"
 	"testing"
 	"time"
 	"github.com/sipeed/picoclaw/pkg/bus"
 	"github.com/sipeed/picoclaw/pkg/channels"
@ -25,10 +24,7 @@ func TestHandleIncomingMessage_DoesNotConsumeGenericCommandsLocally(t *testing.T
 		"content": "/help",
 	})
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	inbound, ok := <-messageBus.InboundChan()
 	defer cancel()
 	inbound, ok := messageBus.ConsumeInbound(ctx)
 	if !ok {
 		t.Fatal("expected inbound message to be forwarded")
 	}
--- a/pkg/channels/whatsapp_native/whatsapp_command_test.go
+++ b/pkg/channels/whatsapp_native/whatsapp_command_test.go
@ -43,7 +43,11 @@ func TestHandleIncoming_DoesNotConsumeGenericCommandsLocally(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
-	inbound, ok := messageBus.ConsumeInbound(ctx)
+	select {
 	case <-ctx.Done():
 		t.Fatal("timeout waiting for message to be forwarded")
 		return
 	case inbound, ok := <-messageBus.InboundChan():
 		if !ok {
 			t.Fatal("expected inbound message to be forwarded")
 		}
@ -54,3 +58,4 @@ func TestHandleIncoming_DoesNotConsumeGenericCommandsLocally(t *testing.T) {
 			t.Fatalf("content=%q", inbound.Content)
 		}
 	}
 }
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@ -4,11 +4,13 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 	"sync/atomic"
 	"github.com/caarlos0/env/v11"
 	"github.com/sipeed/picoclaw/pkg/credential"
 	"github.com/sipeed/picoclaw/pkg/fileutil"
 )
@ -222,8 +224,8 @@ type AgentDefaults struct {
 	RestrictToWorkspace       bool           `json:"restrict_to_workspace"           env:"PICOCLAW_AGENTS_DEFAULTS_RESTRICT_TO_WORKSPACE"`
 	AllowReadOutsideWorkspace bool           `json:"allow_read_outside_workspace"    env:"PICOCLAW_AGENTS_DEFAULTS_ALLOW_READ_OUTSIDE_WORKSPACE"`
 	Provider                  string         `json:"provider"                        env:"PICOCLAW_AGENTS_DEFAULTS_PROVIDER"`
-	ModelName                 string         `json:"model_name,omitempty"            env:"PICOCLAW_AGENTS_DEFAULTS_MODEL_NAME"`
+	ModelName                 string         `json:"model_name"                      env:"PICOCLAW_AGENTS_DEFAULTS_MODEL_NAME"`
-	Model                     string         `json:"model"                           env:"PICOCLAW_AGENTS_DEFAULTS_MODEL"` // Deprecated: use model_name instead
+	Model                     string         `json:"model,omitempty"                 env:"PICOCLAW_AGENTS_DEFAULTS_MODEL"` // Deprecated: use model_name instead
 	ModelFallbacks            []string       `json:"model_fallbacks,omitempty"`
 	ImageModel                string         `json:"image_model,omitempty"           env:"PICOCLAW_AGENTS_DEFAULTS_IMAGE_MODEL"`
 	ImageModelFallbacks       []string       `json:"image_model_fallbacks,omitempty"`
@ -528,6 +530,7 @@ type ProvidersConfig struct {
 	Avian         ProviderConfig       `json:"avian"`
 	Minimax       ProviderConfig       `json:"minimax"`
 	LongCat       ProviderConfig       `json:"longcat"`
 	ModelScope    ProviderConfig       `json:"modelscope"`
 }
 // IsEmpty checks if all provider configs are empty (no API keys or API bases set)
@ -555,7 +558,8 @@ func (p ProvidersConfig) IsEmpty() bool {
 		p.Mistral.APIKey == "" && p.Mistral.APIBase == "" &&
 		p.Avian.APIKey == "" && p.Avian.APIBase == "" &&
 		p.Minimax.APIKey == "" && p.Minimax.APIBase == "" &&
-		p.LongCat.APIKey == "" && p.LongCat.APIBase == ""
+		p.LongCat.APIKey == "" && p.LongCat.APIBase == "" &&
 		p.ModelScope.APIKey == "" && p.ModelScope.APIBase == ""
 }
 // MarshalJSON implements custom JSON marshaling for ProvidersConfig
@ -623,6 +627,7 @@ func (c *ModelConfig) Validate() error {
 type GatewayConfig struct {
 	Host      string `json:"host"       env:"PICOCLAW_GATEWAY_HOST"`
 	Port      int    `json:"port"       env:"PICOCLAW_GATEWAY_PORT"`
 	HotReload bool   `json:"hot_reload" env:"PICOCLAW_GATEWAY_HOT_RELOAD"`
 }
 type ToolDiscoveryConfig struct {
@ -688,15 +693,24 @@ type WebToolsConfig struct {
 	Perplexity PerplexityConfig `                                json:"perplexity"`
 	SearXNG    SearXNGConfig    `                                json:"searxng"`
 	GLMSearch  GLMSearchConfig  `                                json:"glm_search"`
 	// PreferNative controls whether to use provider-native web search when
 	// the active LLM supports it (e.g. OpenAI web_search_preview). When true,
 	// the client-side web_search tool is hidden to avoid duplicate search surfaces,
 	// and the provider's built-in search is used instead. Falls back to client-side
 	// search when the provider does not support native search.
 	PreferNative bool `json:"prefer_native" env:"PICOCLAW_TOOLS_WEB_PREFER_NATIVE"`
 	// Proxy is an optional proxy URL for web tools (http/https/socks5/socks5h).
 	// For authenticated proxies, prefer HTTP_PROXY/HTTPS_PROXY env vars instead of embedding credentials in config.
 	Proxy                string              `json:"proxy,omitempty"                  env:"PICOCLAW_TOOLS_WEB_PROXY"`
 	FetchLimitBytes      int64               `json:"fetch_limit_bytes,omitempty"      env:"PICOCLAW_TOOLS_WEB_FETCH_LIMIT_BYTES"`
 	Format               string              `json:"format,omitempty"                 env:"PICOCLAW_TOOLS_WEB_FORMAT"`
 	PrivateHostWhitelist FlexibleStringSlice `json:"private_host_whitelist,omitempty" env:"PICOCLAW_TOOLS_WEB_PRIVATE_HOST_WHITELIST"`
 }
 type CronToolsConfig struct {
 	ToolConfig         `     envPrefix:"PICOCLAW_TOOLS_CRON_"`
 	ExecTimeoutMinutes int  `                                 env:"PICOCLAW_TOOLS_CRON_EXEC_TIMEOUT_MINUTES" json:"exec_timeout_minutes"` // 0 means no timeout
 	AllowCommand       bool `                                 env:"PICOCLAW_TOOLS_CRON_ALLOW_COMMAND"        json:"allow_command"`
 }
 type ExecConfig struct {
@ -711,6 +725,7 @@ type ExecConfig struct {
 type SkillsToolsConfig struct {
 	ToolConfig            `                       envPrefix:"PICOCLAW_TOOLS_SKILLS_"`
 	Registries            SkillsRegistriesConfig `                                   json:"registries"`
 	Github                SkillsGithubConfig     `                                   json:"github"`
 	MaxConcurrentSearches int                    `                                   json:"max_concurrent_searches" env:"PICOCLAW_TOOLS_SKILLS_MAX_CONCURRENT_SEARCHES"`
 	SearchCache           SearchCacheConfig      `                                   json:"search_cache"`
 }
@ -745,6 +760,7 @@ type ToolsConfig struct {
 	ReadFile        ReadFileToolConfig `json:"read_file"                                                envPrefix:"PICOCLAW_TOOLS_READ_FILE_"`
 	SendFile        ToolConfig         `json:"send_file"                                                envPrefix:"PICOCLAW_TOOLS_SEND_FILE_"`
 	Spawn           ToolConfig         `json:"spawn"                                                    envPrefix:"PICOCLAW_TOOLS_SPAWN_"`
 	SpawnStatus     ToolConfig         `json:"spawn_status"                                             envPrefix:"PICOCLAW_TOOLS_SPAWN_STATUS_"`
 	SPI             ToolConfig         `json:"spi"                                                      envPrefix:"PICOCLAW_TOOLS_SPI_"`
 	Subagent        ToolConfig         `json:"subagent"                                                 envPrefix:"PICOCLAW_TOOLS_SUBAGENT_"`
 	WebFetch        ToolConfig         `json:"web_fetch"                                                envPrefix:"PICOCLAW_TOOLS_WEB_FETCH_"`
@ -760,6 +776,11 @@ type SkillsRegistriesConfig struct {
 	ClawHub ClawHubRegistryConfig `json:"clawhub"`
 }
 type SkillsGithubConfig struct {
 	Token string `json:"token,omitempty" env:"PICOCLAW_TOOLS_SKILLS_GITHUB_AUTH_TOKEN"`
 	Proxy string `json:"proxy,omitempty" env:"PICOCLAW_TOOLS_SKILLS_GITHUB_PROXY"`
 }
 type ClawHubRegistryConfig struct {
 	Enabled         bool   `json:"enabled"           env:"PICOCLAW_SKILLS_REGISTRIES_CLAWHUB_ENABLED"`
 	BaseURL         string `json:"base_url"          env:"PICOCLAW_SKILLS_REGISTRIES_CLAWHUB_BASE_URL"`
@ -829,10 +850,24 @@ func LoadConfig(path string) (*Config, error) {
 		return nil, err
 	}
 	if passphrase := credential.PassphraseProvider(); passphrase != "" {
 		for _, m := range cfg.ModelList {
 			if m.APIKey != "" && !strings.HasPrefix(m.APIKey, "enc://") && !strings.HasPrefix(m.APIKey, "file://") {
 				fmt.Fprintf(os.Stderr,
 					"picoclaw: warning: model %q has a plaintext api_key; call SaveConfig to encrypt it\n",
 					m.ModelName)
 			}
 		}
 	}
 	if err := env.Parse(cfg); err != nil {
 		return nil, err
 	}
 	if err := resolveAPIKeys(cfg.ModelList, filepath.Dir(path)); err != nil {
 		return nil, err
 	}
 	// Migrate legacy channel config fields to new unified structures
 	cfg.migrateChannelConfigs()
@ -849,6 +884,48 @@ func LoadConfig(path string) (*Config, error) {
 	return cfg, nil
 }
 // encryptPlaintextAPIKeys returns a copy of models with plaintext api_key values
 // encrypted. Returns (nil, nil) when nothing changed (all keys already sealed or
 // empty). Returns (nil, error) if any key fails to encrypt — callers must treat
 // this as a hard failure to prevent a mixed plaintext/ciphertext state on disk.
 // Symmetric counterpart of resolveAPIKeys: both operate purely on []ModelConfig
 // and leave JSON marshaling to the caller.
 func encryptPlaintextAPIKeys(models []ModelConfig, passphrase string) ([]ModelConfig, error) {
 	sealed := make([]ModelConfig, len(models))
 	copy(sealed, models)
 	changed := false
 	for i := range sealed {
 		m := &sealed[i]
 		if m.APIKey == "" || strings.HasPrefix(m.APIKey, "enc://") || strings.HasPrefix(m.APIKey, "file://") {
 			continue
 		}
 		encrypted, err := credential.Encrypt(passphrase, "", m.APIKey)
 		if err != nil {
 			return nil, fmt.Errorf("cannot seal api_key for model %q: %w", m.ModelName, err)
 		}
 		m.APIKey = encrypted
 		changed = true
 	}
 	if !changed {
 		return nil, nil
 	}
 	return sealed, nil
 }
 // resolveAPIKeys decrypts or dereferences each api_key in models in-place.
 // Supports plaintext (no-op), file:// (read from configDir), and enc:// (AES-GCM decrypt).
 func resolveAPIKeys(models []ModelConfig, configDir string) error {
 	cr := credential.NewResolver(configDir)
 	for i := range models {
 		resolved, err := cr.Resolve(models[i].APIKey)
 		if err != nil {
 			return fmt.Errorf("model_list[%d] (%s): %w", i, models[i].ModelName, err)
 		}
 		models[i].APIKey = resolved
 	}
 	return nil
 }
 func (c *Config) migrateChannelConfigs() {
 	// Discord: mention_only -> group_trigger.mention_only
 	if c.Channels.Discord.MentionOnly && !c.Channels.Discord.GroupTrigger.MentionOnly {
@ -863,12 +940,22 @@ func (c *Config) migrateChannelConfigs() {
 }
 func SaveConfig(path string, cfg *Config) error {
 	if passphrase := credential.PassphraseProvider(); passphrase != "" {
 		sealed, err := encryptPlaintextAPIKeys(cfg.ModelList, passphrase)
 		if err != nil {
 			return err
 		}
 		if sealed != nil {
 			tmp := *cfg
 			tmp.ModelList = sealed
 			cfg = &tmp
 		}
 	}
 	data, err := json.MarshalIndent(cfg, "", "  ")
 	if err != nil {
 		return err
 	}
 	// Use unified atomic write utility with explicit sync for flash storage reliability.
 	return fileutil.WriteFileAtomic(path, data, 0o600)
 }
@ -950,7 +1037,7 @@ func (c *Config) GetModelConfig(modelName string) (*ModelConfig, error) {
 	}
 	// Multiple configs - use round-robin for load balancing
-	idx := rrCounter.Add(1) % uint64(len(matches))
+	idx := (rrCounter.Add(1) - 1) % uint64(len(matches))
 	return &matches[idx], nil
 }
@ -1035,6 +1122,8 @@ func (t *ToolsConfig) IsToolEnabled(name string) bool {
 		return t.ReadFile.Enabled
 	case "spawn":
 		return t.Spawn.Enabled
 	case "spawn_status":
 		return t.SpawnStatus.Enabled
 	case "spi":
 		return t.SPI.Enabled
 	case "subagent":
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@ -7,8 +7,22 @@ import (
 	"runtime"
 	"strings"
 	"testing"
 	"github.com/sipeed/picoclaw/pkg/credential"
 )
 // mustSetupSSHKey generates a temporary Ed25519 SSH key in t.TempDir() and sets
 // PICOCLAW_SSH_KEY_PATH to its path for the duration of the test. This is required
 // whenever a test exercises encryption/decryption via credential.Encrypt or SaveConfig.
 func mustSetupSSHKey(t *testing.T) {
 	t.Helper()
 	keyPath := filepath.Join(t.TempDir(), "picoclaw_ed25519.key")
 	if err := credential.GenerateSSHKey(keyPath); err != nil {
 		t.Fatalf("mustSetupSSHKey: %v", err)
 	}
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", keyPath)
 }
 func TestAgentModelConfig_UnmarshalString(t *testing.T) {
 	var m AgentModelConfig
 	if err := json.Unmarshal([]byte(`"gpt-4"`), &m); err != nil {
@ -253,6 +267,9 @@ func TestDefaultConfig_Gateway(t *testing.T) {
 	if cfg.Gateway.Port == 0 {
 		t.Error("Gateway port should have default value")
 	}
 	if cfg.Gateway.HotReload {
 		t.Error("Gateway hot reload should be disabled by default")
 	}
 }
 // TestDefaultConfig_Providers verifies provider structure
@ -342,8 +359,8 @@ func TestSaveConfig_IncludesEmptyLegacyModelField(t *testing.T) {
 		t.Fatalf("ReadFile failed: %v", err)
 	}
-	if !strings.Contains(string(data), `"model": ""`) {
+	if !strings.Contains(string(data), `"model_name": ""`) {
-		t.Fatalf("saved config should include empty legacy model field, got: %s", string(data))
+		t.Fatalf("saved config should include empty legacy model_name field, got: %s", string(data))
 	}
 }
@ -384,6 +401,45 @@ func TestDefaultConfig_OpenAIWebSearchEnabled(t *testing.T) {
 	}
 }
 func TestDefaultConfig_WebPreferNativeEnabled(t *testing.T) {
 	cfg := DefaultConfig()
 	if !cfg.Tools.Web.PreferNative {
 		t.Fatal("DefaultConfig().Tools.Web.PreferNative should be true")
 	}
 }
 func TestLoadConfig_WebPreferNativeDefaultsTrueWhenUnset(t *testing.T) {
 	dir := t.TempDir()
 	configPath := filepath.Join(dir, "config.json")
 	if err := os.WriteFile(configPath, []byte(`{"tools":{"web":{"enabled":true}}}`), 0o600); err != nil {
 		t.Fatalf("WriteFile() error: %v", err)
 	}
 	cfg, err := LoadConfig(configPath)
 	if err != nil {
 		t.Fatalf("LoadConfig() error: %v", err)
 	}
 	if !cfg.Tools.Web.PreferNative {
 		t.Fatal("PreferNative should remain true when unset in config file")
 	}
 }
 func TestLoadConfig_WebPreferNativeCanBeDisabled(t *testing.T) {
 	dir := t.TempDir()
 	configPath := filepath.Join(dir, "config.json")
 	if err := os.WriteFile(configPath, []byte(`{"tools":{"web":{"prefer_native":false}}}`), 0o600); err != nil {
 		t.Fatalf("WriteFile() error: %v", err)
 	}
 	cfg, err := LoadConfig(configPath)
 	if err != nil {
 		t.Fatalf("LoadConfig() error: %v", err)
 	}
 	if cfg.Tools.Web.PreferNative {
 		t.Fatal("PreferNative should be false when disabled in config file")
 	}
 }
 func TestDefaultConfig_ExecAllowRemoteEnabled(t *testing.T) {
 	cfg := DefaultConfig()
 	if !cfg.Tools.Exec.AllowRemote {
@ -391,6 +447,13 @@ func TestDefaultConfig_ExecAllowRemoteEnabled(t *testing.T) {
 	}
 }
 func TestDefaultConfig_CronAllowCommandEnabled(t *testing.T) {
 	cfg := DefaultConfig()
 	if !cfg.Tools.Cron.AllowCommand {
 		t.Fatal("DefaultConfig().Tools.Cron.AllowCommand should be true")
 	}
 }
 func TestLoadConfig_OpenAIWebSearchDefaultsTrueWhenUnset(t *testing.T) {
 	dir := t.TempDir()
 	configPath := filepath.Join(dir, "config.json")
@ -423,6 +486,22 @@ func TestLoadConfig_ExecAllowRemoteDefaultsTrueWhenUnset(t *testing.T) {
 	}
 }
 func TestLoadConfig_CronAllowCommandDefaultsTrueWhenUnset(t *testing.T) {
 	dir := t.TempDir()
 	configPath := filepath.Join(dir, "config.json")
 	if err := os.WriteFile(configPath, []byte(`{"tools":{"cron":{"exec_timeout_minutes":5}}}`), 0o600); err != nil {
 		t.Fatalf("WriteFile() error: %v", err)
 	}
 	cfg, err := LoadConfig(configPath)
 	if err != nil {
 		t.Fatalf("LoadConfig() error: %v", err)
 	}
 	if !cfg.Tools.Cron.AllowCommand {
 		t.Fatal("tools.cron.allow_command should remain true when unset in config file")
 	}
 }
 func TestLoadConfig_OpenAIWebSearchCanBeDisabled(t *testing.T) {
 	dir := t.TempDir()
 	configPath := filepath.Join(dir, "config.json")
@ -444,7 +523,7 @@ func TestLoadConfig_WebToolsProxy(t *testing.T) {
 	configPath := filepath.Join(tmpDir, "config.json")
 	configJSON := `{
  "agents": {"defaults":{"workspace":"./workspace","model":"gpt4","max_tokens":8192,"max_tool_iterations":20}},
-  "model_list": [{"model_name":"gpt4","model":"openai/gpt-5.2","api_key":"x"}],
+  "model_list": [{"model_name":"gpt4","model":"openai/gpt-5.4","api_key":"x"}],
  "tools": {"web":{"proxy":"http://127.0.0.1:7890"}}
 }`
 	if err := os.WriteFile(configPath, []byte(configJSON), 0o600); err != nil {
@ -482,13 +561,19 @@ func TestDefaultConfig_DMScope(t *testing.T) {
 }
 func TestDefaultConfig_WorkspacePath_Default(t *testing.T) {
 	// Unset to ensure we test the default
 	t.Setenv("PICOCLAW_HOME", "")
-	// Set a known home for consistent test results
+
-	t.Setenv("HOME", "/tmp/home")
+	var fakeHome string
 	if runtime.GOOS == "windows" {
 		fakeHome = `C:\tmp\home`
 		t.Setenv("USERPROFILE", fakeHome)
 	} else {
 		fakeHome = "/tmp/home"
 		t.Setenv("HOME", fakeHome)
 	}
 	cfg := DefaultConfig()
-	want := filepath.Join("/tmp/home", ".picoclaw", "workspace")
+	want := filepath.Join(fakeHome, ".picoclaw", "workspace")
 	if cfg.Agents.Defaults.Workspace != want {
 		t.Errorf("Default workspace path = %q, want %q", cfg.Agents.Defaults.Workspace, want)
@ -499,7 +584,7 @@ func TestDefaultConfig_WorkspacePath_WithPicoclawHome(t *testing.T) {
 	t.Setenv("PICOCLAW_HOME", "/custom/picoclaw/home")
 	cfg := DefaultConfig()
-	want := "/custom/picoclaw/home/workspace"
+	want := filepath.Join("/custom/picoclaw/home", "workspace")
 	if cfg.Agents.Defaults.Workspace != want {
 		t.Errorf("Workspace path with PICOCLAW_HOME = %q, want %q", cfg.Agents.Defaults.Workspace, want)
@ -621,3 +706,338 @@ func TestFlexibleStringSlice_UnmarshalText_EmptySliceConsistency(t *testing.T) {
 		}
 	})
 }
 // TestLoadConfig_WarnsForPlaintextAPIKey verifies that LoadConfig resolves a plaintext
 // api_key into memory but does NOT rewrite the config file. File writes are the sole
 // responsibility of SaveConfig.
 func TestLoadConfig_WarnsForPlaintextAPIKey(t *testing.T) {
 	dir := t.TempDir()
 	cfgPath := filepath.Join(dir, "config.json")
 	const original = `{"model_list":[{"model_name":"test","model":"openai/gpt-4","api_key":"sk-plaintext"}]}`
 	if err := os.WriteFile(cfgPath, []byte(original), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "test-passphrase")
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", "")
 	cfg, err := LoadConfig(cfgPath)
 	if err != nil {
 		t.Fatalf("LoadConfig: %v", err)
 	}
 	// In-memory value must be the resolved plaintext.
 	if cfg.ModelList[0].APIKey != "sk-plaintext" {
 		t.Errorf("in-memory api_key = %q, want %q", cfg.ModelList[0].APIKey, "sk-plaintext")
 	}
 	// The file on disk must remain unchanged — LoadConfig must not write anything.
 	raw, _ := os.ReadFile(cfgPath)
 	if string(raw) != original {
 		t.Errorf("LoadConfig must not modify the config file; got:\n%s", string(raw))
 	}
 }
 // TestSaveConfig_EncryptsPlaintextAPIKey verifies that SaveConfig writes enc:// ciphertext
 // to disk and that a subsequent LoadConfig decrypts it back to the original plaintext.
 func TestSaveConfig_EncryptsPlaintextAPIKey(t *testing.T) {
 	dir := t.TempDir()
 	cfgPath := filepath.Join(dir, "config.json")
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "test-passphrase")
 	mustSetupSSHKey(t)
 	cfg := DefaultConfig()
 	cfg.ModelList = []ModelConfig{
 		{ModelName: "test", Model: "openai/gpt-4", APIKey: "sk-plaintext"},
 	}
 	if err := SaveConfig(cfgPath, cfg); err != nil {
 		t.Fatalf("SaveConfig: %v", err)
 	}
 	// Disk must contain enc://, not the raw key.
 	raw, _ := os.ReadFile(cfgPath)
 	if !strings.Contains(string(raw), "enc://") {
 		t.Errorf("saved file should contain enc://, got:\n%s", string(raw))
 	}
 	if strings.Contains(string(raw), "sk-plaintext") {
 		t.Errorf("saved file must not contain the plaintext key")
 	}
 	// A fresh load must decrypt back to the original plaintext.
 	cfg2, err := LoadConfig(cfgPath)
 	if err != nil {
 		t.Fatalf("LoadConfig after SaveConfig: %v", err)
 	}
 	if cfg2.ModelList[0].APIKey != "sk-plaintext" {
 		t.Errorf("loaded api_key = %q, want %q", cfg2.ModelList[0].APIKey, "sk-plaintext")
 	}
 }
 // TestLoadConfig_NoSealWithoutPassphrase verifies that api_key values are left
 // unchanged when PICOCLAW_KEY_PASSPHRASE is not set.
 func TestLoadConfig_NoSealWithoutPassphrase(t *testing.T) {
 	dir := t.TempDir()
 	cfgPath := filepath.Join(dir, "config.json")
 	data := `{"model_list":[{"model_name":"test","model":"openai/gpt-4","api_key":"sk-plaintext"}]}`
 	if err := os.WriteFile(cfgPath, []byte(data), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "")
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", "")
 	if _, err := LoadConfig(cfgPath); err != nil {
 		t.Fatalf("LoadConfig: %v", err)
 	}
 	raw, _ := os.ReadFile(cfgPath)
 	if strings.Contains(string(raw), "enc://") {
 		t.Error("config file must not be modified when no passphrase is set")
 	}
 }
 // TestLoadConfig_FileRefNotSealed verifies that file:// api_key references are not
 // converted to enc:// values (they are resolved at runtime by the Resolver).
 func TestLoadConfig_FileRefNotSealed(t *testing.T) {
 	dir := t.TempDir()
 	cfgPath := filepath.Join(dir, "config.json")
 	keyFile := filepath.Join(dir, "openai.key")
 	if err := os.WriteFile(keyFile, []byte("sk-from-file"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	data := `{"model_list":[{"model_name":"test","model":"openai/gpt-4","api_key":"file://openai.key"}]}`
 	if err := os.WriteFile(cfgPath, []byte(data), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "test-passphrase")
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", "")
 	if _, err := LoadConfig(cfgPath); err != nil {
 		t.Fatalf("LoadConfig: %v", err)
 	}
 	raw, _ := os.ReadFile(cfgPath)
 	if !strings.Contains(string(raw), "file://openai.key") {
 		t.Error("file:// reference should be preserved unchanged in the config file")
 	}
 	if strings.Contains(string(raw), "enc://") {
 		t.Error("file:// reference must not be converted to enc://")
 	}
 }
 // TestSaveConfig_MixedKeys verifies that SaveConfig encrypts only plaintext api_keys
 // and leaves already-encrypted (enc://) and file:// entries unchanged.
 func TestSaveConfig_MixedKeys(t *testing.T) {
 	dir := t.TempDir()
 	cfgPath := filepath.Join(dir, "config.json")
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "test-passphrase")
 	mustSetupSSHKey(t)
 	// Pre-encrypt one key so we have a genuine enc:// value to put in the config.
 	if err := SaveConfig(cfgPath, &Config{
 		ModelList: []ModelConfig{
 			{ModelName: "pre", Model: "openai/gpt-4", APIKey: "sk-already-plain"},
 		},
 	}); err != nil {
 		t.Fatalf("setup SaveConfig: %v", err)
 	}
 	raw, _ := os.ReadFile(cfgPath)
 	// Extract the enc:// value from the saved file.
 	var tmp struct {
 		ModelList []struct {
 			APIKey string `json:"api_key"`
 		} `json:"model_list"`
 	}
 	if err := json.Unmarshal(raw, &tmp); err != nil || len(tmp.ModelList) == 0 {
 		t.Fatalf("setup: could not parse saved config: %v", err)
 	}
 	alreadyEncrypted := tmp.ModelList[0].APIKey
 	if !strings.HasPrefix(alreadyEncrypted, "enc://") {
 		t.Fatalf("setup: expected enc:// key, got %q", alreadyEncrypted)
 	}
 	// Build a config with three models:
 	//   1. plaintext   → must be encrypted by SaveConfig
 	//   2. enc://      → must be left unchanged (already encrypted)
 	//   3. file://     → must be left unchanged (file reference)
 	keyFile := filepath.Join(dir, "api.key")
 	if err := os.WriteFile(keyFile, []byte("sk-from-file"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	cfg := &Config{
 		ModelList: []ModelConfig{
 			{ModelName: "plain", Model: "openai/gpt-4", APIKey: "sk-new-plaintext"},
 			{ModelName: "enc", Model: "openai/gpt-4", APIKey: alreadyEncrypted},
 			{ModelName: "file", Model: "openai/gpt-4", APIKey: "file://api.key"},
 		},
 	}
 	if err := SaveConfig(cfgPath, cfg); err != nil {
 		t.Fatalf("SaveConfig: %v", err)
 	}
 	raw, _ = os.ReadFile(cfgPath)
 	s := string(raw)
 	// 1. Plaintext must be encrypted.
 	if strings.Contains(s, "sk-new-plaintext") {
 		t.Error("plaintext key must not appear in saved file")
 	}
 	// 2. The pre-existing enc:// value must still be present (byte-for-byte unchanged).
 	if !strings.Contains(s, alreadyEncrypted) {
 		t.Error("pre-existing enc:// entry must be preserved unchanged")
 	}
 	// 3. file:// must be preserved.
 	if !strings.Contains(s, "file://api.key") {
 		t.Error("file:// reference must be preserved unchanged")
 	}
 	// Now load and verify all three decrypt/resolve correctly.
 	cfg2, err := LoadConfig(cfgPath)
 	if err != nil {
 		t.Fatalf("LoadConfig after SaveConfig: %v", err)
 	}
 	byName := make(map[string]string)
 	for _, m := range cfg2.ModelList {
 		byName[m.ModelName] = m.APIKey
 	}
 	if byName["plain"] != "sk-new-plaintext" {
 		t.Errorf("plain model api_key = %q, want %q", byName["plain"], "sk-new-plaintext")
 	}
 	if byName["enc"] != "sk-already-plain" {
 		t.Errorf("enc model api_key = %q, want %q", byName["enc"], "sk-already-plain")
 	}
 	if byName["file"] != "sk-from-file" {
 		t.Errorf("file model api_key = %q, want %q", byName["file"], "sk-from-file")
 	}
 }
 // TestLoadConfig_MixedKeys_NoPassphrase verifies that when PICOCLAW_KEY_PASSPHRASE
 // is not set, enc:// entries cause LoadConfig to return an error, while plaintext
 // and file:// entries in the same config are not affected.
 func TestLoadConfig_MixedKeys_NoPassphrase(t *testing.T) {
 	dir := t.TempDir()
 	cfgPath := filepath.Join(dir, "config.json")
 	// First encrypt a key so we have a real enc:// value.
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "test-passphrase")
 	mustSetupSSHKey(t)
 	if err := SaveConfig(cfgPath, &Config{
 		ModelList: []ModelConfig{
 			{ModelName: "m", Model: "openai/gpt-4", APIKey: "sk-secret"},
 		},
 	}); err != nil {
 		t.Fatalf("setup SaveConfig: %v", err)
 	}
 	raw, _ := os.ReadFile(cfgPath)
 	var tmp struct {
 		ModelList []struct {
 			APIKey string `json:"api_key"`
 		} `json:"model_list"`
 	}
 	if err := json.Unmarshal(raw, &tmp); err != nil {
 		t.Fatalf("setup parse: %v", err)
 	}
 	encValue := tmp.ModelList[0].APIKey
 	// Write a mixed config: enc:// + plaintext + file://
 	keyFile := filepath.Join(dir, "api.key")
 	if err := os.WriteFile(keyFile, []byte("sk-from-file"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	mixed, _ := json.Marshal(map[string]any{
 		"model_list": []map[string]any{
 			{"model_name": "enc", "model": "openai/gpt-4", "api_key": encValue},
 			{"model_name": "plain", "model": "openai/gpt-4", "api_key": "sk-plain"},
 			{"model_name": "file", "model": "openai/gpt-4", "api_key": "file://api.key"},
 		},
 	})
 	if err := os.WriteFile(cfgPath, mixed, 0o600); err != nil {
 		t.Fatalf("setup write: %v", err)
 	}
 	// Now clear the passphrase — LoadConfig must fail because enc:// cannot be decrypted.
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "")
 	_, err := LoadConfig(cfgPath)
 	if err == nil {
 		t.Fatal("LoadConfig should fail when enc:// key is present and no passphrase is set")
 	}
 	if !strings.Contains(err.Error(), "passphrase required") {
 		t.Errorf("error should mention passphrase required, got: %v", err)
 	}
 }
 // TestSaveConfig_UsesPassphraseProvider verifies that SaveConfig encrypts plaintext
 // api_keys using credential.PassphraseProvider() rather than os.Getenv directly.
 // This matters for the launcher, which clears the environment variable and redirects
 // PassphraseProvider to an in-memory SecureStore.
 func TestSaveConfig_UsesPassphraseProvider(t *testing.T) {
 	dir := t.TempDir()
 	cfgPath := filepath.Join(dir, "config.json")
 	// Ensure the env var is empty — passphrase must come from PassphraseProvider only.
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "")
 	mustSetupSSHKey(t)
 	// Replace PassphraseProvider with an in-memory function (simulating SecureStore).
 	const testPassphrase = "provider-passphrase"
 	orig := credential.PassphraseProvider
 	credential.PassphraseProvider = func() string { return testPassphrase }
 	t.Cleanup(func() { credential.PassphraseProvider = orig })
 	cfg := DefaultConfig()
 	cfg.ModelList = []ModelConfig{
 		{ModelName: "test", Model: "openai/gpt-4", APIKey: "sk-plaintext"},
 	}
 	if err := SaveConfig(cfgPath, cfg); err != nil {
 		t.Fatalf("SaveConfig: %v", err)
 	}
 	raw, _ := os.ReadFile(cfgPath)
 	if !strings.Contains(string(raw), "enc://") {
 		t.Errorf("SaveConfig should have encrypted plaintext key via PassphraseProvider; got:\n%s", raw)
 	}
 }
 // TestLoadConfig_UsesPassphraseProvider verifies that LoadConfig decrypts enc:// keys
 // using credential.PassphraseProvider() rather than os.Getenv directly.
 func TestLoadConfig_UsesPassphraseProvider(t *testing.T) {
 	dir := t.TempDir()
 	cfgPath := filepath.Join(dir, "config.json")
 	// Ensure the env var is empty throughout.
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "")
 	mustSetupSSHKey(t)
 	const testPassphrase = "provider-passphrase"
 	const plainKey = "sk-secret"
 	// First, encrypt the key using the same passphrase.
 	encrypted, err := credential.Encrypt(testPassphrase, "", plainKey)
 	if err != nil {
 		t.Fatalf("Encrypt: %v", err)
 	}
 	raw, _ := json.Marshal(map[string]any{
 		"model_list": []map[string]any{
 			{"model_name": "test", "model": "openai/gpt-4", "api_key": encrypted},
 		},
 	})
 	if err = os.WriteFile(cfgPath, raw, 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	// Redirect PassphraseProvider — env var is empty, so without this the load would fail.
 	orig := credential.PassphraseProvider
 	credential.PassphraseProvider = func() string { return testPassphrase }
 	t.Cleanup(func() { credential.PassphraseProvider = orig })
 	cfg, err := LoadConfig(cfgPath)
 	if err != nil {
 		t.Fatalf("LoadConfig: %v", err)
 	}
 	if cfg.ModelList[0].APIKey != plainKey {
 		t.Errorf("api_key = %q, want %q", cfg.ModelList[0].APIKey, plainKey)
 	}
 }
--- a/pkg/config/defaults.go
+++ b/pkg/config/defaults.go
@ -194,8 +194,8 @@ func DefaultConfig() *Config {
 			// OpenAI - https://platform.openai.com/api-keys
 			{
-				ModelName: "gpt-5.2",
+				ModelName: "gpt-5.4",
-				Model:     "openai/gpt-5.2",
+				Model:     "openai/gpt-5.4",
 				APIBase:   "https://api.openai.com/v1",
 				APIKey:    "",
 			},
@ -256,8 +256,8 @@ func DefaultConfig() *Config {
 				APIKey:    "",
 			},
 			{
-				ModelName: "openrouter-gpt-5.2",
+				ModelName: "openrouter-gpt-5.4",
-				Model:     "openrouter/openai/gpt-5.2",
+				Model:     "openrouter/openai/gpt-5.4",
 				APIBase:   "https://openrouter.ai/api/v1",
 				APIKey:    "",
 			},
@ -287,6 +287,12 @@ func DefaultConfig() *Config {
 			},
 			// Volcengine (火山引擎) - https://console.volcengine.com/ark
 			{
 				ModelName: "ark-code-latest",
 				Model:     "volcengine/ark-code-latest",
 				APIBase:   "https://ark.cn-beijing.volces.com/api/v3",
 				APIKey:    "",
 			},
 			{
 				ModelName: "doubao-pro",
 				Model:     "volcengine/doubao-pro-32k",
@ -311,8 +317,8 @@ func DefaultConfig() *Config {
 			// GitHub Copilot - https://github.com/settings/tokens
 			{
-				ModelName:  "copilot-gpt-5.2",
+				ModelName:  "copilot-gpt-5.4",
-				Model:      "github-copilot/gpt-5.2",
+				Model:      "github-copilot/gpt-5.4",
 				APIBase:    "http://localhost:4321",
 				AuthMethod: "oauth",
 			},
@ -363,6 +369,14 @@ func DefaultConfig() *Config {
 				APIKey:    "",
 			},
 			// ModelScope (魔搭社区) - https://modelscope.cn/my/tokens
 			{
 				ModelName: "modelscope-qwen",
 				Model:     "modelscope/Qwen/Qwen3-235B-A22B-Instruct-2507",
 				APIBase:   "https://api-inference.modelscope.cn/v1",
 				APIKey:    "",
 			},
 			// VLLM (local) - http://localhost:8000
 			{
 				ModelName: "local-model",
@ -370,10 +384,20 @@ func DefaultConfig() *Config {
 				APIBase:   "http://localhost:8000/v1",
 				APIKey:    "",
 			},
 			// Azure OpenAI - https://portal.azure.com
 			// model_name is a user-friendly alias; the model field's path after "azure/" is your deployment name
 			{
 				ModelName: "azure-gpt5",
 				Model:     "azure/my-gpt5-deployment",
 				APIBase:   "https://your-resource.openai.azure.com",
 				APIKey:    "",
 			},
 		},
 		Gateway: GatewayConfig{
 			Host:      "127.0.0.1",
 			Port:      18790,
 			HotReload: false,
 		},
 		Tools: ToolsConfig{
 			MediaCleanup: MediaCleanupConfig{
@ -387,8 +411,10 @@ func DefaultConfig() *Config {
 				ToolConfig: ToolConfig{
 					Enabled: true,
 				},
 				PreferNative:    true,
 				Proxy:           "",
 				FetchLimitBytes: 10 * 1024 * 1024, // 10MB by default
 				Format:          "plaintext",
 				Brave: BraveConfig{
 					Enabled:    false,
 					APIKey:     "",
@ -429,6 +455,7 @@ func DefaultConfig() *Config {
 					Enabled: true,
 				},
 				ExecTimeoutMinutes: 5,
 				AllowCommand:       true,
 			},
 			Exec: ExecConfig{
 				ToolConfig: ToolConfig{
@ -498,6 +525,9 @@ func DefaultConfig() *Config {
 			Spawn: ToolConfig{
 				Enabled: true,
 			},
 			SpawnStatus: ToolConfig{
 				Enabled: false,
 			},
 			SPI: ToolConfig{
 				Enabled: false, // Hardware tool - Linux only
 			},
--- a/pkg/config/migration.go
+++ b/pkg/config/migration.go
@ -61,7 +61,7 @@ func ConvertProvidersToModelList(cfg *Config) []ModelConfig {
 				}
 				return ModelConfig{
 					ModelName:      "openai",
-					Model:          "openai/gpt-5.2",
+					Model:          "openai/gpt-5.4",
 					APIKey:         p.OpenAI.APIKey,
 					APIBase:        p.OpenAI.APIBase,
 					Proxy:          p.OpenAI.Proxy,
@ -335,7 +335,7 @@ func ConvertProvidersToModelList(cfg *Config) []ModelConfig {
 				}
 				return ModelConfig{
 					ModelName:   "github-copilot",
-					Model:       "github-copilot/gpt-5.2",
+					Model:       "github-copilot/gpt-5.4",
 					APIBase:     p.GitHubCopilot.APIBase,
 					ConnectMode: p.GitHubCopilot.ConnectMode,
 				}, true
@ -424,6 +424,23 @@ func ConvertProvidersToModelList(cfg *Config) []ModelConfig {
 				}, true
 			},
 		},
 		{
 			providerNames: []string{"modelscope"},
 			protocol:      "modelscope",
 			buildConfig: func(p ProvidersConfig) (ModelConfig, bool) {
 				if p.ModelScope.APIKey == "" && p.ModelScope.APIBase == "" {
 					return ModelConfig{}, false
 				}
 				return ModelConfig{
 					ModelName:      "modelscope",
 					Model:          "modelscope/Qwen/Qwen3-235B-A22B-Instruct-2507",
 					APIKey:         p.ModelScope.APIKey,
 					APIBase:        p.ModelScope.APIBase,
 					Proxy:          p.ModelScope.Proxy,
 					RequestTimeout: p.ModelScope.RequestTimeout,
 				}, true
 			},
 		},
 	}
 	// Process each provider migration
--- a/pkg/config/migration_test.go
+++ b/pkg/config/migration_test.go
@ -31,8 +31,8 @@ func TestConvertProvidersToModelList_OpenAI(t *testing.T) {
 	if result[0].ModelName != "openai" {
 		t.Errorf("ModelName = %q, want %q", result[0].ModelName, "openai")
 	}
-	if result[0].Model != "openai/gpt-5.2" {
+	if result[0].Model != "openai/gpt-5.4" {
-		t.Errorf("Model = %q, want %q", result[0].Model, "openai/gpt-5.2")
+		t.Errorf("Model = %q, want %q", result[0].Model, "openai/gpt-5.4")
 	}
 	if result[0].APIKey != "sk-test-key" {
 		t.Errorf("APIKey = %q, want %q", result[0].APIKey, "sk-test-key")
@ -163,14 +163,15 @@ func TestConvertProvidersToModelList_AllProviders(t *testing.T) {
 			Mistral:       ProviderConfig{APIKey: "key18"},
 			Avian:         ProviderConfig{APIKey: "key19"},
 			LongCat:       ProviderConfig{APIKey: "key-longcat"},
 			ModelScope:    ProviderConfig{APIKey: "key-modelscope"},
 		},
 	}
 	result := ConvertProvidersToModelList(cfg)
-	// All 22 providers should be converted
+	// All 23 providers should be converted
-	if len(result) != 22 {
+	if len(result) != 23 {
-		t.Errorf("len(result) = %d, want 22", len(result))
+		t.Errorf("len(result) = %d, want 23", len(result))
 	}
 }
@ -384,8 +385,8 @@ func TestConvertProvidersToModelList_MultipleProviders_PreservesUserModel(t *tes
 	for _, mc := range result {
 		switch mc.ModelName {
 		case "openai":
-			if mc.Model != "openai/gpt-5.2" {
+			if mc.Model != "openai/gpt-5.4" {
-				t.Errorf("OpenAI Model = %q, want %q (default)", mc.Model, "openai/gpt-5.2")
+				t.Errorf("OpenAI Model = %q, want %q (default)", mc.Model, "openai/gpt-5.4")
 			}
 		case "deepseek":
 			if mc.Model != "deepseek/deepseek-reasoner" {
@ -558,9 +559,9 @@ func TestConvertProvidersToModelList_NoProviderField_NoModel(t *testing.T) {
 // Tests for buildModelWithProtocol helper function
 func TestBuildModelWithProtocol_NoPrefix(t *testing.T) {
-	result := buildModelWithProtocol("openai", "gpt-5.2")
+	result := buildModelWithProtocol("openai", "gpt-5.4")
-	if result != "openai/gpt-5.2" {
+	if result != "openai/gpt-5.4" {
-		t.Errorf("buildModelWithProtocol(openai, gpt-5.2) = %q, want %q", result, "openai/gpt-5.2")
+		t.Errorf("buildModelWithProtocol(openai, gpt-5.4) = %q, want %q", result, "openai/gpt-5.4")
 	}
 }
--- a/pkg/config/model_config_test.go
+++ b/pkg/config/model_config_test.go
@ -80,6 +80,36 @@ func TestGetModelConfig_RoundRobin(t *testing.T) {
 	}
 }
 func TestGetModelConfig_RoundRobinStartsFromFirstMatch(t *testing.T) {
 	rrCounter.Store(0)
 	cfg := &Config{
 		ModelList: []ModelConfig{
 			{ModelName: "lb-model", Model: "openai/gpt-4o-1", APIKey: "key1"},
 			{ModelName: "lb-model", Model: "openai/gpt-4o-2", APIKey: "key2"},
 			{ModelName: "lb-model", Model: "openai/gpt-4o-3", APIKey: "key3"},
 		},
 	}
 	wantOrder := []string{
 		"openai/gpt-4o-1",
 		"openai/gpt-4o-2",
 		"openai/gpt-4o-3",
 		"openai/gpt-4o-1",
 		"openai/gpt-4o-2",
 	}
 	for i, want := range wantOrder {
 		result, err := cfg.GetModelConfig("lb-model")
 		if err != nil {
 			t.Fatalf("GetModelConfig() call %d error = %v", i, err)
 		}
 		if result.Model != want {
 			t.Fatalf("GetModelConfig() call %d model = %q, want %q", i, result.Model, want)
 		}
 	}
 }
 func TestGetModelConfig_Concurrent(t *testing.T) {
 	cfg := &Config{
 		ModelList: []ModelConfig{
--- a/pkg/credential/credential.go
+++ b/pkg/credential/credential.go
@ -0,0 +1,335 @@
 // Package credential resolves API credential values for model_list entries.
 //
 // An API key is a form of authorization credential. This package centralizes
 // how raw credential strings—plaintext or file references—are resolved into
 // their actual values, keeping that logic out of the config loader.
 //
 // Supported formats for the api_key field:
 //
 //   - Plaintext:   "sk-abc123"          → returned as-is
 //   - File ref:    "file://filename.key" → content read from configDir/filename.key
 //   - Encrypted:   "enc://<base64>"     → AES-256-GCM decrypt via PICOCLAW_KEY_PASSPHRASE
 //   - Empty:       ""                   → returned as-is (auth_method=oauth etc.)
 //
 // Encryption uses AES-256-GCM with HKDF-SHA256 key derivation (< 1ms, safe for embedded Linux).
 // An SSH private key is required for both encryption and decryption.
 // Key derivation:
 //
 //	HKDF-SHA256(ikm=HMAC-SHA256(SHA256(sshKeyBytes), passphrase), salt, info)
 //
 // SSH key path resolution priority:
 //
 //  1. sshKeyPath argument to Encrypt (explicit)
 //  2. PICOCLAW_SSH_KEY_PATH env var
 //  3. ~/.ssh/picoclaw_ed25519.key (os.UserHomeDir is cross-platform)
 package credential
 import (
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/hkdf"
 	"crypto/hmac"
 	"crypto/rand"
 	"crypto/sha256"
 	"encoding/base64"
 	"errors"
 	"fmt"
 	"io"
 	"os"
 	"path/filepath"
 	"strings"
 )
 // PassphraseEnvVar is the environment variable that holds the encryption passphrase.
 // Other packages (e.g. config) reference this constant to avoid duplicating the string.
 const PassphraseEnvVar = "PICOCLAW_KEY_PASSPHRASE"
 // PassphraseProvider is the function used to retrieve the passphrase for enc://
 // credential decryption. It defaults to reading PICOCLAW_KEY_PASSPHRASE from the
 // process environment. Replace it at startup to use a different source, such as
 // an in-memory SecureStore, so that all LoadConfig() calls everywhere share the
 // same passphrase source without needing os.Environ.
 //
 // Example (launcher main.go):
 //
 //	credential.PassphraseProvider = apiHandler.passphraseStore.Get
 var PassphraseProvider func() string = func() string {
 	return os.Getenv(PassphraseEnvVar)
 }
 // ErrPassphraseRequired is returned when an enc:// credential is encountered but
 // no passphrase is available from PassphraseProvider. Callers can detect this
 // with errors.Is to distinguish a missing-passphrase condition from other errors.
 var ErrPassphraseRequired = errors.New("credential: enc:// passphrase required")
 // ErrDecryptionFailed is returned when an enc:// credential cannot be decrypted,
 // indicating a wrong passphrase or SSH key. Callers can detect this with errors.Is.
 var ErrDecryptionFailed = errors.New("credential: enc:// decryption failed (wrong passphrase or SSH key?)")
 const (
 	fileScheme = "file://"
 	encScheme  = "enc://"
 	hkdfInfo   = "picoclaw-credential-v1"
 	saltLen    = 16
 	nonceLen   = 12
 	keyLen     = 32
 	sshKeyEnv  = "PICOCLAW_SSH_KEY_PATH"
 )
 // Resolver resolves raw credential strings for model_list api_key fields.
 // File references are resolved relative to the directory of the config file.
 type Resolver struct {
 	configDir         string
 	resolvedConfigDir string // symlink-resolved form of configDir
 }
 // NewResolver returns a Resolver that resolves file:// references relative to
 // configDir (typically filepath.Dir of the config file path).
 func NewResolver(configDir string) *Resolver {
 	resolved := configDir
 	if configDir != "" {
 		if linkedPath, err := filepath.EvalSymlinks(configDir); err == nil {
 			resolved = linkedPath
 		}
 	}
 	return &Resolver{configDir: configDir, resolvedConfigDir: resolved}
 }
 // Resolve returns the actual credential value for raw:
 //
 //   - ""                → "" (no error; auth_method=oauth needs no key)
 //   - "file://name.key" → trimmed content of configDir/name.key
 //   - anything else     → raw unchanged (plaintext credential)
 func (r *Resolver) Resolve(raw string) (string, error) {
 	if raw == "" {
 		return "", nil
 	}
 	if strings.HasPrefix(raw, fileScheme) {
 		fileName := strings.TrimSpace(strings.TrimPrefix(raw, fileScheme))
 		if fileName == "" {
 			return "", fmt.Errorf("credential: file:// reference has no filename")
 		}
 		baseDir := r.resolvedConfigDir
 		if baseDir == "" {
 			baseDir = r.configDir
 		}
 		keyPath := filepath.Join(baseDir, fileName)
 		// Resolve symlinks before enforcing containment to prevent escaping via symlinks.
 		realKeyPath, err := filepath.EvalSymlinks(keyPath)
 		if err != nil {
 			return "", fmt.Errorf("credential: failed to resolve credential file path %q: %w", keyPath, err)
 		}
 		if !isWithinDir(realKeyPath, baseDir) {
 			return "", fmt.Errorf("credential: file:// path escapes config directory")
 		}
 		data, err := os.ReadFile(realKeyPath)
 		if err != nil {
 			return "", fmt.Errorf("credential: failed to read credential file %q: %w", realKeyPath, err)
 		}
 		value := strings.TrimSpace(string(data))
 		if value == "" {
 			return "", fmt.Errorf("credential: credential file %q is empty", realKeyPath)
 		}
 		return value, nil
 	}
 	if strings.HasPrefix(raw, encScheme) {
 		return resolveEncrypted(raw)
 	}
 	// Plaintext credential — return unchanged.
 	return raw, nil
 }
 // resolveEncrypted decrypts an enc:// credential using PassphraseProvider.
 func resolveEncrypted(raw string) (string, error) {
 	passphrase := PassphraseProvider()
 	if passphrase == "" {
 		return "", ErrPassphraseRequired
 	}
 	sshKeyPath := pickSSHKeyPath("") // override="": consult env then auto-detect
 	b64 := strings.TrimPrefix(raw, encScheme)
 	blob, err := base64.StdEncoding.DecodeString(b64)
 	if err != nil {
 		return "", fmt.Errorf("credential: enc:// invalid base64: %w", err)
 	}
 	if len(blob) < saltLen+nonceLen+1 {
 		return "", fmt.Errorf("credential: enc:// payload too short")
 	}
 	salt := blob[:saltLen]
 	nonce := blob[saltLen : saltLen+nonceLen]
 	ciphertext := blob[saltLen+nonceLen:]
 	key, err := deriveKey(passphrase, sshKeyPath, salt)
 	if err != nil {
 		return "", err
 	}
 	block, err := aes.NewCipher(key)
 	if err != nil {
 		return "", fmt.Errorf("credential: enc:// cipher init: %w", err)
 	}
 	gcm, err := cipher.NewGCM(block)
 	if err != nil {
 		return "", fmt.Errorf("credential: enc:// gcm init: %w", err)
 	}
 	plaintext, err := gcm.Open(nil, nonce, ciphertext, nil)
 	if err != nil {
 		return "", fmt.Errorf("%w: %w", ErrDecryptionFailed, err)
 	}
 	return string(plaintext), nil
 }
 // Encrypt encrypts plaintext and returns an enc:// credential string.
 //
 // passphrase is required (PICOCLAW_KEY_PASSPHRASE value).
 // sshKeyPath is the SSH private key file to use; pass "" to auto-detect via
 // PICOCLAW_SSH_KEY_PATH env var or ~/.ssh/picoclaw_ed25519.key.
 // An SSH private key must be resolvable or Encrypt returns an error.
 func Encrypt(passphrase, sshKeyPath, plaintext string) (string, error) {
 	if passphrase == "" {
 		return "", fmt.Errorf("credential: passphrase must not be empty")
 	}
 	sshKeyPath = pickSSHKeyPath(sshKeyPath)
 	salt := make([]byte, saltLen)
 	if _, err := io.ReadFull(rand.Reader, salt); err != nil {
 		return "", fmt.Errorf("credential: failed to generate salt: %w", err)
 	}
 	key, err := deriveKey(passphrase, sshKeyPath, salt)
 	if err != nil {
 		return "", err
 	}
 	block, err := aes.NewCipher(key)
 	if err != nil {
 		return "", fmt.Errorf("credential: cipher init: %w", err)
 	}
 	gcm, err := cipher.NewGCM(block)
 	if err != nil {
 		return "", fmt.Errorf("credential: gcm init: %w", err)
 	}
 	nonce := make([]byte, nonceLen)
 	if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
 		return "", fmt.Errorf("credential: failed to generate nonce: %w", err)
 	}
 	ciphertext := gcm.Seal(nil, nonce, []byte(plaintext), nil)
 	blob := make([]byte, 0, saltLen+nonceLen+len(ciphertext))
 	blob = append(blob, salt...)
 	blob = append(blob, nonce...)
 	blob = append(blob, ciphertext...)
 	return encScheme + base64.StdEncoding.EncodeToString(blob), nil
 }
 // isWithinDir reports whether path is contained within (or equal to) dir.
 // Uses filepath.IsLocal on the relative path for robust cross-platform traversal detection.
 func isWithinDir(path, dir string) bool {
 	rel, err := filepath.Rel(filepath.Clean(dir), filepath.Clean(path))
 	return err == nil && filepath.IsLocal(rel)
 }
 // allowedSSHKeyPath reports whether path is in a permitted location for SSH key files:
 //   - exact match with PICOCLAW_SSH_KEY_PATH env var
 //   - within the PICOCLAW_HOME env var directory
 //   - within ~/.ssh/
 func allowedSSHKeyPath(path string) bool {
 	if path == "" {
 		return true // passphrase-only mode; no file will be read
 	}
 	clean := filepath.Clean(path)
 	// Exact match with PICOCLAW_SSH_KEY_PATH.
 	if envPath, ok := os.LookupEnv(sshKeyEnv); ok && envPath != "" {
 		if clean == filepath.Clean(envPath) {
 			return true
 		}
 	}
 	// Within PICOCLAW_HOME.
 	if picoHome := os.Getenv("PICOCLAW_HOME"); picoHome != "" {
 		if isWithinDir(clean, picoHome) {
 			return true
 		}
 	}
 	// Within ~/.ssh/.
 	if userHome, err := os.UserHomeDir(); err == nil {
 		if isWithinDir(clean, filepath.Join(userHome, ".ssh")) {
 			return true
 		}
 	}
 	return false
 }
 // deriveKey derives a 32-byte AES-256 key from passphrase and SSH private key.
 //
 // ikm = HMAC-SHA256(key=SHA256(sshKeyBytes), msg=passphrase)
 // Final key: HKDF-SHA256(ikm, salt, info="picoclaw-credential-v1", 32 bytes)
 // sshKeyPath must be non-empty; returns an error otherwise.
 func deriveKey(passphrase, sshKeyPath string, salt []byte) ([]byte, error) {
 	if sshKeyPath == "" {
 		return nil, fmt.Errorf(
 			"credential: SSH private key is required but not found" +
 				" (set PICOCLAW_SSH_KEY_PATH or place key at ~/.ssh/picoclaw_ed25519.key)")
 	}
 	if !allowedSSHKeyPath(sshKeyPath) {
 		return nil, fmt.Errorf(
 			"credential: SSH key path %q is not in an allowed location (PICOCLAW_SSH_KEY_PATH, PICOCLAW_HOME, or ~/.ssh/)",
 			sshKeyPath,
 		)
 	}
 	sshBytes, err := os.ReadFile(sshKeyPath)
 	if err != nil {
 		return nil, fmt.Errorf("credential: cannot read SSH key %q: %w", sshKeyPath, err)
 	}
 	sshHash := sha256.Sum256(sshBytes)
 	mac := hmac.New(sha256.New, sshHash[:])
 	mac.Write([]byte(passphrase))
 	ikm := mac.Sum(nil)
 	key, err := hkdf.Key(sha256.New, ikm, salt, hkdfInfo, keyLen)
 	if err != nil {
 		return nil, fmt.Errorf("credential: HKDF expand failed: %w", err)
 	}
 	return key, nil
 }
 // pickSSHKeyPath returns the SSH private key path to use for encryption/decryption.
 //
 // Priority:
 //  1. override (non-empty explicit argument)
 //  2. PICOCLAW_SSH_KEY_PATH env var
 //  3. ~/.ssh/picoclaw_ed25519.key (auto-detection)
 //
 // Returns "" when no key is found; deriveKey will return an error in that case.
 func pickSSHKeyPath(override string) string {
 	if override != "" {
 		return override
 	}
 	if p, ok := os.LookupEnv(sshKeyEnv); ok {
 		return p // respect explicit setting, even if ""
 	}
 	return findDefaultSSHKey()
 }
 // findDefaultSSHKey returns the picoclaw-specific SSH key path if it exists.
 func findDefaultSSHKey() string {
 	p, err := DefaultSSHKeyPath()
 	if err != nil {
 		return ""
 	}
 	if _, err := os.Stat(p); err == nil {
 		return p
 	}
 	return ""
 }
--- a/pkg/credential/credential_test.go
+++ b/pkg/credential/credential_test.go
@ -0,0 +1,283 @@
 package credential_test
 import (
 	"os"
 	"path/filepath"
 	"testing"
 	"github.com/sipeed/picoclaw/pkg/credential"
 )
 func TestResolve_PlainKey(t *testing.T) {
 	r := credential.NewResolver(t.TempDir())
 	got, err := r.Resolve("sk-plaintext-key")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	if got != "sk-plaintext-key" {
 		t.Fatalf("got %q, want %q", got, "sk-plaintext-key")
 	}
 }
 func TestResolve_FileKey_Success(t *testing.T) {
 	dir := t.TempDir()
 	keyFile := "openai_plain.key"
 	if err := os.WriteFile(filepath.Join(dir, keyFile), []byte("sk-from-file\n"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	r := credential.NewResolver(dir)
 	got, err := r.Resolve("file://" + keyFile)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	if got != "sk-from-file" {
 		t.Fatalf("got %q, want %q", got, "sk-from-file")
 	}
 }
 func TestResolve_FileKey_NotFound(t *testing.T) {
 	r := credential.NewResolver(t.TempDir())
 	_, err := r.Resolve("file://missing.key")
 	if err == nil {
 		t.Fatal("expected error for missing file, got nil")
 	}
 }
 func TestResolve_FileKey_Empty(t *testing.T) {
 	dir := t.TempDir()
 	keyFile := "empty.key"
 	if err := os.WriteFile(filepath.Join(dir, keyFile), []byte("   \n"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	r := credential.NewResolver(dir)
 	_, err := r.Resolve("file://" + keyFile)
 	if err == nil {
 		t.Fatal("expected error for empty credential file, got nil")
 	}
 }
 // TestResolve_EncKey_RoundTrip tests basic encryption/decryption round-trip with an SSH key.
 func TestResolve_EncKey_RoundTrip(t *testing.T) {
 	dir := t.TempDir()
 	sshKeyPath := filepath.Join(dir, "picoclaw_ed25519.key")
 	if err := os.WriteFile(sshKeyPath, []byte("fake-ssh-key-material\n"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	const passphrase = "test-passphrase-32bytes-long-ok!"
 	const plaintext = "sk-encrypted-secret"
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", sshKeyPath)
 	enc, err := credential.Encrypt(passphrase, "", plaintext)
 	if err != nil {
 		t.Fatalf("Encrypt: %v", err)
 	}
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", passphrase)
 	r := credential.NewResolver(t.TempDir())
 	got, err := r.Resolve(enc)
 	if err != nil {
 		t.Fatalf("Resolve: %v", err)
 	}
 	if got != plaintext {
 		t.Fatalf("got %q, want %q", got, plaintext)
 	}
 }
 // TestResolve_EncKey_WithSSHKey tests that the SSH key file is incorporated into key derivation.
 func TestResolve_EncKey_WithSSHKey(t *testing.T) {
 	dir := t.TempDir()
 	sshKeyPath := filepath.Join(dir, "picoclaw_ed25519.key")
 	if err := os.WriteFile(sshKeyPath, []byte("fake-ssh-private-key-material\n"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	const passphrase = "test-passphrase"
 	const plaintext = "sk-ssh-protected-secret"
 	// Set PICOCLAW_SSH_KEY_PATH before Encrypt so the path passes allowedSSHKeyPath validation.
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", passphrase)
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", sshKeyPath)
 	enc, err := credential.Encrypt(passphrase, sshKeyPath, plaintext)
 	if err != nil {
 		t.Fatalf("Encrypt: %v", err)
 	}
 	r := credential.NewResolver(t.TempDir())
 	got, err := r.Resolve(enc)
 	if err != nil {
 		t.Fatalf("Resolve: %v", err)
 	}
 	if got != plaintext {
 		t.Fatalf("got %q, want %q", got, plaintext)
 	}
 }
 func TestResolve_EncKey_NoPassphrase(t *testing.T) {
 	dir := t.TempDir()
 	sshKeyPath := filepath.Join(dir, "picoclaw_ed25519.key")
 	if err := os.WriteFile(sshKeyPath, []byte("fake-ssh-key\n"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", sshKeyPath)
 	enc, err := credential.Encrypt("some-passphrase", "", "sk-secret")
 	if err != nil {
 		t.Fatalf("Encrypt: %v", err)
 	}
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "")
 	r := credential.NewResolver(t.TempDir())
 	_, err = r.Resolve(enc)
 	if err == nil {
 		t.Fatal("expected error when PICOCLAW_KEY_PASSPHRASE is unset, got nil")
 	}
 }
 func TestResolve_EncKey_BadCiphertext(t *testing.T) {
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "some-passphrase")
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", "")
 	r := credential.NewResolver(t.TempDir())
 	_, err := r.Resolve("enc://!!not-valid-base64!!")
 	if err == nil {
 		t.Fatal("expected error for invalid enc:// payload, got nil")
 	}
 }
 func TestResolve_EncKey_PayloadTooShort(t *testing.T) {
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "some-passphrase")
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", "")
 	// Valid base64 but fewer bytes than salt(16)+nonce(12)+1 minimum.
 	import64 := "dG9vc2hvcnQ=" // "tooshort" = 8 bytes
 	r := credential.NewResolver(t.TempDir())
 	_, err := r.Resolve("enc://" + import64)
 	if err == nil {
 		t.Fatal("expected error for too-short enc:// payload, got nil")
 	}
 }
 func TestResolve_EncKey_WrongPassphrase(t *testing.T) {
 	dir := t.TempDir()
 	sshKeyPath := filepath.Join(dir, "picoclaw_ed25519.key")
 	if err := os.WriteFile(sshKeyPath, []byte("fake-ssh-key\n"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", sshKeyPath)
 	enc, err := credential.Encrypt("correct-passphrase", "", "sk-secret")
 	if err != nil {
 		t.Fatalf("Encrypt: %v", err)
 	}
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "wrong-passphrase")
 	r := credential.NewResolver(t.TempDir())
 	_, err = r.Resolve(enc)
 	if err == nil {
 		t.Fatal("expected decryption error for wrong passphrase, got nil")
 	}
 }
 func TestEncrypt_EmptyPassphrase(t *testing.T) {
 	_, err := credential.Encrypt("", "", "sk-secret")
 	if err == nil {
 		t.Fatal("expected error for empty passphrase, got nil")
 	}
 }
 func TestDeriveKey_SSHKeyNotFound(t *testing.T) {
 	// Encrypt with a real SSH key path, then try to decrypt with a missing path.
 	dir := t.TempDir()
 	sshKeyPath := filepath.Join(dir, "picoclaw_ed25519.key")
 	if err := os.WriteFile(sshKeyPath, []byte("fake-key\n"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	// Register the real key path so allowedSSHKeyPath validation passes for Encrypt.
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", sshKeyPath)
 	enc, err := credential.Encrypt("passphrase", sshKeyPath, "sk-secret")
 	if err != nil {
 		t.Fatalf("Encrypt: %v", err)
 	}
 	// Point to a non-existent SSH key so deriveKey's ReadFile fails.
 	// The path is still under the same dir, so allowedSSHKeyPath passes (exact env match).
 	t.Setenv("PICOCLAW_KEY_PASSPHRASE", "passphrase")
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", filepath.Join(dir, "nonexistent_key"))
 	r := credential.NewResolver(t.TempDir())
 	_, err = r.Resolve(enc)
 	if err == nil {
 		t.Fatal("expected error when SSH key file is missing, got nil")
 	}
 }
 // TestResolve_FileRef_PathTraversal verifies that file:// references cannot escape configDir
 // via relative traversal ("../../etc/passwd") or absolute paths ("/abs/path").
 func TestResolve_FileRef_PathTraversal(t *testing.T) {
 	dir := t.TempDir()
 	cfgPath := filepath.Join(dir, "config.json")
 	// Create a file outside configDir that the traversal would point to.
 	outsideFile := filepath.Join(t.TempDir(), "secret.key")
 	if err := os.WriteFile(outsideFile, []byte("stolen"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	r := credential.NewResolver(filepath.Dir(cfgPath))
 	cases := []string{
 		"file://../../secret.key",
 		"file://../secret.key",
 		"file://" + outsideFile, // absolute path
 	}
 	for _, raw := range cases {
 		_, err := r.Resolve(raw)
 		if err == nil {
 			t.Errorf("Resolve(%q): expected path traversal error, got nil", raw)
 		}
 	}
 }
 // TestResolve_FileRef_withinConfigDir verifies that a legitimate relative file:// ref works.
 func TestResolve_FileRef_withinConfigDir(t *testing.T) {
 	dir := t.TempDir()
 	if err := os.WriteFile(filepath.Join(dir, "my.key"), []byte("sk-valid\n"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	r := credential.NewResolver(dir)
 	got, err := r.Resolve("file://my.key")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	if got != "sk-valid" {
 		t.Fatalf("got %q, want %q", got, "sk-valid")
 	}
 }
 // TestEncrypt_SSHKeyOutsideAllowedDirs verifies that Encrypt rejects SSH key paths
 // that are not under PICOCLAW_SSH_KEY_PATH, PICOCLAW_HOME, or ~/.ssh/.
 func TestEncrypt_SSHKeyOutsideAllowedDirs(t *testing.T) {
 	dir := t.TempDir()
 	sshKeyPath := filepath.Join(dir, "picoclaw_ed25519.key")
 	if err := os.WriteFile(sshKeyPath, []byte("fake-key\n"), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
 	// Make sure none of the allowed env vars point here.
 	t.Setenv("PICOCLAW_SSH_KEY_PATH", "")
 	t.Setenv("PICOCLAW_HOME", "")
 	_, err := credential.Encrypt("passphrase", sshKeyPath, "sk-secret")
 	if err == nil {
 		t.Fatal("expected error for SSH key outside allowed directories, got nil")
 	}
 }
--- a/pkg/credential/keygen.go
+++ b/pkg/credential/keygen.go
@ -0,0 +1,62 @@
 package credential
 import (
 	"crypto/ed25519"
 	"crypto/rand"
 	"encoding/pem"
 	"fmt"
 	"os"
 	"path/filepath"
 	"golang.org/x/crypto/ssh"
 )
 // DefaultSSHKeyPath returns the canonical path for the picoclaw-specific SSH key.
 // The path is always ~/.ssh/picoclaw_ed25519.key (os.UserHomeDir is cross-platform).
 func DefaultSSHKeyPath() (string, error) {
 	home, err := os.UserHomeDir()
 	if err != nil {
 		return "", fmt.Errorf("credential: cannot determine home directory: %w", err)
 	}
 	return filepath.Join(home, ".ssh", "picoclaw_ed25519.key"), nil
 }
 // GenerateSSHKey generates an Ed25519 SSH key pair and writes the private key
 // to path (permissions 0600) and the public key to path+".pub" (permissions 0644).
 // The ~/.ssh/ directory is created with 0700 if it does not exist.
 // If the files already exist they are overwritten.
 func GenerateSSHKey(path string) error {
 	if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
 		return fmt.Errorf("credential: keygen: cannot create directory %q: %w", filepath.Dir(path), err)
 	}
 	pubRaw, privRaw, err := ed25519.GenerateKey(rand.Reader)
 	if err != nil {
 		return fmt.Errorf("credential: keygen: ed25519 key generation failed: %w", err)
 	}
 	// Marshal private key as OpenSSH PEM.
 	block, err := ssh.MarshalPrivateKey(privRaw, "")
 	if err != nil {
 		return fmt.Errorf("credential: keygen: marshal private key: %w", err)
 	}
 	privPEM := pem.EncodeToMemory(block)
 	if err = os.WriteFile(path, privPEM, 0o600); err != nil {
 		return fmt.Errorf("credential: keygen: write private key %q: %w", path, err)
 	}
 	// Marshal public key as authorized_keys line.
 	sshPub, err := ssh.NewPublicKey(pubRaw)
 	if err != nil {
 		return fmt.Errorf("credential: keygen: marshal public key: %w", err)
 	}
 	pubLine := ssh.MarshalAuthorizedKey(sshPub)
 	pubPath := path + ".pub"
 	if err := os.WriteFile(pubPath, pubLine, 0o644); err != nil {
 		return fmt.Errorf("credential: keygen: write public key %q: %w", pubPath, err)
 	}
 	return nil
 }
--- a/pkg/credential/keygen_test.go
+++ b/pkg/credential/keygen_test.go
@ -0,0 +1,115 @@
 package credential
 import (
 	"crypto/ed25519"
 	"os"
 	"path/filepath"
 	"runtime"
 	"testing"
 	"golang.org/x/crypto/ssh"
 )
 func TestGenerateSSHKey_CreatesFiles(t *testing.T) {
 	dir := t.TempDir()
 	keyPath := filepath.Join(dir, "test_ed25519.key")
 	if err := GenerateSSHKey(keyPath); err != nil {
 		t.Fatalf("GenerateSSHKey() error = %v", err)
 	}
 	// Private key must exist.
 	privInfo, err := os.Stat(keyPath)
 	if err != nil {
 		t.Fatalf("private key file missing: %v", err)
 	}
 	// Check permissions on non-Windows (Windows does not support Unix permission bits).
 	if runtime.GOOS != "windows" {
 		if got := privInfo.Mode().Perm(); got != 0o600 {
 			t.Errorf("private key permissions = %04o, want 0600", got)
 		}
 	}
 	// Public key must exist.
 	pubPath := keyPath + ".pub"
 	pubInfo, err := os.Stat(pubPath)
 	if err != nil {
 		t.Fatalf("public key file missing: %v", err)
 	}
 	if runtime.GOOS != "windows" {
 		if got := pubInfo.Mode().Perm(); got != 0o644 {
 			t.Errorf("public key permissions = %04o, want 0644", got)
 		}
 	}
 	// Private key must be parseable as an OpenSSH ed25519 key.
 	privPEM, err := os.ReadFile(keyPath)
 	if err != nil {
 		t.Fatalf("read private key: %v", err)
 	}
 	privKey, err := ssh.ParseRawPrivateKey(privPEM)
 	if err != nil {
 		t.Fatalf("parse private key: %v", err)
 	}
 	if _, ok := privKey.(*ed25519.PrivateKey); !ok {
 		t.Errorf("private key type = %T, want *ed25519.PrivateKey", privKey)
 	}
 	// Public key must be parseable as authorized_keys line.
 	pubBytes, err := os.ReadFile(pubPath)
 	if err != nil {
 		t.Fatalf("read public key: %v", err)
 	}
 	pubKey, _, _, rest, err := ssh.ParseAuthorizedKey(pubBytes)
 	if err != nil {
 		t.Fatalf("parse public key: %v", err)
 	}
 	if pubKey == nil {
 		t.Fatal("expected non-nil public key")
 	}
 	if len(rest) > 0 {
 		t.Errorf("unexpected trailing bytes after public key: %d bytes", len(rest))
 	}
 }
 func TestGenerateSSHKey_OverwritesExisting(t *testing.T) {
 	dir := t.TempDir()
 	keyPath := filepath.Join(dir, "test_ed25519.key")
 	// Generate twice; second call must not error and must produce a different key.
 	if err := GenerateSSHKey(keyPath); err != nil {
 		t.Fatalf("first GenerateSSHKey() error = %v", err)
 	}
 	first, err := os.ReadFile(keyPath)
 	if err != nil {
 		t.Fatalf("read first key: %v", err)
 	}
 	if err = GenerateSSHKey(keyPath); err != nil {
 		t.Fatalf("second GenerateSSHKey() error = %v", err)
 	}
 	second, err := os.ReadFile(keyPath)
 	if err != nil {
 		t.Fatalf("read second key: %v", err)
 	}
 	// Two independently generated Ed25519 keys must differ.
 	if string(first) == string(second) {
 		t.Error("expected overwritten key to differ from original")
 	}
 }
 func TestGenerateSSHKey_CreatesDirectory(t *testing.T) {
 	dir := t.TempDir()
 	// Nested directory that does not yet exist.
 	keyPath := filepath.Join(dir, "subdir", ".ssh", "picoclaw_ed25519.key")
 	if err := GenerateSSHKey(keyPath); err != nil {
 		t.Fatalf("GenerateSSHKey() error = %v", err)
 	}
 	if _, err := os.Stat(keyPath); err != nil {
 		t.Fatalf("private key not created: %v", err)
 	}
 }
--- a/pkg/credential/store.go
+++ b/pkg/credential/store.go
@ -0,0 +1,44 @@
 package credential
 import "sync/atomic"
 // SecureStore holds a passphrase in memory.
 //
 // Uses atomic.Pointer so reads and writes are lock-free.
 // The passphrase is never written to disk; callers decide how to
 // transport it outside this store (e.g., via cmd.Env or os.Environ).
 type SecureStore struct {
 	val atomic.Pointer[string]
 }
 // NewSecureStore creates an empty SecureStore.
 func NewSecureStore() *SecureStore {
 	return &SecureStore{}
 }
 // SetString stores the passphrase. An empty string clears the store.
 func (s *SecureStore) SetString(passphrase string) {
 	if passphrase == "" {
 		s.val.Store(nil)
 		return
 	}
 	s.val.Store(&passphrase)
 }
 // Get returns the stored passphrase, or "" if not set.
 func (s *SecureStore) Get() string {
 	if p := s.val.Load(); p != nil {
 		return *p
 	}
 	return ""
 }
 // IsSet reports whether a passphrase is currently stored.
 func (s *SecureStore) IsSet() bool {
 	return s.val.Load() != nil
 }
 // Clear removes the stored passphrase.
 func (s *SecureStore) Clear() {
 	s.val.Store(nil)
 }
--- a/pkg/credential/store_test.go
+++ b/pkg/credential/store_test.go
@ -0,0 +1,81 @@
 package credential
 import (
 	"sync"
 	"testing"
 )
 func TestSecureStore_SetGet(t *testing.T) {
 	s := NewSecureStore()
 	if s.IsSet() {
 		t.Error("expected empty store")
 	}
 	s.SetString("hunter2")
 	if !s.IsSet() {
 		t.Error("expected store to be set")
 	}
 	if got := s.Get(); got != "hunter2" {
 		t.Errorf("Get() = %q, want %q", got, "hunter2")
 	}
 }
 func TestSecureStore_Clear(t *testing.T) {
 	s := NewSecureStore()
 	s.SetString("secret")
 	s.Clear()
 	if s.IsSet() {
 		t.Error("expected store to be empty after Clear()")
 	}
 	if got := s.Get(); got != "" {
 		t.Errorf("Get() after Clear() = %q, want empty", got)
 	}
 }
 func TestSecureStore_SetOverwrites(t *testing.T) {
 	s := NewSecureStore()
 	s.SetString("first")
 	s.SetString("second")
 	if got := s.Get(); got != "second" {
 		t.Errorf("Get() = %q, want %q", got, "second")
 	}
 }
 func TestSecureStore_EmptyPassphrase(t *testing.T) {
 	s := NewSecureStore()
 	s.SetString("") // empty → should not mark as set
 	if s.IsSet() {
 		t.Error("empty passphrase should not mark store as set")
 	}
 }
 func TestSecureStore_ConcurrentSetGet(t *testing.T) {
 	s := NewSecureStore()
 	const goroutines = 10
 	const iterations = 1000
 	var wg sync.WaitGroup
 	wg.Add(goroutines)
 	for i := 0; i < goroutines; i++ {
 		go func(id int) {
 			defer wg.Done()
 			for j := 0; j < iterations; j++ {
 				if id%2 == 0 {
 					s.SetString("even")
 				} else {
 					s.SetString("odd")
 				}
 				_ = s.Get()
 			}
 		}(i)
 	}
 	wg.Wait()
 	final := s.Get()
 	if final != "" && final != "even" && final != "odd" {
 		t.Errorf("Get() returned unexpected value %q after concurrent Set/Get", final)
 	}
 }
--- a/pkg/cron/service.go
+++ b/pkg/cron/service.go
@ -65,6 +65,7 @@ type CronService struct {
 	mu        sync.RWMutex
 	running   bool
 	stopChan  chan struct{}
 	wakeChan  chan struct{}
 	gronx     *gronx.Gronx
 }
@ -73,6 +74,7 @@ func NewCronService(storePath string, onJob JobHandler) *CronService {
 		storePath: storePath,
 		onJob:     onJob,
 		gronx:     gronx.New(),
 		wakeChan:  make(chan struct{}),
 	}
 	// Initialize and load store on creation
 	cs.loadStore()
@ -97,6 +99,9 @@ func (cs *CronService) Start() error {
 	}
 	cs.stopChan = make(chan struct{})
 	if cs.wakeChan == nil {
 		cs.wakeChan = make(chan struct{})
 	}
 	cs.running = true
 	go cs.runLoop(cs.stopChan)
@ -119,14 +124,47 @@ func (cs *CronService) Stop() {
 }
 func (cs *CronService) runLoop(stopChan chan struct{}) {
-	ticker := time.NewTicker(1 * time.Second)
+	timer := time.NewTimer(time.Hour)
-	defer ticker.Stop()
+	if !timer.Stop() {
 		<-timer.C
 	}
 	defer timer.Stop()
 	for {
 		// every loop, recalculate the next wake time
 		cs.mu.RLock()
 		nextWake := cs.getNextWakeMS()
 		cs.mu.RUnlock()
 		var delay time.Duration
 		now := time.Now().UnixMilli()
 		if nextWake == nil {
 			// no jobs, sleep for a long time (or until a new job is added)
 			delay = time.Hour
 		} else {
 			diff := *nextWake - now
 			if diff <= 0 {
 				delay = 0
 			} else {
 				delay = time.Duration(diff) * time.Millisecond
 			}
 		}
 		timer.Reset(delay)
 		select {
 		case <-stopChan:
 			return
-		case <-ticker.C:
+		case <-cs.wakeChan: // wake on new job or update
 			if !timer.Stop() {
 				select {
 				case <-timer.C:
 				default:
 				}
 			}
 			continue
 		case <-timer.C:
 			cs.checkJobs()
 		}
 	}
@ -264,22 +302,19 @@ func (cs *CronService) executeJobByID(jobID string) {
 }
 func (cs *CronService) computeNextRun(schedule *CronSchedule, nowMS int64) *int64 {
-	if schedule.Kind == "at" {
+	switch schedule.Kind {
 	case "at":
 		if schedule.AtMS != nil && *schedule.AtMS > nowMS {
 			return schedule.AtMS
 		}
 		return nil
-	}
+	case "every":
 	if schedule.Kind == "every" {
 		if schedule.EveryMS == nil || *schedule.EveryMS <= 0 {
 			return nil
 		}
 		next := nowMS + *schedule.EveryMS
 		return &next
-	}
+	case "cron":
 	if schedule.Kind == "cron" {
 		if schedule.Expr == "" {
 			return nil
 		}
@ -294,9 +329,19 @@ func (cs *CronService) computeNextRun(schedule *CronSchedule, nowMS int64) *int6
 		nextMS := nextTime.UnixMilli()
 		return &nextMS
 	default:
 		log.Printf("[cron] unknown schedule kind '%s'", schedule.Kind)
 		return nil
 	}
 }
-	return nil
+// wake up the loop to re-evaluate next wake time immediately (e.g. after add/update/remove jobs)
 func (cs *CronService) notify() {
 	select {
 	case cs.wakeChan <- struct{}{}:
 	default:
 		// if the channel is full, it means the loop will wake up soon anyway, so we can skip sending
 	}
 }
 func (cs *CronService) recomputeNextRuns() {
@ -400,6 +445,8 @@ func (cs *CronService) AddJob(
 		return nil, err
 	}
 	cs.notify()
 	return &job, nil
 }
@ -411,6 +458,9 @@ func (cs *CronService) UpdateJob(job *CronJob) error {
 		if cs.store.Jobs[i].ID == job.ID {
 			cs.store.Jobs[i] = *job
 			cs.store.Jobs[i].UpdatedAtMS = time.Now().UnixMilli()
 			cs.notify()
 			return cs.saveStoreUnsafe()
 		}
 	}
@ -441,6 +491,8 @@ func (cs *CronService) removeJobUnsafe(jobID string) bool {
 		}
 	}
 	cs.notify()
 	return removed
 }
@ -463,6 +515,9 @@ func (cs *CronService) EnableJob(jobID string, enabled bool) *CronJob {
 			if err := cs.saveStoreUnsafe(); err != nil {
 				log.Printf("[cron] failed to save store after enable: %v", err)
 			}
 			cs.notify()
 			return job
 		}
 	}
--- a/pkg/cron/service_test.go
+++ b/pkg/cron/service_test.go
@ -1,10 +1,13 @@
 package cron
 import (
 	"fmt"
 	"os"
 	"path/filepath"
 	"runtime"
 	"sync"
 	"testing"
 	"time"
 )
 func TestSaveStore_FilePermissions(t *testing.T) {
@ -36,3 +39,199 @@ func TestSaveStore_FilePermissions(t *testing.T) {
 func int64Ptr(v int64) *int64 {
 	return &v
 }
 func setupService(handler JobHandler) (*CronService, string) {
 	tmpFile := fmt.Sprintf("test_cron_%d.json", time.Now().UnixNano())
 	cs := NewCronService(tmpFile, handler)
 	return cs, tmpFile
 }
 func TestCronService_CRUD(t *testing.T) {
 	cs, path := setupService(nil)
 	defer os.Remove(path)
 	// Test AddJob
 	at := time.Now().Add(time.Hour).UnixMilli()
 	job, err := cs.AddJob("Task1", CronSchedule{Kind: "at", AtMS: &at}, "msg", true, "ch", "to")
 	if err != nil || job.ID == "" {
 		t.Fatalf("AddJob failed: %v", err)
 	}
 	// Test ListJobs
 	if len(cs.ListJobs(true)) != 1 {
 		t.Error("ListJobs should return 1 job")
 	}
 	// Test UpdateJob
 	job.Name = "UpdatedName"
 	err = cs.UpdateJob(job)
 	if err != nil || cs.store.Jobs[0].Name != "UpdatedName" {
 		t.Error("UpdateJob failed")
 	}
 	// Test EnableJob
 	cs.EnableJob(job.ID, false)
 	if cs.store.Jobs[0].Enabled != false || cs.store.Jobs[0].State.NextRunAtMS != nil {
 		t.Error("EnableJob(false) failed to clear state")
 	}
 	// Test RemoveJob
 	removed := cs.RemoveJob(job.ID)
 	if !removed || len(cs.store.Jobs) != 0 {
 		t.Error("RemoveJob failed")
 	}
 }
 // 2. Test Cron Expression Calculation Logic
 func TestCronService_ComputeNextRun(t *testing.T) {
 	cs, path := setupService(nil)
 	defer os.Remove(path)
 	now := time.Date(2024, 1, 1, 12, 0, 0, 0, time.UTC).UnixMilli()
 	tests := []struct {
 		name     string
 		schedule CronSchedule
 		wantNil  bool
 	}{
 		{"Valid Cron", CronSchedule{Kind: "cron", Expr: "0 * * * *"}, false},
 		{"Invalid Cron", CronSchedule{Kind: "cron", Expr: "invalid"}, true},
 		{"Every MS", CronSchedule{Kind: "every", EveryMS: int64Ptr(5000)}, false},
 		{"At Future", CronSchedule{Kind: "at", AtMS: int64Ptr(now + 1000)}, false},
 		{"At Past", CronSchedule{Kind: "at", AtMS: int64Ptr(now - 1000)}, true},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := cs.computeNextRun(&tt.schedule, now)
 			if (got == nil) != tt.wantNil {
 				t.Errorf("%s: got %v, wantNil %v", tt.name, got, tt.wantNil)
 			}
 		})
 	}
 }
 // 3. Test Execution Flow
 func TestCronService_ExecutionFlow(t *testing.T) {
 	var mu sync.Mutex
 	executedJobs := make(map[string]bool)
 	handler := func(job *CronJob) (string, error) {
 		mu.Lock()
 		executedJobs[job.ID] = true
 		mu.Unlock()
 		return "ok", nil
 	}
 	cs, path := setupService(handler)
 	defer os.Remove(path)
 	// Start the service
 	if err := cs.Start(); err != nil {
 		t.Fatalf("Start failed: %v", err)
 	}
 	defer cs.Stop()
 	// Add a job then runs 100ms from now
 	target := time.Now().Add(100 * time.Millisecond).UnixMilli()
 	job, _ := cs.AddJob("FastJob", CronSchedule{Kind: "at", AtMS: &target}, "", false, "", "")
 	// Check for job execution with a timeout
 	success := false
 	for range 20 {
 		mu.Lock()
 		if executedJobs[job.ID] {
 			success = true
 			mu.Unlock()
 			break
 		}
 		mu.Unlock()
 		time.Sleep(100 * time.Millisecond)
 	}
 	if !success {
 		t.Error("Job was not executed in time")
 	}
 	// check that the job is removed after execution (DeleteAfterRun = true)
 	status := cs.Status()
 	if status["jobs"].(int) != 0 {
 		t.Errorf("Job should be deleted after run, got count: %v", status["jobs"])
 	}
 }
 func TestCronService_PersistenceIntegrity(t *testing.T) {
 	tmpFile := "persist_test.json"
 	defer os.Remove(tmpFile)
 	// write a job and persist
 	cs1 := NewCronService(tmpFile, nil)
 	at := int64(2000000000000)
 	cs1.AddJob("PersistMe", CronSchedule{Kind: "at", AtMS: &at}, "payload", true, "ch1", "")
 	// check file exists
 	if _, err := os.Stat(tmpFile); os.IsNotExist(err) {
 		t.Fatal("Store file was not created")
 	}
 	// reload and check data integrity
 	cs2 := NewCronService(tmpFile, nil)
 	if err := cs2.Load(); err != nil {
 		t.Fatalf("Failed to load store: %v", err)
 	}
 	jobs := cs2.ListJobs(true)
 	if len(jobs) != 1 || jobs[0].Name != "PersistMe" {
 		t.Errorf("Data corruption after reload. Got: %+v", jobs)
 	}
 	// test loading invalid JSON
 	os.WriteFile(tmpFile, []byte("{invalid json}"), 0o644)
 	cs3 := NewCronService(tmpFile, nil)
 	err := cs3.loadStore()
 	if err == nil {
 		t.Error("Should return error when loading invalid JSON")
 	}
 }
 func TestCronService_ConcurrentAccess(t *testing.T) {
 	cs, path := setupService(nil)
 	defer os.Remove(path)
 	cs.Start()
 	defer cs.Stop()
 	var wg sync.WaitGroup
 	workers := 10
 	iterations := 50
 	wg.Add(workers * 2)
 	// add jobs concurrently
 	for i := range workers {
 		go func(id int) {
 			defer wg.Done()
 			for j := range iterations {
 				at := time.Now().Add(time.Hour).UnixMilli()
 				cs.AddJob(fmt.Sprintf("Job-%d-%d", id, j), CronSchedule{Kind: "at", AtMS: &at}, "", false, "", "")
 				time.Sleep(100 * time.Microsecond)
 			}
 		}(i)
 	}
 	// read and update jobs concurrently
 	for range workers {
 		go func() {
 			defer wg.Done()
 			for j := range iterations {
 				jobs := cs.ListJobs(true)
 				if len(jobs) > 0 {
 					cs.EnableJob(jobs[0].ID, j%2 == 0)
 				}
 				time.Sleep(100 * time.Microsecond)
 			}
 		}()
 	}
 	wg.Wait()
 }
--- a/pkg/gateway/gateway.go
+++ b/pkg/gateway/gateway.go
@ -0,0 +1,594 @@
 package gateway
 import (
 	"context"
 	"fmt"
 	"os"
 	"os/signal"
 	"path/filepath"
 	"sync"
 	"syscall"
 	"time"
 	"github.com/sipeed/picoclaw/pkg/agent"
 	"github.com/sipeed/picoclaw/pkg/bus"
 	"github.com/sipeed/picoclaw/pkg/channels"
 	_ "github.com/sipeed/picoclaw/pkg/channels/dingtalk"
 	_ "github.com/sipeed/picoclaw/pkg/channels/discord"
 	_ "github.com/sipeed/picoclaw/pkg/channels/feishu"
 	_ "github.com/sipeed/picoclaw/pkg/channels/irc"
 	_ "github.com/sipeed/picoclaw/pkg/channels/line"
 	_ "github.com/sipeed/picoclaw/pkg/channels/maixcam"
 	_ "github.com/sipeed/picoclaw/pkg/channels/matrix"
 	_ "github.com/sipeed/picoclaw/pkg/channels/onebot"
 	_ "github.com/sipeed/picoclaw/pkg/channels/pico"
 	_ "github.com/sipeed/picoclaw/pkg/channels/qq"
 	_ "github.com/sipeed/picoclaw/pkg/channels/slack"
 	_ "github.com/sipeed/picoclaw/pkg/channels/telegram"
 	_ "github.com/sipeed/picoclaw/pkg/channels/wecom"
 	_ "github.com/sipeed/picoclaw/pkg/channels/whatsapp"
 	_ "github.com/sipeed/picoclaw/pkg/channels/whatsapp_native"
 	"github.com/sipeed/picoclaw/pkg/config"
 	"github.com/sipeed/picoclaw/pkg/cron"
 	"github.com/sipeed/picoclaw/pkg/devices"
 	"github.com/sipeed/picoclaw/pkg/health"
 	"github.com/sipeed/picoclaw/pkg/heartbeat"
 	"github.com/sipeed/picoclaw/pkg/logger"
 	"github.com/sipeed/picoclaw/pkg/media"
 	"github.com/sipeed/picoclaw/pkg/providers"
 	"github.com/sipeed/picoclaw/pkg/state"
 	"github.com/sipeed/picoclaw/pkg/tools"
 	"github.com/sipeed/picoclaw/pkg/voice"
 )
 const (
 	serviceShutdownTimeout  = 30 * time.Second
 	providerReloadTimeout   = 30 * time.Second
 	gracefulShutdownTimeout = 15 * time.Second
 )
 type services struct {
 	CronService      *cron.CronService
 	HeartbeatService *heartbeat.HeartbeatService
 	MediaStore       media.MediaStore
 	ChannelManager   *channels.Manager
 	DeviceService    *devices.Service
 	HealthServer     *health.Server
 }
 type startupBlockedProvider struct {
 	reason string
 }
 func (p *startupBlockedProvider) Chat(
 	_ context.Context,
 	_ []providers.Message,
 	_ []providers.ToolDefinition,
 	_ string,
 	_ map[string]any,
 ) (*providers.LLMResponse, error) {
 	return nil, fmt.Errorf("%s", p.reason)
 }
 func (p *startupBlockedProvider) GetDefaultModel() string {
 	return ""
 }
 // Run starts the gateway runtime using the configuration loaded from configPath.
 func Run(debug bool, configPath string, allowEmptyStartup bool) error {
 	if debug {
 		logger.SetLevel(logger.DEBUG)
 		fmt.Println("🔍 Debug mode enabled")
 	}
 	cfg, err := config.LoadConfig(configPath)
 	if err != nil {
 		return fmt.Errorf("error loading config: %w", err)
 	}
 	provider, modelID, err := createStartupProvider(cfg, allowEmptyStartup)
 	if err != nil {
 		return fmt.Errorf("error creating provider: %w", err)
 	}
 	if modelID != "" {
 		cfg.Agents.Defaults.ModelName = modelID
 	}
 	msgBus := bus.NewMessageBus()
 	agentLoop := agent.NewAgentLoop(cfg, msgBus, provider)
 	fmt.Println("\n📦 Agent Status:")
 	startupInfo := agentLoop.GetStartupInfo()
 	toolsInfo := startupInfo["tools"].(map[string]any)
 	skillsInfo := startupInfo["skills"].(map[string]any)
 	fmt.Printf("  • Tools: %d loaded\n", toolsInfo["count"])
 	fmt.Printf("  • Skills: %d/%d available\n", skillsInfo["available"], skillsInfo["total"])
 	logger.InfoCF("agent", "Agent initialized",
 		map[string]any{
 			"tools_count":      toolsInfo["count"],
 			"skills_total":     skillsInfo["total"],
 			"skills_available": skillsInfo["available"],
 		})
 	runningServices, err := setupAndStartServices(cfg, agentLoop, msgBus)
 	if err != nil {
 		return err
 	}
 	fmt.Printf("✓ Gateway started on %s:%d\n", cfg.Gateway.Host, cfg.Gateway.Port)
 	fmt.Println("Press Ctrl+C to stop")
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	go agentLoop.Run(ctx)
 	var configReloadChan <-chan *config.Config
 	stopWatch := func() {}
 	if cfg.Gateway.HotReload {
 		configReloadChan, stopWatch = setupConfigWatcherPolling(configPath, debug)
 		logger.Info("Config hot reload enabled")
 	}
 	defer stopWatch()
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
 	for {
 		select {
 		case <-sigChan:
 			logger.Info("Shutting down...")
 			shutdownGateway(runningServices, agentLoop, provider, true)
 			return nil
 		case newCfg := <-configReloadChan:
 			err := handleConfigReload(ctx, agentLoop, newCfg, &provider, runningServices, msgBus, allowEmptyStartup)
 			if err != nil {
 				logger.Errorf("Config reload failed: %v", err)
 			}
 		}
 	}
 }
 func createStartupProvider(
 	cfg *config.Config,
 	allowEmptyStartup bool,
 ) (providers.LLMProvider, string, error) {
 	modelName := cfg.Agents.Defaults.GetModelName()
 	if modelName == "" && allowEmptyStartup {
 		reason := "no default model configured; gateway started in limited mode"
 		fmt.Printf("⚠ Warning: %s\n", reason)
 		logger.WarnCF("gateway", "Gateway started without default model", map[string]any{
 			"limited_mode": true,
 		})
 		return &startupBlockedProvider{reason: reason}, "", nil
 	}
 	return providers.CreateProvider(cfg)
 }
 func setupAndStartServices(
 	cfg *config.Config,
 	agentLoop *agent.AgentLoop,
 	msgBus *bus.MessageBus,
 ) (*services, error) {
 	runningServices := &services{}
 	execTimeout := time.Duration(cfg.Tools.Cron.ExecTimeoutMinutes) * time.Minute
 	var err error
 	runningServices.CronService, err = setupCronTool(
 		agentLoop,
 		msgBus,
 		cfg.WorkspacePath(),
 		cfg.Agents.Defaults.RestrictToWorkspace,
 		execTimeout,
 		cfg,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("error setting up cron service: %w", err)
 	}
 	if err = runningServices.CronService.Start(); err != nil {
 		return nil, fmt.Errorf("error starting cron service: %w", err)
 	}
 	fmt.Println("✓ Cron service started")
 	runningServices.HeartbeatService = heartbeat.NewHeartbeatService(
 		cfg.WorkspacePath(),
 		cfg.Heartbeat.Interval,
 		cfg.Heartbeat.Enabled,
 	)
 	runningServices.HeartbeatService.SetBus(msgBus)
 	runningServices.HeartbeatService.SetHandler(createHeartbeatHandler(agentLoop))
 	if err = runningServices.HeartbeatService.Start(); err != nil {
 		return nil, fmt.Errorf("error starting heartbeat service: %w", err)
 	}
 	fmt.Println("✓ Heartbeat service started")
 	runningServices.MediaStore = media.NewFileMediaStoreWithCleanup(media.MediaCleanerConfig{
 		Enabled:  cfg.Tools.MediaCleanup.Enabled,
 		MaxAge:   time.Duration(cfg.Tools.MediaCleanup.MaxAge) * time.Minute,
 		Interval: time.Duration(cfg.Tools.MediaCleanup.Interval) * time.Minute,
 	})
 	if fms, ok := runningServices.MediaStore.(*media.FileMediaStore); ok {
 		fms.Start()
 	}
 	runningServices.ChannelManager, err = channels.NewManager(cfg, msgBus, runningServices.MediaStore)
 	if err != nil {
 		if fms, ok := runningServices.MediaStore.(*media.FileMediaStore); ok {
 			fms.Stop()
 		}
 		return nil, fmt.Errorf("error creating channel manager: %w", err)
 	}
 	agentLoop.SetChannelManager(runningServices.ChannelManager)
 	agentLoop.SetMediaStore(runningServices.MediaStore)
 	if transcriber := voice.DetectTranscriber(cfg); transcriber != nil {
 		agentLoop.SetTranscriber(transcriber)
 		logger.InfoCF("voice", "Transcription enabled (agent-level)", map[string]any{"provider": transcriber.Name()})
 	}
 	enabledChannels := runningServices.ChannelManager.GetEnabledChannels()
 	if len(enabledChannels) > 0 {
 		fmt.Printf("✓ Channels enabled: %s\n", enabledChannels)
 	} else {
 		fmt.Println("⚠ Warning: No channels enabled")
 	}
 	addr := fmt.Sprintf("%s:%d", cfg.Gateway.Host, cfg.Gateway.Port)
 	runningServices.HealthServer = health.NewServer(cfg.Gateway.Host, cfg.Gateway.Port)
 	runningServices.ChannelManager.SetupHTTPServer(addr, runningServices.HealthServer)
 	if err = runningServices.ChannelManager.StartAll(context.Background()); err != nil {
 		return nil, fmt.Errorf("error starting channels: %w", err)
 	}
 	fmt.Printf("✓ Health endpoints available at http://%s:%d/health and /ready\n", cfg.Gateway.Host, cfg.Gateway.Port)
 	stateManager := state.NewManager(cfg.WorkspacePath())
 	runningServices.DeviceService = devices.NewService(devices.Config{
 		Enabled:    cfg.Devices.Enabled,
 		MonitorUSB: cfg.Devices.MonitorUSB,
 	}, stateManager)
 	runningServices.DeviceService.SetBus(msgBus)
 	if err = runningServices.DeviceService.Start(context.Background()); err != nil {
 		logger.ErrorCF("device", "Error starting device service", map[string]any{"error": err.Error()})
 	} else if cfg.Devices.Enabled {
 		fmt.Println("✓ Device event service started")
 	}
 	return runningServices, nil
 }
 func stopAndCleanupServices(runningServices *services, shutdownTimeout time.Duration) {
 	shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), shutdownTimeout)
 	defer shutdownCancel()
 	if runningServices.ChannelManager != nil {
 		runningServices.ChannelManager.StopAll(shutdownCtx)
 	}
 	if runningServices.DeviceService != nil {
 		runningServices.DeviceService.Stop()
 	}
 	if runningServices.HeartbeatService != nil {
 		runningServices.HeartbeatService.Stop()
 	}
 	if runningServices.CronService != nil {
 		runningServices.CronService.Stop()
 	}
 	if runningServices.MediaStore != nil {
 		if fms, ok := runningServices.MediaStore.(*media.FileMediaStore); ok {
 			fms.Stop()
 		}
 	}
 }
 func shutdownGateway(
 	runningServices *services,
 	agentLoop *agent.AgentLoop,
 	provider providers.LLMProvider,
 	fullShutdown bool,
 ) {
 	if cp, ok := provider.(providers.StatefulProvider); ok && fullShutdown {
 		cp.Close()
 	}
 	stopAndCleanupServices(runningServices, gracefulShutdownTimeout)
 	agentLoop.Stop()
 	agentLoop.Close()
 	logger.Info("✓ Gateway stopped")
 }
 func handleConfigReload(
 	ctx context.Context,
 	al *agent.AgentLoop,
 	newCfg *config.Config,
 	providerRef *providers.LLMProvider,
 	runningServices *services,
 	msgBus *bus.MessageBus,
 	allowEmptyStartup bool,
 ) error {
 	logger.Info("🔄 Config file changed, reloading...")
 	newModel := newCfg.Agents.Defaults.ModelName
 	if newModel == "" {
 		newModel = newCfg.Agents.Defaults.Model
 	}
 	logger.Infof(" New model is '%s', recreating provider...", newModel)
 	logger.Info("  Stopping all services...")
 	stopAndCleanupServices(runningServices, serviceShutdownTimeout)
 	newProvider, newModelID, err := createStartupProvider(newCfg, allowEmptyStartup)
 	if err != nil {
 		logger.Errorf("  ⚠ Error creating new provider: %v", err)
 		logger.Warn("  Attempting to restart services with old provider and config...")
 		if restartErr := restartServices(al, runningServices, msgBus); restartErr != nil {
 			logger.Errorf("  ⚠ Failed to restart services: %v", restartErr)
 		}
 		return fmt.Errorf("error creating new provider: %w", err)
 	}
 	if newModelID != "" {
 		newCfg.Agents.Defaults.ModelName = newModelID
 	}
 	reloadCtx, reloadCancel := context.WithTimeout(context.Background(), providerReloadTimeout)
 	defer reloadCancel()
 	if err := al.ReloadProviderAndConfig(reloadCtx, newProvider, newCfg); err != nil {
 		logger.Errorf("  ⚠ Error reloading agent loop: %v", err)
 		if cp, ok := newProvider.(providers.StatefulProvider); ok {
 			cp.Close()
 		}
 		logger.Warn("  Attempting to restart services with old provider and config...")
 		if restartErr := restartServices(al, runningServices, msgBus); restartErr != nil {
 			logger.Errorf("  ⚠ Failed to restart services: %v", restartErr)
 		}
 		return fmt.Errorf("error reloading agent loop: %w", err)
 	}
 	*providerRef = newProvider
 	logger.Info("  Restarting all services with new configuration...")
 	if err := restartServices(al, runningServices, msgBus); err != nil {
 		logger.Errorf("  ⚠ Error restarting services: %v", err)
 		return fmt.Errorf("error restarting services: %w", err)
 	}
 	logger.Info("  ✓ Provider, configuration, and services reloaded successfully (thread-safe)")
 	return nil
 }
 func restartServices(
 	al *agent.AgentLoop,
 	runningServices *services,
 	msgBus *bus.MessageBus,
 ) error {
 	cfg := al.GetConfig()
 	execTimeout := time.Duration(cfg.Tools.Cron.ExecTimeoutMinutes) * time.Minute
 	var err error
 	runningServices.CronService, err = setupCronTool(
 		al,
 		msgBus,
 		cfg.WorkspacePath(),
 		cfg.Agents.Defaults.RestrictToWorkspace,
 		execTimeout,
 		cfg,
 	)
 	if err != nil {
 		return fmt.Errorf("error restarting cron service: %w", err)
 	}
 	if err = runningServices.CronService.Start(); err != nil {
 		return fmt.Errorf("error restarting cron service: %w", err)
 	}
 	fmt.Println("  ✓ Cron service restarted")
 	runningServices.HeartbeatService = heartbeat.NewHeartbeatService(
 		cfg.WorkspacePath(),
 		cfg.Heartbeat.Interval,
 		cfg.Heartbeat.Enabled,
 	)
 	runningServices.HeartbeatService.SetBus(msgBus)
 	runningServices.HeartbeatService.SetHandler(createHeartbeatHandler(al))
 	if err = runningServices.HeartbeatService.Start(); err != nil {
 		return fmt.Errorf("error restarting heartbeat service: %w", err)
 	}
 	fmt.Println("  ✓ Heartbeat service restarted")
 	runningServices.MediaStore = media.NewFileMediaStoreWithCleanup(media.MediaCleanerConfig{
 		Enabled:  cfg.Tools.MediaCleanup.Enabled,
 		MaxAge:   time.Duration(cfg.Tools.MediaCleanup.MaxAge) * time.Minute,
 		Interval: time.Duration(cfg.Tools.MediaCleanup.Interval) * time.Minute,
 	})
 	if fms, ok := runningServices.MediaStore.(*media.FileMediaStore); ok {
 		fms.Start()
 	}
 	al.SetMediaStore(runningServices.MediaStore)
 	runningServices.ChannelManager, err = channels.NewManager(cfg, msgBus, runningServices.MediaStore)
 	if err != nil {
 		return fmt.Errorf("error recreating channel manager: %w", err)
 	}
 	al.SetChannelManager(runningServices.ChannelManager)
 	enabledChannels := runningServices.ChannelManager.GetEnabledChannels()
 	if len(enabledChannels) > 0 {
 		fmt.Printf("  ✓ Channels enabled: %s\n", enabledChannels)
 	} else {
 		fmt.Println("  ⚠ Warning: No channels enabled")
 	}
 	addr := fmt.Sprintf("%s:%d", cfg.Gateway.Host, cfg.Gateway.Port)
 	runningServices.HealthServer = health.NewServer(cfg.Gateway.Host, cfg.Gateway.Port)
 	runningServices.ChannelManager.SetupHTTPServer(addr, runningServices.HealthServer)
 	if err = runningServices.ChannelManager.StartAll(context.Background()); err != nil {
 		return fmt.Errorf("error restarting channels: %w", err)
 	}
 	fmt.Printf(
 		"  ✓ Channels restarted, health endpoints at http://%s:%d/health and ready\n",
 		cfg.Gateway.Host,
 		cfg.Gateway.Port,
 	)
 	stateManager := state.NewManager(cfg.WorkspacePath())
 	runningServices.DeviceService = devices.NewService(devices.Config{
 		Enabled:    cfg.Devices.Enabled,
 		MonitorUSB: cfg.Devices.MonitorUSB,
 	}, stateManager)
 	runningServices.DeviceService.SetBus(msgBus)
 	if err := runningServices.DeviceService.Start(context.Background()); err != nil {
 		logger.WarnCF("device", "Failed to restart device service", map[string]any{"error": err.Error()})
 	} else if cfg.Devices.Enabled {
 		fmt.Println("  ✓ Device event service restarted")
 	}
 	transcriber := voice.DetectTranscriber(cfg)
 	al.SetTranscriber(transcriber)
 	if transcriber != nil {
 		logger.InfoCF("voice", "Transcription re-enabled (agent-level)", map[string]any{"provider": transcriber.Name()})
 	} else {
 		logger.InfoCF("voice", "Transcription disabled", nil)
 	}
 	return nil
 }
 func setupConfigWatcherPolling(configPath string, debug bool) (chan *config.Config, func()) {
 	configChan := make(chan *config.Config, 1)
 	stop := make(chan struct{})
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
 		lastModTime := getFileModTime(configPath)
 		lastSize := getFileSize(configPath)
 		ticker := time.NewTicker(2 * time.Second)
 		defer ticker.Stop()
 		for {
 			select {
 			case <-ticker.C:
 				currentModTime := getFileModTime(configPath)
 				currentSize := getFileSize(configPath)
 				if currentModTime.After(lastModTime) || currentSize != lastSize {
 					if debug {
 						logger.Debugf("🔍 Config file change detected")
 					}
 					time.Sleep(500 * time.Millisecond)
 					lastModTime = currentModTime
 					lastSize = currentSize
 					newCfg, err := config.LoadConfig(configPath)
 					if err != nil {
 						logger.Errorf("⚠ Error loading new config: %v", err)
 						logger.Warn("  Using previous valid config")
 						continue
 					}
 					if err := newCfg.ValidateModelList(); err != nil {
 						logger.Errorf("  ⚠ New config validation failed: %v", err)
 						logger.Warn("  Using previous valid config")
 						continue
 					}
 					logger.Info("✓ Config file validated and loaded")
 					select {
 					case configChan <- newCfg:
 					default:
 						logger.Warn("⚠ Previous config reload still in progress, skipping")
 					}
 				}
 			case <-stop:
 				return
 			}
 		}
 	}()
 	stopFunc := func() {
 		close(stop)
 		wg.Wait()
 	}
 	return configChan, stopFunc
 }
 func getFileModTime(path string) time.Time {
 	info, err := os.Stat(path)
 	if err != nil {
 		return time.Time{}
 	}
 	return info.ModTime()
 }
 func getFileSize(path string) int64 {
 	info, err := os.Stat(path)
 	if err != nil {
 		return 0
 	}
 	return info.Size()
 }
 func setupCronTool(
 	agentLoop *agent.AgentLoop,
 	msgBus *bus.MessageBus,
 	workspace string,
 	restrict bool,
 	execTimeout time.Duration,
 	cfg *config.Config,
 ) (*cron.CronService, error) {
 	cronStorePath := filepath.Join(workspace, "cron", "jobs.json")
 	cronService := cron.NewCronService(cronStorePath, nil)
 	var cronTool *tools.CronTool
 	if cfg.Tools.IsToolEnabled("cron") {
 		var err error
 		cronTool, err = tools.NewCronTool(cronService, agentLoop, msgBus, workspace, restrict, execTimeout, cfg)
 		if err != nil {
 			return nil, fmt.Errorf("critical error during CronTool initialization: %w", err)
 		}
 		agentLoop.RegisterTool(cronTool)
 	}
 	if cronTool != nil {
 		cronService.SetOnJob(func(job *cron.CronJob) (string, error) {
 			result := cronTool.ExecuteJob(context.Background(), job)
 			return result, nil
 		})
 	}
 	return cronService, nil
 }
 func createHeartbeatHandler(agentLoop *agent.AgentLoop) func(prompt, channel, chatID string) *tools.ToolResult {
 	return func(prompt, channel, chatID string) *tools.ToolResult {
 		if channel == "" || chatID == "" {
 			channel, chatID = "cli", "direct"
 		}
 		response, err := agentLoop.ProcessHeartbeat(context.Background(), prompt, channel, chatID)
 		if err != nil {
 			return tools.ErrorResult(fmt.Sprintf("Heartbeat error: %v", err))
 		}
 		if response == "HEARTBEAT_OK" {
 			return tools.SilentResult("Heartbeat OK")
 		}
 		return tools.SilentResult(response)
 	}
 }
--- a/pkg/health/server.go
+++ b/pkg/health/server.go
@ -6,6 +6,7 @@ import (
 	"fmt"
 	"maps"
 	"net/http"
 	"os"
 	"sync"
 	"time"
 )
@ -29,6 +30,7 @@ type StatusResponse struct {
 	Status string           `json:"status"`
 	Uptime string           `json:"uptime"`
 	Checks map[string]Check `json:"checks,omitempty"`
 	Pid    int              `json:"pid"`
 }
 func NewServer(host string, port int) *Server {
@ -112,6 +114,7 @@ func (s *Server) healthHandler(w http.ResponseWriter, r *http.Request) {
 	resp := StatusResponse{
 		Status: "ok",
 		Uptime: uptime.String(),
 		Pid:    os.Getpid(),
 	}
 	json.NewEncoder(w).Encode(resp)
--- a/pkg/identity/identity.go
+++ b/pkg/identity/identity.go
@ -59,6 +59,9 @@ func MatchAllowed(sender bus.SenderInfo, allowed string) bool {
 		}
 	}
 	// Keep track of explicit username format
 	isAtUsername := strings.HasPrefix(allowed, "@")
 	// Strip leading "@" for username matching
 	trimmed := strings.TrimPrefix(allowed, "@")
@ -75,12 +78,10 @@ func MatchAllowed(sender bus.SenderInfo, allowed string) bool {
 		return true
 	}
-	// Match against Username
+	// Match against Username only when explicitly requested via "@username"
-	if sender.Username != "" {
+	if isAtUsername && sender.Username != "" && sender.Username == trimmed {
 		if sender.Username == trimmed || sender.Username == allowedUser {
 		return true
 	}
 	}
 	// Match compound sender format against allowed parts
 	if allowedUser != "" && sender.PlatformID != "" && sender.PlatformID == allowedID {
--- a/pkg/identity/identity_test.go
+++ b/pkg/identity/identity_test.go
@ -104,6 +104,16 @@ func TestMatchAllowed(t *testing.T) {
 			allowed: "@alice",
 			want:    true,
 		},
 		{
 			name: "plain entry does not match username",
 			sender: bus.SenderInfo{
 				Platform:   "discord",
 				PlatformID: "999999",
 				Username:   "123456",
 			},
 			allowed: "123456",
 			want:    false,
 		},
 		{
 			name:    "@username does not match",
 			sender:  telegramSender,
@ -123,6 +133,16 @@ func TestMatchAllowed(t *testing.T) {
 			allowed: "999|alice",
 			want:    true,
 		},
 		{
 			name: "compound matches by ID when username differs",
 			sender: bus.SenderInfo{
 				Platform:   "discord",
 				PlatformID: "123456",
 				Username:   "not123456",
 			},
 			allowed: "123456|alice",
 			want:    true,
 		},
 		{
 			name:    "compound does not match",
 			sender:  telegramSender,
--- a/pkg/logger/logger.go
+++ b/pkg/logger/logger.go
@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@ -45,6 +46,9 @@ func init() {
 		consoleWriter := zerolog.ConsoleWriter{
 			Out:        os.Stdout,
 			TimeFormat: "15:04:05", // TODO: make it configurable???
 			// Custom formatter to handle multiline strings and JSON objects
 			FormatFieldValue: formatFieldValue,
 		}
 		logger = zerolog.New(consoleWriter).With().Timestamp().Logger()
@ -52,6 +56,37 @@ func init() {
 	})
 }
 func formatFieldValue(i any) string {
 	var s string
 	switch val := i.(type) {
 	case string:
 		s = val
 	case []byte:
 		s = string(val)
 	default:
 		return fmt.Sprintf("%v", i)
 	}
 	if unquoted, err := strconv.Unquote(s); err == nil {
 		s = unquoted
 	}
 	if strings.Contains(s, "\n") {
 		return fmt.Sprintf("\n%s", s)
 	}
 	if strings.Contains(s, " ") {
 		if (strings.HasPrefix(s, "{") && strings.HasSuffix(s, "}")) ||
 			(strings.HasPrefix(s, "[") && strings.HasSuffix(s, "]")) {
 			return s
 		}
 		return fmt.Sprintf("%q", s)
 	}
 	return s
 }
 func SetLevel(level LogLevel) {
 	mu.Lock()
 	defer mu.Unlock()
@ -113,6 +148,7 @@ func getCallerInfo() (string, int, string) {
 		// bypass common loggers
 		if strings.HasSuffix(file, "/logger.go") ||
 			strings.HasSuffix(file, "/logger_3rd_party.go") ||
 			strings.HasSuffix(file, "/log.go") {
 			continue
 		}
@ -162,10 +198,7 @@ func logMessage(level LogLevel, component string, message string, fields map[str
 		event.Str("caller", fmt.Sprintf("<none> %s:%d (%s)", callerFile, callerLine, callerFunc))
 	}
-	for k, v := range fields {
+	appendFields(event, fields)
 		event.Interface(k, v)
 	}
 	event.Msg(message)
 	// Also log to file if enabled
@ -175,9 +208,8 @@ func logMessage(level LogLevel, component string, message string, fields map[str
 		if component != "" {
 			fileEvent.Str("component", component)
 		}
-		for k, v := range fields {
+
-			fileEvent.Interface(k, v)
+		appendFields(fileEvent, fields)
 		}
 		fileEvent.Msg(message)
 	}
@ -186,6 +218,26 @@ func logMessage(level LogLevel, component string, message string, fields map[str
 	}
 }
 func appendFields(event *zerolog.Event, fields map[string]any) {
 	for k, v := range fields {
 		// Type switch to avoid double JSON serialization of strings
 		switch val := v.(type) {
 		case string:
 			event.Str(k, val)
 		case int:
 			event.Int(k, val)
 		case int64:
 			event.Int64(k, val)
 		case float64:
 			event.Float64(k, val)
 		case bool:
 			event.Bool(k, val)
 		default:
 			event.Interface(k, v) // Fallback for struct, slice and maps
 		}
 	}
 }
 func Debug(message string) {
 	logMessage(DEBUG, "", message, nil)
 }
@ -194,6 +246,10 @@ func DebugC(component string, message string) {
 	logMessage(DEBUG, component, message, nil)
 }
 func Debugf(message string, ss ...any) {
 	logMessage(DEBUG, "", fmt.Sprintf(message, ss...), nil)
 }
 func DebugF(message string, fields map[string]any) {
 	logMessage(DEBUG, "", message, fields)
 }
@ -214,6 +270,10 @@ func InfoF(message string, fields map[string]any) {
 	logMessage(INFO, "", message, fields)
 }
 func Infof(message string, ss ...any) {
 	logMessage(INFO, "", fmt.Sprintf(message, ss...), nil)
 }
 func InfoCF(component string, message string, fields map[string]any) {
 	logMessage(INFO, component, message, fields)
 }
@ -242,6 +302,10 @@ func ErrorC(component string, message string) {
 	logMessage(ERROR, component, message, nil)
 }
 func Errorf(message string, ss ...any) {
 	logMessage(ERROR, "", fmt.Sprintf(message, ss...), nil)
 }
 func ErrorF(message string, fields map[string]any) {
 	logMessage(ERROR, "", message, fields)
 }
--- a/pkg/logger/logger_3rd_party.go
+++ b/pkg/logger/logger_3rd_party.go
@ -2,7 +2,20 @@
 package logger
-import "fmt"
+import (
 	"fmt"
 	"regexp"
 )
 // botTokenRe matches the bot ID prefix and the secret part of a Telegram bot token.
 // Groups: 1 = "bot<id>:", 2 = first 4 chars of secret, 3 = middle, 4 = last 4 chars.
 var botTokenRe = regexp.MustCompile(`(bot\d+:)([A-Za-z0-9_-]{4})[A-Za-z0-9_-]{12,}([A-Za-z0-9_-]{4})`)
 // maskSecrets replaces any embedded bot tokens in s with a redacted placeholder
 // that keeps the first and last 4 characters of the secret for identification.
 func maskSecrets(s string) string {
 	return botTokenRe.ReplaceAllString(s, "${1}${2}****${3}")
 }
 // Logger implements common Logger interface
 type Logger struct {
@ -12,52 +25,52 @@ type Logger struct {
 // Debug logs debug messages
 func (b *Logger) Debug(v ...any) {
-	logMessage(DEBUG, b.component, fmt.Sprint(v...), nil)
+	logMessage(DEBUG, b.component, maskSecrets(fmt.Sprint(v...)), nil)
 }
 // Info logs info messages
 func (b *Logger) Info(v ...any) {
-	logMessage(INFO, b.component, fmt.Sprint(v...), nil)
+	logMessage(INFO, b.component, maskSecrets(fmt.Sprint(v...)), nil)
 }
 // Warn logs warning messages
 func (b *Logger) Warn(v ...any) {
-	logMessage(WARN, b.component, fmt.Sprint(v...), nil)
+	logMessage(WARN, b.component, maskSecrets(fmt.Sprint(v...)), nil)
 }
 // Error logs error messages
 func (b *Logger) Error(v ...any) {
-	logMessage(ERROR, b.component, fmt.Sprint(v...), nil)
+	logMessage(ERROR, b.component, maskSecrets(fmt.Sprint(v...)), nil)
 }
 // Debugf logs formatted debug messages
 func (b *Logger) Debugf(format string, v ...any) {
-	logMessage(DEBUG, b.component, fmt.Sprintf(format, v...), nil)
+	logMessage(DEBUG, b.component, maskSecrets(fmt.Sprintf(format, v...)), nil)
 }
 // Infof logs formatted info messages
 func (b *Logger) Infof(format string, v ...any) {
-	logMessage(INFO, b.component, fmt.Sprintf(format, v...), nil)
+	logMessage(INFO, b.component, maskSecrets(fmt.Sprintf(format, v...)), nil)
 }
 // Warnf logs formatted warning messages
 func (b *Logger) Warnf(format string, v ...any) {
-	logMessage(WARN, b.component, fmt.Sprintf(format, v...), nil)
+	logMessage(WARN, b.component, maskSecrets(fmt.Sprintf(format, v...)), nil)
 }
 // Warningf logs formatted warning messages
 func (b *Logger) Warningf(format string, v ...any) {
-	logMessage(WARN, b.component, fmt.Sprintf(format, v...), nil)
+	logMessage(WARN, b.component, maskSecrets(fmt.Sprintf(format, v...)), nil)
 }
 // Errorf logs formatted error messages
 func (b *Logger) Errorf(format string, v ...any) {
-	logMessage(ERROR, b.component, fmt.Sprintf(format, v...), nil)
+	logMessage(ERROR, b.component, maskSecrets(fmt.Sprintf(format, v...)), nil)
 }
 // Fatalf logs formatted fatal messages and exits
 func (b *Logger) Fatalf(format string, v ...any) {
-	logMessage(FATAL, b.component, fmt.Sprintf(format, v...), nil)
+	logMessage(FATAL, b.component, maskSecrets(fmt.Sprintf(format, v...)), nil)
 }
 // Log logs a message at a given level with caller information
@ -75,7 +88,7 @@ func (b *Logger) Log(msgL, caller int, format string, a ...any) {
 			level = lvl
 		}
 	}
-	logMessage(level, b.component, fmt.Sprintf(format, a...), nil)
+	logMessage(level, b.component, maskSecrets(fmt.Sprintf(format, a...)), nil)
 }
 // Sync flushes log buffer (no-op for this implementation)
--- a/pkg/logger/logger_test.go
+++ b/pkg/logger/logger_test.go
@ -123,17 +123,132 @@ func TestLoggerHelperFunctions(t *testing.T) {
 	SetLevel(INFO)
 	Debug("This should not log")
 	Debugf("this should not log")
 	Info("This should log")
 	Warn("This should log")
 	Error("This should log")
 	InfoC("test", "Component message")
 	InfoF("Fields message", map[string]any{"key": "value"})
 	Infof("test from %v", "Infof")
 	WarnC("test", "Warning with component")
 	ErrorF("Error with fields", map[string]any{"error": "test"})
 	Errorf("test from %v", "Errorf")
 	SetLevel(DEBUG)
 	DebugC("test", "Debug with component")
 	Debugf("test from %v", "Debugf")
 	WarnF("Warning with fields", map[string]any{"key": "value"})
 }
 func TestFormatFieldValue(t *testing.T) {
 	tests := []struct {
 		name     string
 		input    any
 		expected string
 	}{
 		// Basic types test (default case of the switch)
 		{
 			name:     "Integer Type",
 			input:    42,
 			expected: "42",
 		},
 		{
 			name:     "Boolean Type",
 			input:    true,
 			expected: "true",
 		},
 		{
 			name:     "Unsupported Struct Type",
 			input:    struct{ A int }{A: 1},
 			expected: "{1}",
 		},
 		// Simple strings and byte slices test
 		{
 			name:     "Simple string without spaces",
 			input:    "simple_value",
 			expected: "simple_value",
 		},
 		{
 			name:     "Simple byte slice",
 			input:    []byte("byte_value"),
 			expected: "byte_value",
 		},
 		// Unquoting test (strconv.Unquote)
 		{
 			name:     "Quoted string",
 			input:    `"quoted_value"`,
 			expected: "quoted_value",
 		},
 		// Strings with newline (\n) test
 		{
 			name:     "String with newline",
 			input:    "line1\nline2",
 			expected: "\nline1\nline2",
 		},
 		{
 			name:     "Quoted string with newline (Unquote -> newline)",
 			input:    `"line1\nline2"`, // Escaped \n that Unquote will resolve
 			expected: "\nline1\nline2",
 		},
 		// Strings with spaces test (which should be quoted)
 		{
 			name:     "String with spaces",
 			input:    "hello world",
 			expected: `"hello world"`,
 		},
 		{
 			name:     "Quoted string with spaces (Unquote -> has spaces -> Re-quote)",
 			input:    `"hello world"`,
 			expected: `"hello world"`,
 		},
 		// JSON formats test (strings with spaces that start/end with brackets)
 		{
 			name:     "Valid JSON object",
 			input:    `{"key": "value"}`,
 			expected: `{"key": "value"}`,
 		},
 		{
 			name:     "Valid JSON array",
 			input:    `[1, 2, "three"]`,
 			expected: `[1, 2, "three"]`,
 		},
 		{
 			name:     "Fake JSON (starts with { but doesn't end with })",
 			input:    `{"key": "value"`, // Missing closing bracket, has spaces
 			expected: `"{\"key\": \"value\""`,
 		},
 		{
 			name:     "Empty JSON (object)",
 			input:    `{ }`,
 			expected: `{ }`,
 		},
 		// 7. Edge Cases
 		{
 			name:     "Empty string",
 			input:    "",
 			expected: "",
 		},
 		{
 			name:     "Whitespace only string",
 			input:    "   ",
 			expected: `"   "`,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			actual := formatFieldValue(tt.input)
 			if actual != tt.expected {
 				t.Errorf("formatFieldValue() = %q, expected %q", actual, tt.expected)
 			}
 		})
 	}
 }
--- a/pkg/media/tempdir.go
+++ b/pkg/media/tempdir.go
@ -0,0 +1,13 @@
 package media
 import (
 	"os"
 	"path/filepath"
 )
 const TempDirName = "picoclaw_media"
 // TempDir returns the shared temporary directory used for downloaded media.
 func TempDir() string {
 	return filepath.Join(os.TempDir(), TempDirName)
 }
--- a/pkg/migrate/sources/openclaw/common.go
+++ b/pkg/migrate/sources/openclaw/common.go
@ -4,7 +4,6 @@ var migrateableFiles = []string{
 	"AGENTS.md",
 	"SOUL.md",
 	"USER.md",
 	"TOOLS.md",
 	"HEARTBEAT.md",
 }
--- a/pkg/providers/anthropic_messages/provider.go
+++ b/pkg/providers/anthropic_messages/provider.go
@ -0,0 +1,421 @@
 // PicoClaw - Ultra-lightweight personal AI agent
 // License: MIT
 //
 // Copyright (c) 2026 PicoClaw contributors
 package anthropicmessages
 import (
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
 	"github.com/sipeed/picoclaw/pkg/providers/protocoltypes"
 )
 type (
 	ToolCall               = protocoltypes.ToolCall
 	FunctionCall           = protocoltypes.FunctionCall
 	LLMResponse            = protocoltypes.LLMResponse
 	UsageInfo              = protocoltypes.UsageInfo
 	Message                = protocoltypes.Message
 	ToolDefinition         = protocoltypes.ToolDefinition
 	ToolFunctionDefinition = protocoltypes.ToolFunctionDefinition
 )
 const (
 	defaultAPIVersion     = "2023-06-01"
 	defaultBaseURL        = "https://api.anthropic.com/v1"
 	defaultRequestTimeout = 120 * time.Second
 )
 // Provider implements Anthropic Messages API via HTTP (without SDK).
 // It supports custom endpoints that use Anthropic's native message format.
 type Provider struct {
 	apiKey     string
 	apiBase    string
 	httpClient *http.Client
 }
 // NewProvider creates a new Anthropic Messages API provider.
 func NewProvider(apiKey, apiBase string) *Provider {
 	return NewProviderWithTimeout(apiKey, apiBase, 0)
 }
 // NewProviderWithTimeout creates a provider with custom request timeout.
 func NewProviderWithTimeout(apiKey, apiBase string, timeoutSeconds int) *Provider {
 	baseURL := normalizeBaseURL(apiBase)
 	timeout := defaultRequestTimeout
 	if timeoutSeconds > 0 {
 		timeout = time.Duration(timeoutSeconds) * time.Second
 	}
 	return &Provider{
 		apiKey:  apiKey,
 		apiBase: baseURL,
 		httpClient: &http.Client{
 			Timeout: timeout,
 		},
 	}
 }
 // Chat sends messages to the Anthropic Messages API and returns the response.
 func (p *Provider) Chat(
 	ctx context.Context,
 	messages []Message,
 	tools []ToolDefinition,
 	model string,
 	options map[string]any,
 ) (*LLMResponse, error) {
 	if p.apiKey == "" {
 		return nil, fmt.Errorf("API key not configured")
 	}
 	// Build request body
 	requestBody, err := buildRequestBody(messages, tools, model, options)
 	if err != nil {
 		return nil, fmt.Errorf("building request body: %w", err)
 	}
 	// Serialize to JSON
 	jsonBody, err := json.Marshal(requestBody)
 	if err != nil {
 		return nil, fmt.Errorf("serializing request body: %w", err)
 	}
 	// Build request URL
 	endpointURL, err := url.JoinPath(p.apiBase, "messages")
 	if err != nil {
 		return nil, fmt.Errorf("building endpoint URL: %w", err)
 	}
 	// Create HTTP request
 	req, err := http.NewRequestWithContext(ctx, "POST", endpointURL, bytes.NewReader(jsonBody))
 	if err != nil {
 		return nil, fmt.Errorf("creating HTTP request: %w", err)
 	}
 	// Set headers
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-API-Key", p.apiKey) //nolint:canonicalheader // Anthropic API requires exact header name
 	req.Header.Set("Anthropic-Version", defaultAPIVersion)
 	// Execute request
 	resp, err := p.httpClient.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("executing HTTP request: %w", err)
 	}
 	defer resp.Body.Close()
 	// Read response body
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("reading response body: %w", err)
 	}
 	// Check for HTTP errors with detailed messages
 	switch resp.StatusCode {
 	case http.StatusUnauthorized:
 		return nil, fmt.Errorf("authentication failed (401): check your API key")
 	case http.StatusTooManyRequests:
 		return nil, fmt.Errorf("rate limited (429): %s", string(body))
 	case http.StatusBadRequest:
 		return nil, fmt.Errorf("bad request (400): %s", string(body))
 	case http.StatusNotFound:
 		return nil, fmt.Errorf("endpoint not found (404): %s", string(body))
 	case http.StatusInternalServerError:
 		return nil, fmt.Errorf("internal server error (500): %s", string(body))
 	case http.StatusServiceUnavailable:
 		return nil, fmt.Errorf("service unavailable (503): %s", string(body))
 	default:
 		if resp.StatusCode != http.StatusOK {
 			return nil, fmt.Errorf("API request failed with status %d: %s", resp.StatusCode, string(body))
 		}
 	}
 	// Parse response
 	return parseResponseBody(body)
 }
 // GetDefaultModel returns the default model for this provider.
 func (p *Provider) GetDefaultModel() string {
 	return "claude-sonnet-4.6"
 }
 // buildRequestBody converts internal message format to Anthropic Messages API format.
 func buildRequestBody(
 	messages []Message,
 	tools []ToolDefinition,
 	model string,
 	options map[string]any,
 ) (map[string]any, error) {
 	// max_tokens is required and guaranteed by agent loop
 	maxTokens, ok := asInt(options["max_tokens"])
 	if !ok {
 		return nil, fmt.Errorf("max_tokens is required in options")
 	}
 	result := map[string]any{
 		"model":      model,
 		"max_tokens": int64(maxTokens),
 		"messages":   []any{},
 	}
 	// Set temperature from options
 	if temp, ok := asFloat(options["temperature"]); ok {
 		result["temperature"] = temp
 	}
 	// Process messages
 	var systemPrompt string
 	var apiMessages []any
 	for _, msg := range messages {
 		switch msg.Role {
 		case "system":
 			// Accumulate system messages
 			if systemPrompt != "" {
 				systemPrompt += "\n\n" + msg.Content
 			} else {
 				systemPrompt = msg.Content
 			}
 		case "user":
 			if msg.ToolCallID != "" {
 				// Tool result message
 				content := []map[string]any{
 					{
 						"type":        "tool_result",
 						"tool_use_id": msg.ToolCallID,
 						"content":     msg.Content,
 					},
 				}
 				apiMessages = append(apiMessages, map[string]any{
 					"role":    "user",
 					"content": content,
 				})
 			} else {
 				// Regular user message
 				apiMessages = append(apiMessages, map[string]any{
 					"role":    "user",
 					"content": msg.Content,
 				})
 			}
 		case "assistant":
 			content := []any{}
 			// Add text content if present
 			if msg.Content != "" {
 				content = append(content, map[string]any{
 					"type": "text",
 					"text": msg.Content,
 				})
 			}
 			// Add tool_use blocks
 			for _, tc := range msg.ToolCalls {
 				// Handle nil Arguments (GLM-4 may return null input)
 				input := tc.Arguments
 				if input == nil {
 					input = map[string]any{}
 				}
 				toolUse := map[string]any{
 					"type":  "tool_use",
 					"id":    tc.ID,
 					"name":  tc.Name,
 					"input": input,
 				}
 				content = append(content, toolUse)
 			}
 			apiMessages = append(apiMessages, map[string]any{
 				"role":    "assistant",
 				"content": content,
 			})
 		case "tool":
 			// Tool result (alternative format)
 			content := []map[string]any{
 				{
 					"type":        "tool_result",
 					"tool_use_id": msg.ToolCallID,
 					"content":     msg.Content,
 				},
 			}
 			apiMessages = append(apiMessages, map[string]any{
 				"role":    "user",
 				"content": content,
 			})
 		}
 	}
 	result["messages"] = apiMessages
 	// Set system prompt if present
 	if systemPrompt != "" {
 		result["system"] = systemPrompt
 	}
 	// Add tools if present
 	if len(tools) > 0 {
 		result["tools"] = buildTools(tools)
 	}
 	return result, nil
 }
 // buildTools converts tool definitions to Anthropic format.
 func buildTools(tools []ToolDefinition) []any {
 	result := make([]any, len(tools))
 	for i, tool := range tools {
 		toolDef := map[string]any{
 			"name":         tool.Function.Name,
 			"description":  tool.Function.Description,
 			"input_schema": tool.Function.Parameters,
 		}
 		result[i] = toolDef
 	}
 	return result
 }
 // parseResponseBody parses Anthropic Messages API response.
 func parseResponseBody(body []byte) (*LLMResponse, error) {
 	var resp anthropicMessageResponse
 	if err := json.Unmarshal(body, &resp); err != nil {
 		return nil, fmt.Errorf("parsing JSON response: %w", err)
 	}
 	// Extract content and tool calls
 	var content strings.Builder
 	toolCalls := make([]ToolCall, 0) // Initialize as empty slice (not nil) for consistent JSON serialization
 	for _, block := range resp.Content {
 		switch block.Type {
 		case "text":
 			content.WriteString(block.Text)
 		case "tool_use":
 			argsJSON, _ := json.Marshal(block.Input)
 			toolCalls = append(toolCalls, ToolCall{
 				ID:        block.ID,
 				Name:      block.Name,
 				Arguments: block.Input,
 				Function: &FunctionCall{
 					Name:      block.Name,
 					Arguments: string(argsJSON),
 				},
 			})
 		}
 	}
 	// Map stop_reason
 	finishReason := "stop"
 	switch resp.StopReason {
 	case "tool_use":
 		finishReason = "tool_calls"
 	case "max_tokens":
 		finishReason = "length"
 	case "end_turn":
 		finishReason = "stop"
 	case "stop_sequence":
 		finishReason = "stop"
 	}
 	return &LLMResponse{
 		Content:      content.String(),
 		ToolCalls:    toolCalls,
 		FinishReason: finishReason,
 		Usage: &UsageInfo{
 			PromptTokens:     int(resp.Usage.InputTokens),
 			CompletionTokens: int(resp.Usage.OutputTokens),
 			TotalTokens:      int(resp.Usage.InputTokens + resp.Usage.OutputTokens),
 		},
 	}, nil
 }
 // normalizeBaseURL ensures the base URL is properly formatted.
 // It removes /v1 suffix if present (to avoid duplication) and always appends /v1.
 // This handles edge cases like "https://api.example.com/v1/proxy" correctly.
 func normalizeBaseURL(apiBase string) string {
 	base := strings.TrimSpace(apiBase)
 	if base == "" {
 		return defaultBaseURL
 	}
 	// Remove trailing slashes
 	base = strings.TrimRight(base, "/")
 	// Remove /v1 suffix if present (will be re-added)
 	// This prevents duplication for URLs like "https://api.example.com/v1/proxy"
 	if before, ok := strings.CutSuffix(base, "/v1"); ok {
 		base = before
 	}
 	// Ensure we don't have an empty string after cutting
 	if base == "" {
 		return defaultBaseURL
 	}
 	// Add /v1 suffix (required by Anthropic Messages API)
 	return base + "/v1"
 }
 // Helper functions for type conversion
 func asInt(v any) (int, bool) {
 	switch val := v.(type) {
 	case int:
 		return val, true
 	case float64:
 		return int(val), true
 	case int64:
 		return int(val), true
 	default:
 		return 0, false
 	}
 }
 func asFloat(v any) (float64, bool) {
 	switch val := v.(type) {
 	case float64:
 		return val, true
 	case int:
 		return float64(val), true
 	case int64:
 		return float64(val), true
 	default:
 		return 0, false
 	}
 }
 // Anthropic API response structures
 type anthropicMessageResponse struct {
 	ID         string         `json:"id"`
 	Type       string         `json:"type"`
 	Role       string         `json:"role"`
 	Content    []contentBlock `json:"content"`
 	StopReason string         `json:"stop_reason"`
 	Model      string         `json:"model"`
 	Usage      usageInfo      `json:"usage"`
 }
 type contentBlock struct {
 	Type  string         `json:"type"`
 	Text  string         `json:"text,omitempty"`
 	ID    string         `json:"id,omitempty"`
 	Name  string         `json:"name,omitempty"`
 	Input map[string]any `json:"input,omitempty"`
 }
 type usageInfo struct {
 	InputTokens  int64 `json:"input_tokens"`
 	OutputTokens int64 `json:"output_tokens"`
 }
--- a/pkg/providers/anthropic_messages/provider_test.go
+++ b/pkg/providers/anthropic_messages/provider_test.go
@ -0,0 +1,622 @@
 // PicoClaw - Ultra-lightweight personal AI agent
 // License: MIT
 //
 // Copyright (c) 2026 PicoClaw contributors
 package anthropicmessages
 import (
 	"context"
 	"encoding/json"
 	"reflect"
 	"strings"
 	"testing"
 )
 func TestBuildRequestBody(t *testing.T) {
 	tests := []struct {
 		name     string
 		messages []Message
 		tools    []ToolDefinition
 		model    string
 		options  map[string]any
 		want     map[string]any
 		wantErr  bool
 	}{
 		{
 			name: "basic user message",
 			messages: []Message{
 				{Role: "user", Content: "Hello, world!"},
 			},
 			model: "test-model",
 			options: map[string]any{
 				"max_tokens": 8192,
 			},
 			want: map[string]any{
 				"model":      "test-model",
 				"max_tokens": int64(8192),
 				"messages": []any{
 					map[string]any{
 						"role":    "user",
 						"content": "Hello, world!",
 					},
 				},
 			},
 		},
 		{
 			name: "user and assistant messages",
 			messages: []Message{
 				{Role: "user", Content: "What is 2+2?"},
 				{Role: "assistant", Content: "4"},
 			},
 			model: "test-model",
 			options: map[string]any{
 				"max_tokens": 8192,
 			},
 			want: map[string]any{
 				"model":      "test-model",
 				"max_tokens": int64(8192),
 				"messages": []any{
 					map[string]any{
 						"role":    "user",
 						"content": "What is 2+2?",
 					},
 					map[string]any{
 						"role": "assistant",
 						"content": []any{
 							map[string]any{
 								"type": "text",
 								"text": "4",
 							},
 						},
 					},
 				},
 			},
 		},
 		{
 			name: "with system message",
 			messages: []Message{
 				{Role: "system", Content: "You are a helpful assistant."},
 				{Role: "user", Content: "Hello"},
 			},
 			model: "test-model",
 			options: map[string]any{
 				"max_tokens": 8192,
 			},
 			want: map[string]any{
 				"model":      "test-model",
 				"max_tokens": int64(8192),
 				"system":     "You are a helpful assistant.",
 				"messages": []any{
 					map[string]any{
 						"role":    "user",
 						"content": "Hello",
 					},
 				},
 			},
 		},
 		{
 			name: "with custom max_tokens and temperature",
 			messages: []Message{
 				{Role: "user", Content: "Test"},
 			},
 			model: "test-model",
 			options: map[string]any{
 				"max_tokens":  2048,
 				"temperature": 0.5,
 			},
 			want: map[string]any{
 				"model":       "test-model",
 				"max_tokens":  int64(2048),
 				"temperature": 0.5,
 				"messages": []any{
 					map[string]any{
 						"role":    "user",
 						"content": "Test",
 					},
 				},
 			},
 		},
 		{
 			name: "missing max_tokens returns error",
 			messages: []Message{
 				{Role: "user", Content: "Test"},
 			},
 			model:   "test-model",
 			options: map[string]any{},
 			want:    nil,
 			wantErr: true,
 		},
 		{
 			name: "with tools",
 			messages: []Message{
 				{Role: "user", Content: "What's the weather?"},
 			},
 			tools: []ToolDefinition{
 				{
 					Function: ToolFunctionDefinition{
 						Name:        "get_weather",
 						Description: "Get current weather",
 						Parameters: map[string]any{
 							"type": "object",
 							"properties": map[string]any{
 								"location": map[string]any{
 									"type":        "string",
 									"description": "City name",
 								},
 							},
 						},
 					},
 				},
 			},
 			model: "test-model",
 			options: map[string]any{
 				"max_tokens": 8192,
 			},
 			want: map[string]any{
 				"model":      "test-model",
 				"max_tokens": int64(8192),
 				"messages": []any{
 					map[string]any{
 						"role":    "user",
 						"content": "What's the weather?",
 					},
 				},
 				"tools": []any{
 					map[string]any{
 						"name":        "get_weather",
 						"description": "Get current weather",
 						"input_schema": map[string]any{
 							"type": "object",
 							"properties": map[string]any{
 								"location": map[string]any{
 									"type":        "string",
 									"description": "City name",
 								},
 							},
 						},
 					},
 				},
 			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := buildRequestBody(tt.messages, tt.tools, tt.model, tt.options)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("buildRequestBody() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
 				gotJSON, _ := json.MarshalIndent(got, "", "  ")
 				wantJSON, _ := json.MarshalIndent(tt.want, "", "  ")
 				t.Errorf("buildRequestBody() mismatch:\ngot:\n%s\nwant:\n%s", gotJSON, wantJSON)
 			}
 		})
 	}
 }
 func TestParseResponseBody(t *testing.T) {
 	tests := []struct {
 		name    string
 		body    []byte
 		want    *LLMResponse
 		wantErr bool
 	}{
 		{
 			name: "basic text response",
 			body: []byte(`{
 				"id": "msg-123",
 				"type": "message",
 				"role": "assistant",
 				"content": [
 					{"type": "text", "text": "Hello, how can I help?"}
 				],
 				"stop_reason": "end_turn",
 				"model": "test-model",
 				"usage": {
 					"input_tokens": 10,
 					"output_tokens": 5
 				}
 			}`),
 			want: &LLMResponse{
 				Content:      "Hello, how can I help?",
 				ToolCalls:    []ToolCall{},
 				FinishReason: "stop",
 				Usage: &UsageInfo{
 					PromptTokens:     10,
 					CompletionTokens: 5,
 					TotalTokens:      15,
 				},
 				Reasoning:        "",
 				ReasoningDetails: nil,
 			},
 			wantErr: false,
 		},
 		{
 			name: "response with tool use",
 			body: []byte(`{
 				"id": "msg-456",
 				"type": "message",
 				"role": "assistant",
 				"content": [
 					{"type": "text", "text": "I'll check the weather for you."},
 					{
 						"type": "tool_use",
 						"id": "toolu-123",
 						"name": "get_weather",
 						"input": {"location": "Tokyo"}
 					}
 				],
 				"stop_reason": "tool_use",
 				"model": "test-model",
 				"usage": {
 					"input_tokens": 20,
 					"output_tokens": 15
 				}
 			}`),
 			want: &LLMResponse{
 				Content: "I'll check the weather for you.",
 				ToolCalls: []ToolCall{
 					{
 						ID:   "toolu-123",
 						Name: "get_weather",
 						Arguments: map[string]any{
 							"location": "Tokyo",
 						},
 						Function: &FunctionCall{
 							Name:      "get_weather",
 							Arguments: `{"location":"Tokyo"}`,
 						},
 					},
 				},
 				FinishReason: "tool_calls",
 				Usage: &UsageInfo{
 					PromptTokens:     20,
 					CompletionTokens: 15,
 					TotalTokens:      35,
 				},
 				Reasoning:        "",
 				ReasoningDetails: nil,
 			},
 			wantErr: false,
 		},
 		{
 			name:    "invalid JSON",
 			body:    []byte(`invalid json`),
 			want:    nil,
 			wantErr: true,
 		},
 		{
 			name: "max_tokens stop reason",
 			body: []byte(`{
 				"id": "msg-789",
 				"type": "message",
 				"role": "assistant",
 				"content": [
 					{"type": "text", "text": "Partial response"}
 				],
 				"stop_reason": "max_tokens",
 				"model": "test-model",
 				"usage": {
 					"input_tokens": 100,
 					"output_tokens": 4096
 				}
 			}`),
 			want: &LLMResponse{
 				Content:      "Partial response",
 				ToolCalls:    []ToolCall{},
 				FinishReason: "length",
 				Usage: &UsageInfo{
 					PromptTokens:     100,
 					CompletionTokens: 4096,
 					TotalTokens:      4196,
 				},
 				Reasoning:        "",
 				ReasoningDetails: nil,
 			},
 			wantErr: false,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := parseResponseBody(tt.body)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("parseResponseBody() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 			if err != nil {
 				return
 			}
 			// Compare individual fields
 			if got.Content != tt.want.Content {
 				t.Errorf("Content = %q, want %q", got.Content, tt.want.Content)
 			}
 			if got.FinishReason != tt.want.FinishReason {
 				t.Errorf("FinishReason = %q, want %q", got.FinishReason, tt.want.FinishReason)
 			}
 			if got.Usage == nil && tt.want.Usage != nil {
 				t.Errorf("Usage = nil, want non-nil")
 			} else if got.Usage != nil && tt.want.Usage == nil {
 				t.Errorf("Usage = non-nil, want nil")
 			} else if got.Usage != nil && tt.want.Usage != nil {
 				if got.Usage.PromptTokens != tt.want.Usage.PromptTokens {
 					t.Errorf("Usage.PromptTokens = %d, want %d", got.Usage.PromptTokens, tt.want.Usage.PromptTokens)
 				}
 				if got.Usage.CompletionTokens != tt.want.Usage.CompletionTokens {
 					t.Errorf("Usage.CompletionTokens = %d, want %d",
 						got.Usage.CompletionTokens, tt.want.Usage.CompletionTokens)
 				}
 				if got.Usage.TotalTokens != tt.want.Usage.TotalTokens {
 					t.Errorf("Usage.TotalTokens = %d, want %d", got.Usage.TotalTokens, tt.want.Usage.TotalTokens)
 				}
 			}
 			if len(got.ToolCalls) != len(tt.want.ToolCalls) {
 				t.Errorf("ToolCalls length = %d, want %d", len(got.ToolCalls), len(tt.want.ToolCalls))
 			} else {
 				for i := range got.ToolCalls {
 					if got.ToolCalls[i].ID != tt.want.ToolCalls[i].ID {
 						t.Errorf("ToolCalls[%d].ID = %q, want %q",
 							i, got.ToolCalls[i].ID, tt.want.ToolCalls[i].ID)
 					}
 					if got.ToolCalls[i].Name != tt.want.ToolCalls[i].Name {
 						t.Errorf("ToolCalls[%d].Name = %q, want %q",
 							i, got.ToolCalls[i].Name, tt.want.ToolCalls[i].Name)
 					}
 				}
 			}
 		})
 	}
 }
 func TestNormalizeBaseURL(t *testing.T) {
 	tests := []struct {
 		name     string
 		apiBase  string
 		expected string
 	}{
 		{
 			name:     "empty string defaults to official API",
 			apiBase:  "",
 			expected: "https://api.anthropic.com/v1",
 		},
 		{
 			name:     "URL without /v1 gets it appended",
 			apiBase:  "https://api.example.com/anthropic",
 			expected: "https://api.example.com/anthropic/v1",
 		},
 		{
 			name:     "URL with /v1 remains unchanged",
 			apiBase:  "https://api.example.com/v1",
 			expected: "https://api.example.com/v1",
 		},
 		{
 			name:     "URL with trailing slash gets cleaned",
 			apiBase:  "https://api.example.com/anthropic/",
 			expected: "https://api.example.com/anthropic/v1",
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := normalizeBaseURL(tt.apiBase)
 			if got != tt.expected {
 				t.Errorf("normalizeBaseURL(%q) = %q, want %q", tt.apiBase, got, tt.expected)
 			}
 		})
 	}
 }
 func TestNewProvider(t *testing.T) {
 	provider := NewProvider("test-key", "https://api.example.com")
 	if provider == nil {
 		t.Fatal("NewProvider() returned nil")
 	}
 	if provider.apiKey != "test-key" {
 		t.Errorf("provider.apiKey = %q, want %q", provider.apiKey, "test-key")
 	}
 	if provider.apiBase != "https://api.example.com/v1" {
 		t.Errorf("provider.apiBase = %q, want %q", provider.apiBase, "https://api.example.com/v1")
 	}
 }
 func TestGetDefaultModel(t *testing.T) {
 	provider := NewProvider("test-key", "")
 	got := provider.GetDefaultModel()
 	expected := "claude-sonnet-4.6"
 	if got != expected {
 		t.Errorf("GetDefaultModel() = %q, want %q", got, expected)
 	}
 }
 // TestBuildRequestBodyEdgeCases tests edge cases for buildRequestBody.
 func TestBuildRequestBodyEdgeCases(t *testing.T) {
 	tests := []struct {
 		name     string
 		messages []Message
 		tools    []ToolDefinition
 		model    string
 		options  map[string]any
 		wantErr  bool
 	}{
 		{
 			name:     "empty message list",
 			messages: []Message{},
 			model:    "test-model",
 			options: map[string]any{
 				"max_tokens": 8192,
 			},
 			wantErr: false,
 		},
 		{
 			name: "very long system message",
 			messages: []Message{
 				{Role: "system", Content: strings.Repeat("This is a very long system prompt. ", 1000)},
 				{Role: "user", Content: "Hello"},
 			},
 			model: "test-model",
 			options: map[string]any{
 				"max_tokens": 8192,
 			},
 			wantErr: false,
 		},
 		{
 			name: "multiple consecutive system messages",
 			messages: []Message{
 				{Role: "system", Content: "First system message"},
 				{Role: "system", Content: "Second system message"},
 				{Role: "system", Content: "Third system message"},
 				{Role: "user", Content: "Hello"},
 			},
 			model: "test-model",
 			options: map[string]any{
 				"max_tokens": 8192,
 			},
 			wantErr: false,
 		},
 		{
 			name: "tool result without tool call",
 			messages: []Message{
 				{Role: "user", Content: "Use a tool"},
 				{Role: "assistant", Content: "", ToolCalls: []ToolCall{
 					{ID: "tool-1", Name: "test_tool", Arguments: map[string]any{"arg": "value"}},
 				}},
 				{Role: "user", ToolCallID: "tool-1", Content: "Tool result"},
 			},
 			model: "test-model",
 			options: map[string]any{
 				"max_tokens": 8192,
 			},
 			wantErr: false,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := buildRequestBody(tt.messages, tt.tools, tt.model, tt.options)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("buildRequestBody() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 			if err != nil {
 				return
 			}
 			// Verify basic structure
 			if got == nil {
 				t.Error("buildRequestBody() returned nil")
 				return
 			}
 			if got["model"] != tt.model {
 				t.Errorf("model = %v, want %v", got["model"], tt.model)
 			}
 		})
 	}
 }
 // TestParseResponseBodyEdgeCases tests edge cases for parseResponseBody.
 func TestParseResponseBodyEdgeCases(t *testing.T) {
 	tests := []struct {
 		name    string
 		body    []byte
 		wantErr bool
 		check   func(*testing.T, *LLMResponse)
 	}{
 		{
 			name: "empty content blocks",
 			body: []byte(`{
 				"id": "msg-empty",
 				"type": "message",
 				"role": "assistant",
 				"content": [],
 				"stop_reason": "end_turn",
 				"model": "test-model",
 				"usage": {"input_tokens": 5, "output_tokens": 0}
 			}`),
 			wantErr: false,
 			check: func(t *testing.T, resp *LLMResponse) {
 				if resp.Content != "" {
 					t.Errorf("Content = %q, want empty string", resp.Content)
 				}
 				if len(resp.ToolCalls) != 0 {
 					t.Errorf("ToolCalls length = %d, want 0", len(resp.ToolCalls))
 				}
 			},
 		},
 		{
 			name: "multiple tool use blocks",
 			body: []byte(`{
 				"id": "msg-multi",
 				"type": "message",
 				"role": "assistant",
 				"content": [
 					{"type": "tool_use", "id": "tool-1", "name": "func1", "input": {"arg": "val1"}},
 					{"type": "tool_use", "id": "tool-2", "name": "func2", "input": {"arg": "val2"}}
 				],
 				"stop_reason": "tool_use",
 				"model": "test-model",
 				"usage": {"input_tokens": 10, "output_tokens": 20}
 			}`),
 			wantErr: false,
 			check: func(t *testing.T, resp *LLMResponse) {
 				if len(resp.ToolCalls) != 2 {
 					t.Errorf("ToolCalls length = %d, want 2", len(resp.ToolCalls))
 				}
 			},
 		},
 		{
 			name:    "malformed JSON response",
 			body:    []byte(`{invalid json`),
 			wantErr: true,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := parseResponseBody(tt.body)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("parseResponseBody() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 			if tt.check != nil && err == nil {
 				tt.check(t, got)
 			}
 		})
 	}
 }
 // TestProviderChatErrors tests error handling in Chat.
 // Note: apiBase check removed as it's dead code - normalizeBaseURL() always provides a default.
 func TestProviderChatErrors(t *testing.T) {
 	tests := []struct {
 		name       string
 		apiKey     string
 		messages   []Message
 		wantErrMsg string
 	}{
 		{
 			name:       "missing API key",
 			apiKey:     "",
 			messages:   []Message{{Role: "user", Content: "Test"}},
 			wantErrMsg: "API key not configured",
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create provider using constructor to ensure proper initialization
 			provider := NewProvider(tt.apiKey, "https://api.example.com")
 			_, err := provider.Chat(context.Background(), tt.messages, nil, "test-model", nil)
 			if err == nil {
 				t.Fatal("Chat() expected error, got nil")
 			}
 			if err.Error() != tt.wantErrMsg {
 				t.Errorf("Chat() error = %q, want %q", err.Error(), tt.wantErrMsg)
 			}
 		})
 	}
 }
--- a/pkg/providers/azure/provider.go
+++ b/pkg/providers/azure/provider.go
@ -0,0 +1,150 @@
 package azure
 import (
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
 	"github.com/sipeed/picoclaw/pkg/providers/common"
 	"github.com/sipeed/picoclaw/pkg/providers/protocoltypes"
 )
 type (
 	LLMResponse    = protocoltypes.LLMResponse
 	Message        = protocoltypes.Message
 	ToolDefinition = protocoltypes.ToolDefinition
 )
 const (
 	// azureAPIVersion is the Azure OpenAI API version used for all requests.
 	azureAPIVersion       = "2024-10-21"
 	defaultRequestTimeout = common.DefaultRequestTimeout
 )
 // Provider implements the LLM provider interface for Azure OpenAI endpoints.
 // It handles Azure-specific authentication (api-key header), URL construction
 // (deployment-based), and request body formatting (max_completion_tokens, no model field).
 type Provider struct {
 	apiKey     string
 	apiBase    string
 	httpClient *http.Client
 }
 // Option configures the Azure Provider.
 type Option func(*Provider)
 // WithRequestTimeout sets the HTTP request timeout.
 func WithRequestTimeout(timeout time.Duration) Option {
 	return func(p *Provider) {
 		if timeout > 0 {
 			p.httpClient.Timeout = timeout
 		}
 	}
 }
 // NewProvider creates a new Azure OpenAI provider.
 func NewProvider(apiKey, apiBase, proxy string, opts ...Option) *Provider {
 	p := &Provider{
 		apiKey:     apiKey,
 		apiBase:    strings.TrimRight(apiBase, "/"),
 		httpClient: common.NewHTTPClient(proxy),
 	}
 	for _, opt := range opts {
 		if opt != nil {
 			opt(p)
 		}
 	}
 	return p
 }
 // NewProviderWithTimeout creates a new Azure OpenAI provider with a custom request timeout in seconds.
 func NewProviderWithTimeout(apiKey, apiBase, proxy string, requestTimeoutSeconds int) *Provider {
 	return NewProvider(
 		apiKey, apiBase, proxy,
 		WithRequestTimeout(time.Duration(requestTimeoutSeconds)*time.Second),
 	)
 }
 // Chat sends a chat completion request to the Azure OpenAI endpoint.
 // The model parameter is used as the Azure deployment name in the URL.
 func (p *Provider) Chat(
 	ctx context.Context,
 	messages []Message,
 	tools []ToolDefinition,
 	model string,
 	options map[string]any,
 ) (*LLMResponse, error) {
 	if p.apiBase == "" {
 		return nil, fmt.Errorf("Azure API base not configured")
 	}
 	// model is the deployment name for Azure OpenAI
 	deployment := model
 	// Build Azure-specific URL safely using url.JoinPath and query encoding
 	// to prevent path traversal or query injection via deployment names.
 	base, err := url.JoinPath(p.apiBase, "openai/deployments", deployment, "chat/completions")
 	if err != nil {
 		return nil, fmt.Errorf("failed to build Azure request URL: %w", err)
 	}
 	requestURL := base + "?api-version=" + azureAPIVersion
 	// Build request body — no "model" field (Azure infers from deployment URL)
 	requestBody := map[string]any{
 		"messages": common.SerializeMessages(messages),
 	}
 	if len(tools) > 0 {
 		requestBody["tools"] = tools
 		requestBody["tool_choice"] = "auto"
 	}
 	// Azure OpenAI always uses max_completion_tokens
 	if maxTokens, ok := common.AsInt(options["max_tokens"]); ok {
 		requestBody["max_completion_tokens"] = maxTokens
 	}
 	if temperature, ok := common.AsFloat(options["temperature"]); ok {
 		requestBody["temperature"] = temperature
 	}
 	jsonData, err := json.Marshal(requestBody)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal request: %w", err)
 	}
 	req, err := http.NewRequestWithContext(ctx, "POST", requestURL, bytes.NewReader(jsonData))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 	// Azure uses api-key header instead of Authorization: Bearer
 	req.Header.Set("Content-Type", "application/json")
 	if p.apiKey != "" {
 		req.Header.Set("Api-Key", p.apiKey)
 	}
 	resp, err := p.httpClient.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("failed to send request: %w", err)
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
 		return nil, common.HandleErrorResponse(resp, p.apiBase)
 	}
 	return common.ReadAndParseResponse(resp, p.apiBase)
 }
 // GetDefaultModel returns an empty string as Azure deployments are user-configured.
 func (p *Provider) GetDefaultModel() string {
 	return ""
 }
--- a/pkg/providers/azure/provider_test.go
+++ b/pkg/providers/azure/provider_test.go
@ -0,0 +1,232 @@
 package azure
 import (
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
 )
 // writeValidResponse writes a minimal valid Azure OpenAI chat completion response.
 func writeValidResponse(w http.ResponseWriter) {
 	resp := map[string]any{
 		"choices": []map[string]any{
 			{
 				"message":       map[string]any{"content": "ok"},
 				"finish_reason": "stop",
 			},
 		},
 	}
 	w.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(w).Encode(resp)
 }
 func TestProviderChat_AzureURLConstruction(t *testing.T) {
 	var capturedPath string
 	var capturedAPIVersion string
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		capturedPath = r.URL.Path
 		capturedAPIVersion = r.URL.Query().Get("api-version")
 		writeValidResponse(w)
 	}))
 	defer server.Close()
 	p := NewProvider("test-key", server.URL, "")
 	_, err := p.Chat(t.Context(), []Message{{Role: "user", Content: "hi"}}, nil, "my-gpt5-deployment", nil)
 	if err != nil {
 		t.Fatalf("Chat() error = %v", err)
 	}
 	wantPath := "/openai/deployments/my-gpt5-deployment/chat/completions"
 	if capturedPath != wantPath {
 		t.Errorf("URL path = %q, want %q", capturedPath, wantPath)
 	}
 	if capturedAPIVersion != azureAPIVersion {
 		t.Errorf("api-version = %q, want %q", capturedAPIVersion, azureAPIVersion)
 	}
 }
 func TestProviderChat_AzureAuthHeader(t *testing.T) {
 	var capturedAPIKey string
 	var capturedAuth string
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		capturedAPIKey = r.Header.Get("Api-Key")
 		capturedAuth = r.Header.Get("Authorization")
 		writeValidResponse(w)
 	}))
 	defer server.Close()
 	p := NewProvider("test-azure-key", server.URL, "")
 	_, err := p.Chat(t.Context(), []Message{{Role: "user", Content: "hi"}}, nil, "deployment", nil)
 	if err != nil {
 		t.Fatalf("Chat() error = %v", err)
 	}
 	if capturedAPIKey != "test-azure-key" {
 		t.Errorf("api-key header = %q, want %q", capturedAPIKey, "test-azure-key")
 	}
 	if capturedAuth != "" {
 		t.Errorf("Authorization header should be empty, got %q", capturedAuth)
 	}
 }
 func TestProviderChat_AzureOmitsModelFromBody(t *testing.T) {
 	var requestBody map[string]any
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		json.NewDecoder(r.Body).Decode(&requestBody)
 		writeValidResponse(w)
 	}))
 	defer server.Close()
 	p := NewProvider("test-key", server.URL, "")
 	_, err := p.Chat(t.Context(), []Message{{Role: "user", Content: "hi"}}, nil, "deployment", nil)
 	if err != nil {
 		t.Fatalf("Chat() error = %v", err)
 	}
 	if _, exists := requestBody["model"]; exists {
 		t.Error("request body should not contain 'model' field for Azure OpenAI")
 	}
 }
 func TestProviderChat_AzureUsesMaxCompletionTokens(t *testing.T) {
 	var requestBody map[string]any
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		json.NewDecoder(r.Body).Decode(&requestBody)
 		writeValidResponse(w)
 	}))
 	defer server.Close()
 	p := NewProvider("test-key", server.URL, "")
 	_, err := p.Chat(
 		t.Context(),
 		[]Message{{Role: "user", Content: "hi"}},
 		nil,
 		"deployment",
 		map[string]any{"max_tokens": 2048},
 	)
 	if err != nil {
 		t.Fatalf("Chat() error = %v", err)
 	}
 	if _, exists := requestBody["max_completion_tokens"]; !exists {
 		t.Error("request body should contain 'max_completion_tokens'")
 	}
 	if _, exists := requestBody["max_tokens"]; exists {
 		t.Error("request body should not contain 'max_tokens'")
 	}
 }
 func TestProviderChat_AzureHTTPError(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, `{"error":"unauthorized"}`, http.StatusUnauthorized)
 	}))
 	defer server.Close()
 	p := NewProvider("bad-key", server.URL, "")
 	_, err := p.Chat(t.Context(), []Message{{Role: "user", Content: "hi"}}, nil, "deployment", nil)
 	if err == nil {
 		t.Fatal("expected error, got nil")
 	}
 }
 func TestProviderChat_AzureParseToolCalls(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		resp := map[string]any{
 			"choices": []map[string]any{
 				{
 					"message": map[string]any{
 						"content": "",
 						"tool_calls": []map[string]any{
 							{
 								"id":   "call_1",
 								"type": "function",
 								"function": map[string]any{
 									"name":      "get_weather",
 									"arguments": `{"city":"Seattle"}`,
 								},
 							},
 						},
 					},
 					"finish_reason": "tool_calls",
 				},
 			},
 		}
 		w.Header().Set("Content-Type", "application/json")
 		json.NewEncoder(w).Encode(resp)
 	}))
 	defer server.Close()
 	p := NewProvider("test-key", server.URL, "")
 	out, err := p.Chat(t.Context(), []Message{{Role: "user", Content: "weather?"}}, nil, "deployment", nil)
 	if err != nil {
 		t.Fatalf("Chat() error = %v", err)
 	}
 	if len(out.ToolCalls) != 1 {
 		t.Fatalf("len(ToolCalls) = %d, want 1", len(out.ToolCalls))
 	}
 	if out.ToolCalls[0].Name != "get_weather" {
 		t.Errorf("ToolCalls[0].Name = %q, want %q", out.ToolCalls[0].Name, "get_weather")
 	}
 }
 func TestProvider_AzureEmptyAPIBase(t *testing.T) {
 	p := NewProvider("test-key", "", "")
 	_, err := p.Chat(t.Context(), []Message{{Role: "user", Content: "hi"}}, nil, "deployment", nil)
 	if err == nil {
 		t.Fatal("expected error for empty API base")
 	}
 }
 func TestProvider_AzureRequestTimeoutDefault(t *testing.T) {
 	p := NewProvider("test-key", "https://example.com", "")
 	if p.httpClient.Timeout != defaultRequestTimeout {
 		t.Errorf("timeout = %v, want %v", p.httpClient.Timeout, defaultRequestTimeout)
 	}
 }
 func TestProvider_AzureRequestTimeoutOverride(t *testing.T) {
 	p := NewProvider("test-key", "https://example.com", "", WithRequestTimeout(300*time.Second))
 	if p.httpClient.Timeout != 300*time.Second {
 		t.Errorf("timeout = %v, want %v", p.httpClient.Timeout, 300*time.Second)
 	}
 }
 func TestProvider_AzureNewProviderWithTimeout(t *testing.T) {
 	p := NewProviderWithTimeout("test-key", "https://example.com", "", 180)
 	if p.httpClient.Timeout != 180*time.Second {
 		t.Errorf("timeout = %v, want %v", p.httpClient.Timeout, 180*time.Second)
 	}
 }
 func TestProviderChat_AzureDeploymentNameEscaped(t *testing.T) {
 	var capturedPath string
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		capturedPath = r.URL.RawPath // use RawPath to see percent-encoding
 		if capturedPath == "" {
 			capturedPath = r.URL.Path
 		}
 		writeValidResponse(w)
 	}))
 	defer server.Close()
 	p := NewProvider("test-key", server.URL, "")
 	// Deployment name with characters that could cause path injection
 	_, err := p.Chat(t.Context(), []Message{{Role: "user", Content: "hi"}}, nil, "my deploy/../../admin", nil)
 	if err != nil {
 		t.Fatalf("Chat() error = %v", err)
 	}
 	// The slash and special chars in the deployment name must be escaped, not treated as path separators
 	if capturedPath == "/openai/deployments/my deploy/../../admin/chat/completions" {
 		t.Fatal("deployment name was interpolated without escaping — path injection possible")
 	}
 }
--- a/pkg/providers/claude_cli_provider.go
+++ b/pkg/providers/claude_cli_provider.go
@ -50,11 +50,19 @@ func (p *ClaudeCliProvider) Chat(
 	cmd.Stderr = &stderr
 	if err := cmd.Run(); err != nil {
-		if stderrStr := stderr.String(); stderrStr != "" {
+		stderrStr := strings.TrimSpace(stderr.String())
 		stdoutStr := strings.TrimSpace(stdout.String())
 		switch {
 		case stderrStr != "" && stdoutStr != "":
 			return nil, fmt.Errorf("claude cli error: %w\nstderr: %s\nstdout: %s", err, stderrStr, stdoutStr)
 		case stderrStr != "":
 			return nil, fmt.Errorf("claude cli error: %s", stderrStr)
-		}
+		case stdoutStr != "":
 			return nil, fmt.Errorf("claude cli error: %w\noutput: %s", err, stdoutStr)
 		default:
 			return nil, fmt.Errorf("claude cli error: %w", err)
 		}
 	}
 	return p.parseClaudeCliResponse(stdout.String())
 }
--- a/pkg/providers/codex_cli_provider_test.go
+++ b/pkg/providers/codex_cli_provider_test.go
@ -490,7 +490,7 @@ echo '{"type":"turn.completed"}'`
 	}
 	messages := []Message{{Role: "user", Content: "test"}}
-	_, err := p.Chat(context.Background(), messages, nil, "gpt-5.2-codex", nil)
+	_, err := p.Chat(context.Background(), messages, nil, "gpt-5.3-codex", nil)
 	if err != nil {
 		t.Fatalf("Chat() error: %v", err)
 	}
@ -502,7 +502,7 @@ echo '{"type":"turn.completed"}'`
 	}
 	args := string(argsData)
-	if !strings.Contains(args, "-m gpt-5.2-codex") {
+	if !strings.Contains(args, "-m gpt-5.3-codex") {
 		t.Errorf("args should contain model flag, got: %s", args)
 	}
 	if !strings.Contains(args, "-C /tmp/test-workspace") {
--- a/pkg/providers/codex_provider.go
+++ b/pkg/providers/codex_provider.go
@ -16,7 +16,7 @@ import (
 )
 const (
-	codexDefaultModel        = "gpt-5.2"
+	codexDefaultModel        = "gpt-5.3-codex"
 	codexDefaultInstructions = "You are Codex, a coding assistant."
 )
@ -95,7 +95,10 @@ func (p *CodexProvider) Chat(
 		)
 	}
-	params := buildCodexParams(messages, tools, resolvedModel, options, p.enableWebSearch)
+	// Respect tools.web.prefer_native: only inject native search when the agent
 	// loop requested it (options["native_search"]), so prefer_native: false
 	useNativeSearch := p.enableWebSearch && (options["native_search"] == true)
 	params := buildCodexParams(messages, tools, resolvedModel, options, useNativeSearch)
 	stream := p.client.Responses.NewStreaming(ctx, params, opts...)
 	defer stream.Close()
@ -157,6 +160,10 @@ func (p *CodexProvider) GetDefaultModel() string {
 	return codexDefaultModel
 }
 func (p *CodexProvider) SupportsNativeSearch() bool {
 	return p.enableWebSearch
 }
 func resolveCodexModel(model string) (string, string) {
 	m := strings.ToLower(strings.TrimSpace(model))
 	if m == "" {
--- a/pkg/providers/codex_provider_test.go
+++ b/pkg/providers/codex_provider_test.go
@ -355,7 +355,9 @@ func TestCodexProvider_ChatRoundTrip(t *testing.T) {
 	provider.client = createOpenAITestClient(server.URL, "test-token", "acc-123")
 	messages := []Message{{Role: "user", Content: "Hello"}}
-	resp, err := provider.Chat(t.Context(), messages, nil, "gpt-4o", map[string]any{"max_tokens": 1024})
+	// Pass native_search so Codex injects built-in web search (mirrors agent loop when prefer_native is true).
 	opts := map[string]any{"max_tokens": 1024, "native_search": true}
 	resp, err := provider.Chat(t.Context(), messages, nil, "gpt-4o", opts)
 	if err != nil {
 		t.Fatalf("Chat() error: %v", err)
 	}
@ -568,7 +570,7 @@ func TestCodexProvider_ChatRoundTrip_ModelFallbackFromUnsupported(t *testing.T)
 	provider.client = createOpenAITestClient(server.URL, "test-token", "acc-123")
 	messages := []Message{{Role: "user", Content: "Hello"}}
-	resp, err := provider.Chat(t.Context(), messages, nil, "gpt-5.2", nil)
+	resp, err := provider.Chat(t.Context(), messages, nil, "gpt-5.3-codex", nil)
 	if err != nil {
 		t.Fatalf("Chat() error: %v", err)
 	}
@ -599,7 +601,7 @@ func TestResolveCodexModel(t *testing.T) {
 			wantFallback: true,
 		},
 		{name: "non-openai prefixed", input: "glm-4.7", wantModel: codexDefaultModel, wantFallback: true},
-		{name: "openai prefix", input: "openai/gpt-5.2", wantModel: "gpt-5.2", wantFallback: false},
+		{name: "openai prefix", input: "openai/gpt-5.3-codex", wantModel: "gpt-5.3-codex", wantFallback: false},
 		{name: "direct gpt", input: "gpt-4o", wantModel: "gpt-4o", wantFallback: false},
 	}
--- a/pkg/providers/common/common.go
+++ b/pkg/providers/common/common.go
@ -0,0 +1,380 @@
 // PicoClaw - Ultra-lightweight personal AI agent
 // License: MIT
 //
 // Copyright (c) 2026 PicoClaw contributors
 // Package common provides shared utilities used by multiple LLM provider
 // implementations (openai_compat, azure, etc.).
 package common
 import (
 	"bufio"
 	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
 	"log"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
 	"github.com/sipeed/picoclaw/pkg/providers/protocoltypes"
 )
 // Re-export protocol types used across providers.
 type (
 	ToolCall               = protocoltypes.ToolCall
 	FunctionCall           = protocoltypes.FunctionCall
 	LLMResponse            = protocoltypes.LLMResponse
 	UsageInfo              = protocoltypes.UsageInfo
 	Message                = protocoltypes.Message
 	ToolDefinition         = protocoltypes.ToolDefinition
 	ToolFunctionDefinition = protocoltypes.ToolFunctionDefinition
 	ExtraContent           = protocoltypes.ExtraContent
 	GoogleExtra            = protocoltypes.GoogleExtra
 	ReasoningDetail        = protocoltypes.ReasoningDetail
 )
 const DefaultRequestTimeout = 120 * time.Second
 // NewHTTPClient creates an *http.Client with an optional proxy and the default timeout.
 func NewHTTPClient(proxy string) *http.Client {
 	client := &http.Client{
 		Timeout: DefaultRequestTimeout,
 	}
 	if proxy != "" {
 		parsed, err := url.Parse(proxy)
 		if err == nil {
 			// Preserve http.DefaultTransport settings (TLS, HTTP/2, timeouts, etc.)
 			if base, ok := http.DefaultTransport.(*http.Transport); ok {
 				tr := base.Clone()
 				tr.Proxy = http.ProxyURL(parsed)
 				client.Transport = tr
 			} else {
 				// Fallback: minimal transport if DefaultTransport is not *http.Transport.
 				client.Transport = &http.Transport{
 					Proxy: http.ProxyURL(parsed),
 				}
 			}
 		} else {
 			log.Printf("common: invalid proxy URL %q: %v", proxy, err)
 		}
 	}
 	return client
 }
 // --- Message serialization ---
 // openaiMessage is the wire-format message for OpenAI-compatible APIs.
 // It mirrors protocoltypes.Message but omits SystemParts, which is an
 // internal field that would be unknown to third-party endpoints.
 type openaiMessage struct {
 	Role             string     `json:"role"`
 	Content          string     `json:"content"`
 	ReasoningContent string     `json:"reasoning_content,omitempty"`
 	ToolCalls        []ToolCall `json:"tool_calls,omitempty"`
 	ToolCallID       string     `json:"tool_call_id,omitempty"`
 }
 // SerializeMessages converts internal Message structs to the OpenAI wire format.
 //   - Strips SystemParts (unknown to third-party endpoints)
 //   - Converts messages with Media to multipart content format (text + image_url parts)
 //   - Preserves ToolCallID, ToolCalls, and ReasoningContent for all messages
 func SerializeMessages(messages []Message) []any {
 	out := make([]any, 0, len(messages))
 	for _, m := range messages {
 		if len(m.Media) == 0 {
 			out = append(out, openaiMessage{
 				Role:             m.Role,
 				Content:          m.Content,
 				ReasoningContent: m.ReasoningContent,
 				ToolCalls:        m.ToolCalls,
 				ToolCallID:       m.ToolCallID,
 			})
 			continue
 		}
 		// Multipart content format for messages with media
 		parts := make([]map[string]any, 0, 1+len(m.Media))
 		if m.Content != "" {
 			parts = append(parts, map[string]any{
 				"type": "text",
 				"text": m.Content,
 			})
 		}
 		for _, mediaURL := range m.Media {
 			if strings.HasPrefix(mediaURL, "data:image/") {
 				parts = append(parts, map[string]any{
 					"type": "image_url",
 					"image_url": map[string]any{
 						"url": mediaURL,
 					},
 				})
 			}
 		}
 		msg := map[string]any{
 			"role":    m.Role,
 			"content": parts,
 		}
 		if m.ToolCallID != "" {
 			msg["tool_call_id"] = m.ToolCallID
 		}
 		if len(m.ToolCalls) > 0 {
 			msg["tool_calls"] = m.ToolCalls
 		}
 		if m.ReasoningContent != "" {
 			msg["reasoning_content"] = m.ReasoningContent
 		}
 		out = append(out, msg)
 	}
 	return out
 }
 // --- Response parsing ---
 // ParseResponse parses a JSON chat completion response body into an LLMResponse.
 func ParseResponse(body io.Reader) (*LLMResponse, error) {
 	var apiResponse struct {
 		Choices []struct {
 			Message struct {
 				Content          string            `json:"content"`
 				ReasoningContent string            `json:"reasoning_content"`
 				Reasoning        string            `json:"reasoning"`
 				ReasoningDetails []ReasoningDetail `json:"reasoning_details"`
 				ToolCalls        []struct {
 					ID       string `json:"id"`
 					Type     string `json:"type"`
 					Function *struct {
 						Name      string          `json:"name"`
 						Arguments json.RawMessage `json:"arguments"`
 					} `json:"function"`
 					ExtraContent *struct {
 						Google *struct {
 							ThoughtSignature string `json:"thought_signature"`
 						} `json:"google"`
 					} `json:"extra_content"`
 				} `json:"tool_calls"`
 			} `json:"message"`
 			FinishReason string `json:"finish_reason"`
 		} `json:"choices"`
 		Usage *UsageInfo `json:"usage"`
 	}
 	if err := json.NewDecoder(body).Decode(&apiResponse); err != nil {
 		return nil, fmt.Errorf("failed to decode response: %w", err)
 	}
 	if len(apiResponse.Choices) == 0 {
 		return &LLMResponse{
 			Content:      "",
 			FinishReason: "stop",
 		}, nil
 	}
 	choice := apiResponse.Choices[0]
 	toolCalls := make([]ToolCall, 0, len(choice.Message.ToolCalls))
 	for _, tc := range choice.Message.ToolCalls {
 		arguments := make(map[string]any)
 		name := ""
 		// Extract thought_signature from Gemini/Google-specific extra content
 		thoughtSignature := ""
 		if tc.ExtraContent != nil && tc.ExtraContent.Google != nil {
 			thoughtSignature = tc.ExtraContent.Google.ThoughtSignature
 		}
 		if tc.Function != nil {
 			name = tc.Function.Name
 			arguments = DecodeToolCallArguments(tc.Function.Arguments, name)
 		}
 		toolCall := ToolCall{
 			ID:               tc.ID,
 			Name:             name,
 			Arguments:        arguments,
 			ThoughtSignature: thoughtSignature,
 		}
 		if thoughtSignature != "" {
 			toolCall.ExtraContent = &ExtraContent{
 				Google: &GoogleExtra{
 					ThoughtSignature: thoughtSignature,
 				},
 			}
 		}
 		toolCalls = append(toolCalls, toolCall)
 	}
 	return &LLMResponse{
 		Content:          choice.Message.Content,
 		ReasoningContent: choice.Message.ReasoningContent,
 		Reasoning:        choice.Message.Reasoning,
 		ReasoningDetails: choice.Message.ReasoningDetails,
 		ToolCalls:        toolCalls,
 		FinishReason:     choice.FinishReason,
 		Usage:            apiResponse.Usage,
 	}, nil
 }
 // DecodeToolCallArguments decodes a tool call's arguments from raw JSON.
 func DecodeToolCallArguments(raw json.RawMessage, name string) map[string]any {
 	arguments := make(map[string]any)
 	raw = bytes.TrimSpace(raw)
 	if len(raw) == 0 || bytes.Equal(raw, []byte("null")) {
 		return arguments
 	}
 	var decoded any
 	if err := json.Unmarshal(raw, &decoded); err != nil {
 		log.Printf("common: failed to decode tool call arguments payload for %q: %v", name, err)
 		arguments["raw"] = string(raw)
 		return arguments
 	}
 	switch v := decoded.(type) {
 	case string:
 		if strings.TrimSpace(v) == "" {
 			return arguments
 		}
 		if err := json.Unmarshal([]byte(v), &arguments); err != nil {
 			log.Printf("common: failed to decode tool call arguments for %q: %v", name, err)
 			arguments["raw"] = v
 		}
 		return arguments
 	case map[string]any:
 		return v
 	default:
 		log.Printf("common: unsupported tool call arguments type for %q: %T", name, decoded)
 		arguments["raw"] = string(raw)
 		return arguments
 	}
 }
 // --- HTTP response helpers ---
 // HandleErrorResponse reads a non-200 response body and returns an appropriate error.
 func HandleErrorResponse(resp *http.Response, apiBase string) error {
 	contentType := resp.Header.Get("Content-Type")
 	body, readErr := io.ReadAll(io.LimitReader(resp.Body, 256))
 	if readErr != nil {
 		return fmt.Errorf("failed to read response: %w", readErr)
 	}
 	if LooksLikeHTML(body, contentType) {
 		return WrapHTMLResponseError(resp.StatusCode, body, contentType, apiBase)
 	}
 	return fmt.Errorf(
 		"API request failed:\n  Status: %d\n  Body:   %s",
 		resp.StatusCode,
 		ResponsePreview(body, 128),
 	)
 }
 // ReadAndParseResponse peeks at the response body to detect HTML errors,
 // then parses the JSON response into an LLMResponse.
 func ReadAndParseResponse(resp *http.Response, apiBase string) (*LLMResponse, error) {
 	contentType := resp.Header.Get("Content-Type")
 	reader := bufio.NewReader(resp.Body)
 	prefix, err := reader.Peek(256)
 	if err != nil && err != io.EOF && err != bufio.ErrBufferFull {
 		return nil, fmt.Errorf("failed to inspect response: %w", err)
 	}
 	if LooksLikeHTML(prefix, contentType) {
 		return nil, WrapHTMLResponseError(resp.StatusCode, prefix, contentType, apiBase)
 	}
 	out, err := ParseResponse(reader)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse JSON response: %w", err)
 	}
 	return out, nil
 }
 // LooksLikeHTML checks if the response body appears to be HTML.
 func LooksLikeHTML(body []byte, contentType string) bool {
 	contentType = strings.ToLower(strings.TrimSpace(contentType))
 	if strings.Contains(contentType, "text/html") || strings.Contains(contentType, "application/xhtml+xml") {
 		return true
 	}
 	prefix := bytes.ToLower(leadingTrimmedPrefix(body, 128))
 	return bytes.HasPrefix(prefix, []byte("<!doctype html")) ||
 		bytes.HasPrefix(prefix, []byte("<html")) ||
 		bytes.HasPrefix(prefix, []byte("<head")) ||
 		bytes.HasPrefix(prefix, []byte("<body"))
 }
 // WrapHTMLResponseError creates a descriptive error for HTML responses.
 func WrapHTMLResponseError(statusCode int, body []byte, contentType, apiBase string) error {
 	respPreview := ResponsePreview(body, 128)
 	return fmt.Errorf(
 		"API request failed: %s returned HTML instead of JSON (content-type: %s); check api_base or proxy configuration.\n  Status: %d\n  Body:   %s",
 		apiBase,
 		contentType,
 		statusCode,
 		respPreview,
 	)
 }
 // ResponsePreview returns a truncated preview of response body for error messages.
 func ResponsePreview(body []byte, maxLen int) string {
 	trimmed := bytes.TrimSpace(body)
 	if len(trimmed) == 0 {
 		return "<empty>"
 	}
 	if len(trimmed) <= maxLen {
 		return string(trimmed)
 	}
 	return string(trimmed[:maxLen]) + "..."
 }
 func leadingTrimmedPrefix(body []byte, maxLen int) []byte {
 	i := 0
 	for i < len(body) {
 		switch body[i] {
 		case ' ', '\t', '\n', '\r', '\f', '\v':
 			i++
 		default:
 			end := i + maxLen
 			if end > len(body) {
 				end = len(body)
 			}
 			return body[i:end]
 		}
 	}
 	return nil
 }
 // --- Numeric helpers ---
 // AsInt converts various numeric types to int.
 func AsInt(v any) (int, bool) {
 	switch val := v.(type) {
 	case int:
 		return val, true
 	case int64:
 		return int(val), true
 	case float64:
 		return int(val), true
 	case float32:
 		return int(val), true
 	default:
 		return 0, false
 	}
 }
 // AsFloat converts various numeric types to float64.
 func AsFloat(v any) (float64, bool) {
 	switch val := v.(type) {
 	case float64:
 		return val, true
 	case float32:
 		return float64(val), true
 	case int:
 		return float64(val), true
 	case int64:
 		return float64(val), true
 	default:
 		return 0, false
 	}
 }
--- a/pkg/providers/common/common_test.go
+++ b/pkg/providers/common/common_test.go
@ -0,0 +1,558 @@
 package common
 import (
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 	"strings"
 	"testing"
 	"github.com/sipeed/picoclaw/pkg/providers/protocoltypes"
 )
 // --- NewHTTPClient tests ---
 func TestNewHTTPClient_DefaultTimeout(t *testing.T) {
 	client := NewHTTPClient("")
 	if client.Timeout != DefaultRequestTimeout {
 		t.Errorf("timeout = %v, want %v", client.Timeout, DefaultRequestTimeout)
 	}
 }
 func TestNewHTTPClient_WithProxy(t *testing.T) {
 	client := NewHTTPClient("http://127.0.0.1:8080")
 	transport, ok := client.Transport.(*http.Transport)
 	if !ok || transport == nil {
 		t.Fatalf("expected http.Transport with proxy, got %T", client.Transport)
 	}
 	req := &http.Request{URL: &url.URL{Scheme: "https", Host: "api.example.com"}}
 	gotProxy, err := transport.Proxy(req)
 	if err != nil {
 		t.Fatalf("proxy function error: %v", err)
 	}
 	if gotProxy == nil || gotProxy.String() != "http://127.0.0.1:8080" {
 		t.Errorf("proxy = %v, want http://127.0.0.1:8080", gotProxy)
 	}
 }
 func TestNewHTTPClient_NoProxy(t *testing.T) {
 	client := NewHTTPClient("")
 	if client.Transport != nil {
 		t.Errorf("expected nil transport without proxy, got %T", client.Transport)
 	}
 }
 func TestNewHTTPClient_InvalidProxy(t *testing.T) {
 	// Should not panic, just log and return client without proxy
 	client := NewHTTPClient("://bad-url")
 	if client == nil {
 		t.Fatal("expected non-nil client even with invalid proxy")
 	}
 }
 // --- SerializeMessages tests ---
 func TestSerializeMessages_PlainText(t *testing.T) {
 	messages := []Message{
 		{Role: "user", Content: "hello"},
 		{Role: "assistant", Content: "hi", ReasoningContent: "thinking..."},
 	}
 	result := SerializeMessages(messages)
 	data, _ := json.Marshal(result)
 	var msgs []map[string]any
 	json.Unmarshal(data, &msgs)
 	if msgs[0]["content"] != "hello" {
 		t.Errorf("expected plain string content, got %v", msgs[0]["content"])
 	}
 	if msgs[1]["reasoning_content"] != "thinking..." {
 		t.Errorf("reasoning_content not preserved, got %v", msgs[1]["reasoning_content"])
 	}
 }
 func TestSerializeMessages_WithMedia(t *testing.T) {
 	messages := []Message{
 		{Role: "user", Content: "describe this", Media: []string{"data:image/png;base64,abc123"}},
 	}
 	result := SerializeMessages(messages)
 	data, _ := json.Marshal(result)
 	var msgs []map[string]any
 	json.Unmarshal(data, &msgs)
 	content, ok := msgs[0]["content"].([]any)
 	if !ok {
 		t.Fatalf("expected array content for media message, got %T", msgs[0]["content"])
 	}
 	if len(content) != 2 {
 		t.Fatalf("expected 2 content parts, got %d", len(content))
 	}
 }
 func TestSerializeMessages_MediaWithToolCallID(t *testing.T) {
 	messages := []Message{
 		{Role: "tool", Content: "result", Media: []string{"data:image/png;base64,xyz"}, ToolCallID: "call_1"},
 	}
 	result := SerializeMessages(messages)
 	data, _ := json.Marshal(result)
 	var msgs []map[string]any
 	json.Unmarshal(data, &msgs)
 	if msgs[0]["tool_call_id"] != "call_1" {
 		t.Errorf("tool_call_id not preserved, got %v", msgs[0]["tool_call_id"])
 	}
 }
 func TestSerializeMessages_StripsSystemParts(t *testing.T) {
 	messages := []Message{
 		{
 			Role:    "system",
 			Content: "you are helpful",
 			SystemParts: []protocoltypes.ContentBlock{
 				{Type: "text", Text: "you are helpful"},
 			},
 		},
 	}
 	result := SerializeMessages(messages)
 	data, _ := json.Marshal(result)
 	if strings.Contains(string(data), "system_parts") {
 		t.Error("system_parts should not appear in serialized output")
 	}
 }
 // --- ParseResponse tests ---
 func TestParseResponse_BasicContent(t *testing.T) {
 	body := `{"choices":[{"message":{"content":"hello world"},"finish_reason":"stop"}]}`
 	out, err := ParseResponse(strings.NewReader(body))
 	if err != nil {
 		t.Fatalf("ParseResponse() error = %v", err)
 	}
 	if out.Content != "hello world" {
 		t.Errorf("Content = %q, want %q", out.Content, "hello world")
 	}
 	if out.FinishReason != "stop" {
 		t.Errorf("FinishReason = %q, want %q", out.FinishReason, "stop")
 	}
 }
 func TestParseResponse_EmptyChoices(t *testing.T) {
 	body := `{"choices":[]}`
 	out, err := ParseResponse(strings.NewReader(body))
 	if err != nil {
 		t.Fatalf("ParseResponse() error = %v", err)
 	}
 	if out.Content != "" {
 		t.Errorf("Content = %q, want empty", out.Content)
 	}
 	if out.FinishReason != "stop" {
 		t.Errorf("FinishReason = %q, want %q", out.FinishReason, "stop")
 	}
 }
 func TestParseResponse_WithToolCalls(t *testing.T) {
 	body := `{"choices":[{"message":{"content":"","tool_calls":[{"id":"call_1","type":"function","function":{"name":"get_weather","arguments":"{\"city\":\"SF\"}"}}]},"finish_reason":"tool_calls"}]}`
 	out, err := ParseResponse(strings.NewReader(body))
 	if err != nil {
 		t.Fatalf("ParseResponse() error = %v", err)
 	}
 	if len(out.ToolCalls) != 1 {
 		t.Fatalf("len(ToolCalls) = %d, want 1", len(out.ToolCalls))
 	}
 	if out.ToolCalls[0].Name != "get_weather" {
 		t.Errorf("ToolCalls[0].Name = %q, want %q", out.ToolCalls[0].Name, "get_weather")
 	}
 	if out.ToolCalls[0].Arguments["city"] != "SF" {
 		t.Errorf("ToolCalls[0].Arguments[city] = %v, want SF", out.ToolCalls[0].Arguments["city"])
 	}
 }
 func TestParseResponse_WithUsage(t *testing.T) {
 	body := `{"choices":[{"message":{"content":"ok"},"finish_reason":"stop"}],"usage":{"prompt_tokens":10,"completion_tokens":5,"total_tokens":15}}`
 	out, err := ParseResponse(strings.NewReader(body))
 	if err != nil {
 		t.Fatalf("ParseResponse() error = %v", err)
 	}
 	if out.Usage == nil {
 		t.Fatal("Usage is nil")
 	}
 	if out.Usage.PromptTokens != 10 {
 		t.Errorf("PromptTokens = %d, want 10", out.Usage.PromptTokens)
 	}
 }
 func TestParseResponse_WithReasoningContent(t *testing.T) {
 	body := `{"choices":[{"message":{"content":"2","reasoning_content":"Let me think... 1+1=2"},"finish_reason":"stop"}]}`
 	out, err := ParseResponse(strings.NewReader(body))
 	if err != nil {
 		t.Fatalf("ParseResponse() error = %v", err)
 	}
 	if out.ReasoningContent != "Let me think... 1+1=2" {
 		t.Errorf("ReasoningContent = %q, want %q", out.ReasoningContent, "Let me think... 1+1=2")
 	}
 }
 func TestParseResponse_InvalidJSON(t *testing.T) {
 	_, err := ParseResponse(strings.NewReader("not json"))
 	if err == nil {
 		t.Fatal("expected error for invalid JSON")
 	}
 }
 // --- DecodeToolCallArguments tests ---
 func TestDecodeToolCallArguments_ObjectJSON(t *testing.T) {
 	raw := json.RawMessage(`{"city":"Seattle","units":"metric"}`)
 	args := DecodeToolCallArguments(raw, "test")
 	if args["city"] != "Seattle" {
 		t.Errorf("city = %v, want Seattle", args["city"])
 	}
 	if args["units"] != "metric" {
 		t.Errorf("units = %v, want metric", args["units"])
 	}
 }
 func TestDecodeToolCallArguments_StringJSON(t *testing.T) {
 	raw := json.RawMessage(`"{\"city\":\"SF\"}"`)
 	args := DecodeToolCallArguments(raw, "test")
 	if args["city"] != "SF" {
 		t.Errorf("city = %v, want SF", args["city"])
 	}
 }
 func TestDecodeToolCallArguments_EmptyInput(t *testing.T) {
 	args := DecodeToolCallArguments(nil, "test")
 	if len(args) != 0 {
 		t.Errorf("expected empty map, got %v", args)
 	}
 }
 func TestDecodeToolCallArguments_NullInput(t *testing.T) {
 	args := DecodeToolCallArguments(json.RawMessage(`null`), "test")
 	if len(args) != 0 {
 		t.Errorf("expected empty map, got %v", args)
 	}
 }
 func TestDecodeToolCallArguments_InvalidJSON(t *testing.T) {
 	args := DecodeToolCallArguments(json.RawMessage(`not-json`), "test")
 	if _, ok := args["raw"]; !ok {
 		t.Error("expected 'raw' fallback key for invalid JSON")
 	}
 }
 func TestDecodeToolCallArguments_EmptyStringJSON(t *testing.T) {
 	args := DecodeToolCallArguments(json.RawMessage(`"  "`), "test")
 	if len(args) != 0 {
 		t.Errorf("expected empty map for whitespace string, got %v", args)
 	}
 }
 // --- HandleErrorResponse tests ---
 func TestHandleErrorResponse_JSONError(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)
 		w.Write([]byte(`{"error":"bad request"}`))
 	}))
 	defer server.Close()
 	resp, err := http.Get(server.URL)
 	if err != nil {
 		t.Fatalf("http.Get() error = %v", err)
 	}
 	defer resp.Body.Close()
 	err = HandleErrorResponse(resp, server.URL)
 	if err == nil {
 		t.Fatal("expected error")
 	}
 	if !strings.Contains(err.Error(), "400") {
 		t.Errorf("error should contain status code, got %v", err)
 	}
 	if strings.Contains(err.Error(), "HTML") {
 		t.Errorf("should not mention HTML for JSON error, got %v", err)
 	}
 }
 func TestHandleErrorResponse_HTMLError(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "text/html")
 		w.WriteHeader(http.StatusBadGateway)
 		w.Write([]byte("<!DOCTYPE html><html><body>bad gateway</body></html>"))
 	}))
 	defer server.Close()
 	resp, err := http.Get(server.URL)
 	if err != nil {
 		t.Fatalf("http.Get() error = %v", err)
 	}
 	defer resp.Body.Close()
 	err = HandleErrorResponse(resp, server.URL)
 	if err == nil {
 		t.Fatal("expected error")
 	}
 	if !strings.Contains(err.Error(), "HTML instead of JSON") {
 		t.Errorf("expected HTML error message, got %v", err)
 	}
 }
 // --- ReadAndParseResponse tests ---
 func TestReadAndParseResponse_ValidJSON(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		w.Write([]byte(`{"choices":[{"message":{"content":"ok"},"finish_reason":"stop"}]}`))
 	}))
 	defer server.Close()
 	resp, err := http.Get(server.URL)
 	if err != nil {
 		t.Fatalf("http.Get() error = %v", err)
 	}
 	defer resp.Body.Close()
 	out, err := ReadAndParseResponse(resp, server.URL)
 	if err != nil {
 		t.Fatalf("ReadAndParseResponse() error = %v", err)
 	}
 	if out.Content != "ok" {
 		t.Errorf("Content = %q, want %q", out.Content, "ok")
 	}
 }
 func TestReadAndParseResponse_HTMLResponse(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "text/html")
 		w.Write([]byte("<!DOCTYPE html><html><body>login page</body></html>"))
 	}))
 	defer server.Close()
 	resp, err := http.Get(server.URL)
 	if err != nil {
 		t.Fatalf("http.Get() error = %v", err)
 	}
 	defer resp.Body.Close()
 	_, err = ReadAndParseResponse(resp, server.URL)
 	if err == nil {
 		t.Fatal("expected error for HTML response")
 	}
 	if !strings.Contains(err.Error(), "HTML instead of JSON") {
 		t.Errorf("expected HTML error, got %v", err)
 	}
 }
 // --- LooksLikeHTML tests ---
 func TestLooksLikeHTML_ContentTypeHTML(t *testing.T) {
 	if !LooksLikeHTML(nil, "text/html; charset=utf-8") {
 		t.Error("expected true for text/html content type")
 	}
 }
 func TestLooksLikeHTML_ContentTypeXHTML(t *testing.T) {
 	if !LooksLikeHTML(nil, "application/xhtml+xml") {
 		t.Error("expected true for xhtml content type")
 	}
 }
 func TestLooksLikeHTML_BodyPrefix(t *testing.T) {
 	tests := []struct {
 		name string
 		body string
 	}{
 		{"doctype", "<!DOCTYPE html><html>"},
 		{"html tag", "<html><body>"},
 		{"head tag", "<head><title>"},
 		{"body tag", "<body>content"},
 		{"whitespace before", "  \n\t<!DOCTYPE html>"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if !LooksLikeHTML([]byte(tt.body), "application/json") {
 				t.Errorf("expected true for body %q", tt.body)
 			}
 		})
 	}
 }
 func TestLooksLikeHTML_NotHTML(t *testing.T) {
 	if LooksLikeHTML([]byte(`{"error":"bad"}`), "application/json") {
 		t.Error("expected false for JSON body")
 	}
 }
 // --- ResponsePreview tests ---
 func TestResponsePreview_Short(t *testing.T) {
 	got := ResponsePreview([]byte("hello"), 128)
 	if got != "hello" {
 		t.Errorf("got %q, want %q", got, "hello")
 	}
 }
 func TestResponsePreview_Truncated(t *testing.T) {
 	body := strings.Repeat("a", 200)
 	got := ResponsePreview([]byte(body), 128)
 	if len(got) != 131 { // 128 + "..."
 		t.Errorf("len = %d, want 131", len(got))
 	}
 	if !strings.HasSuffix(got, "...") {
 		t.Error("expected ... suffix")
 	}
 }
 func TestResponsePreview_Empty(t *testing.T) {
 	got := ResponsePreview([]byte(""), 128)
 	if got != "<empty>" {
 		t.Errorf("got %q, want %q", got, "<empty>")
 	}
 }
 func TestResponsePreview_Whitespace(t *testing.T) {
 	got := ResponsePreview([]byte("  \n\t  "), 128)
 	if got != "<empty>" {
 		t.Errorf("got %q, want %q for whitespace-only body", got, "<empty>")
 	}
 }
 // --- AsInt tests ---
 func TestAsInt(t *testing.T) {
 	tests := []struct {
 		name string
 		val  any
 		want int
 		ok   bool
 	}{
 		{"int", 42, 42, true},
 		{"int64", int64(99), 99, true},
 		{"float64", float64(512), 512, true},
 		{"float32", float32(256), 256, true},
 		{"string", "nope", 0, false},
 		{"nil", nil, 0, false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, ok := AsInt(tt.val)
 			if ok != tt.ok || got != tt.want {
 				t.Errorf("AsInt(%v) = (%d, %v), want (%d, %v)", tt.val, got, ok, tt.want, tt.ok)
 			}
 		})
 	}
 }
 // --- AsFloat tests ---
 func TestAsFloat(t *testing.T) {
 	tests := []struct {
 		name string
 		val  any
 		want float64
 		ok   bool
 	}{
 		{"float64", float64(0.7), 0.7, true},
 		{"float32", float32(0.5), float64(float32(0.5)), true},
 		{"int", 1, 1.0, true},
 		{"int64", int64(100), 100.0, true},
 		{"string", "nope", 0, false},
 		{"nil", nil, 0, false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, ok := AsFloat(tt.val)
 			if ok != tt.ok || got != tt.want {
 				t.Errorf("AsFloat(%v) = (%f, %v), want (%f, %v)", tt.val, got, ok, tt.want, tt.ok)
 			}
 		})
 	}
 }
 // --- WrapHTMLResponseError tests ---
 func TestWrapHTMLResponseError(t *testing.T) {
 	err := WrapHTMLResponseError(502, []byte("<html>bad</html>"), "text/html", "https://api.example.com")
 	if err == nil {
 		t.Fatal("expected error")
 	}
 	msg := err.Error()
 	if !strings.Contains(msg, "502") {
 		t.Errorf("expected status code in error, got %v", msg)
 	}
 	if !strings.Contains(msg, "https://api.example.com") {
 		t.Errorf("expected api base in error, got %v", msg)
 	}
 	if !strings.Contains(msg, "HTML instead of JSON") {
 		t.Errorf("expected HTML mention in error, got %v", msg)
 	}
 }
 // --- HandleErrorResponse with read failure ---
 func TestHandleErrorResponse_EmptyBody(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusInternalServerError)
 		// empty body
 	}))
 	defer server.Close()
 	resp, err := http.Get(server.URL)
 	if err != nil {
 		t.Fatalf("http.Get() error = %v", err)
 	}
 	defer resp.Body.Close()
 	err = HandleErrorResponse(resp, server.URL)
 	if err == nil {
 		t.Fatal("expected error")
 	}
 	if !strings.Contains(err.Error(), "500") {
 		t.Errorf("expected status code, got %v", err)
 	}
 }
 // --- ReadAndParseResponse with invalid JSON ---
 func TestReadAndParseResponse_InvalidJSON(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		w.Write([]byte("not valid json"))
 	}))
 	defer server.Close()
 	resp, err := http.Get(server.URL)
 	if err != nil {
 		t.Fatalf("http.Get() error = %v", err)
 	}
 	defer resp.Body.Close()
 	_, err = ReadAndParseResponse(resp, server.URL)
 	if err == nil {
 		t.Fatal("expected error for invalid JSON")
 	}
 }
 // --- ParseResponse with thought_signature (Google/Gemini) ---
 func TestParseResponse_WithThoughtSignature(t *testing.T) {
 	body := `{"choices":[{"message":{"content":"","tool_calls":[{"id":"call_1","type":"function","function":{"name":"test_tool","arguments":"{}"},"extra_content":{"google":{"thought_signature":"sig123"}}}]},"finish_reason":"tool_calls"}]}`
 	out, err := ParseResponse(strings.NewReader(body))
 	if err != nil {
 		t.Fatalf("ParseResponse() error = %v", err)
 	}
 	if len(out.ToolCalls) != 1 {
 		t.Fatalf("len(ToolCalls) = %d, want 1", len(out.ToolCalls))
 	}
 	if out.ToolCalls[0].ThoughtSignature != "sig123" {
 		t.Errorf("ThoughtSignature = %q, want %q", out.ToolCalls[0].ThoughtSignature, "sig123")
 	}
 	if out.ToolCalls[0].ExtraContent == nil || out.ToolCalls[0].ExtraContent.Google == nil {
 		t.Fatal("ExtraContent.Google is nil")
 	}
 	if out.ToolCalls[0].ExtraContent.Google.ThoughtSignature != "sig123" {
 		t.Errorf("ExtraContent.Google.ThoughtSignature = %q, want %q",
 			out.ToolCalls[0].ExtraContent.Google.ThoughtSignature, "sig123")
 	}
 }
--- a/pkg/providers/factory_provider.go
+++ b/pkg/providers/factory_provider.go
@ -10,6 +10,8 @@ import (
 	"strings"
 	"github.com/sipeed/picoclaw/pkg/config"
 	anthropicmessages "github.com/sipeed/picoclaw/pkg/providers/anthropic_messages"
 	"github.com/sipeed/picoclaw/pkg/providers/azure"
 )
 // createClaudeAuthProvider creates a Claude provider using OAuth credentials from auth store.
@ -53,7 +55,8 @@ func ExtractProtocol(model string) (protocol, modelID string) {
 // CreateProviderFromConfig creates a provider based on the ModelConfig.
 // It uses the protocol prefix in the Model field to determine which provider to create.
-// Supported protocols: openai, litellm, anthropic, antigravity, claude-cli, codex-cli, github-copilot
+// Supported protocols: openai, litellm, anthropic, anthropic-messages, antigravity,
 // claude-cli, codex-cli, github-copilot
 // Returns the provider, the model ID (without protocol prefix), and any error.
 func CreateProviderFromConfig(cfg *config.ModelConfig) (LLMProvider, string, error) {
 	if cfg == nil {
@ -92,10 +95,28 @@ func CreateProviderFromConfig(cfg *config.ModelConfig) (LLMProvider, string, err
 			cfg.RequestTimeout,
 		), modelID, nil
 	case "azure", "azure-openai":
 		// Azure OpenAI uses deployment-based URLs, api-key header auth,
 		// and always sends max_completion_tokens.
 		if cfg.APIKey == "" {
 			return nil, "", fmt.Errorf("api_key is required for azure protocol")
 		}
 		if cfg.APIBase == "" {
 			return nil, "", fmt.Errorf(
 				"api_base is required for azure protocol (e.g., https://your-resource.openai.azure.com)",
 			)
 		}
 		return azure.NewProviderWithTimeout(
 			cfg.APIKey,
 			cfg.APIBase,
 			cfg.Proxy,
 			cfg.RequestTimeout,
 		), modelID, nil
 	case "litellm", "openrouter", "groq", "zhipu", "gemini", "nvidia",
 		"ollama", "moonshot", "shengsuanyun", "deepseek", "cerebras",
 		"vivgrid", "volcengine", "vllm", "qwen", "mistral", "avian",
-		"minimax", "longcat":
+		"minimax", "longcat", "modelscope":
 		// All other OpenAI-compatible HTTP providers
 		if cfg.APIKey == "" && cfg.APIBase == "" {
 			return nil, "", fmt.Errorf("api_key or api_base is required for HTTP-based protocol %q", protocol)
@ -137,6 +158,21 @@ func CreateProviderFromConfig(cfg *config.ModelConfig) (LLMProvider, string, err
 			cfg.RequestTimeout,
 		), modelID, nil
 	case "anthropic-messages":
 		// Anthropic Messages API with native format (HTTP-based, no SDK)
 		apiBase := cfg.APIBase
 		if apiBase == "" {
 			apiBase = "https://api.anthropic.com/v1"
 		}
 		if cfg.APIKey == "" {
 			return nil, "", fmt.Errorf("api_key is required for anthropic-messages protocol (model: %s)", cfg.Model)
 		}
 		return anthropicmessages.NewProviderWithTimeout(
 			cfg.APIKey,
 			apiBase,
 			cfg.RequestTimeout,
 		), modelID, nil
 	case "antigravity":
 		return NewAntigravityProvider(), modelID, nil
@ -217,6 +253,8 @@ func getDefaultAPIBase(protocol string) string {
 		return "https://api.minimaxi.com/v1"
 	case "longcat":
 		return "https://api.longcat.chat/openai"
 	case "modelscope":
 		return "https://api-inference.modelscope.cn/v1"
 	default:
 		return ""
 	}
--- a/pkg/providers/factory_provider_test.go
+++ b/pkg/providers/factory_provider_test.go
@ -64,6 +64,12 @@ func TestExtractProtocol(t *testing.T) {
 			wantProtocol: "nvidia",
 			wantModelID:  "meta/llama-3.1-8b",
 		},
 		{
 			name:         "azure with prefix",
 			model:        "azure/my-gpt5-deployment",
 			wantProtocol: "azure",
 			wantModelID:  "my-gpt5-deployment",
 		},
 	}
 	for _, tt := range tests {
@ -114,6 +120,7 @@ func TestCreateProviderFromConfig_DefaultAPIBase(t *testing.T) {
 		{"deepseek", "deepseek"},
 		{"ollama", "ollama"},
 		{"longcat", "longcat"},
 		{"modelscope", "modelscope"},
 	}
 	for _, tt := range tests {
@ -186,6 +193,35 @@ func TestCreateProviderFromConfig_LongCat(t *testing.T) {
 	}
 }
 func TestCreateProviderFromConfig_ModelScope(t *testing.T) {
 	cfg := &config.ModelConfig{
 		ModelName: "test-modelscope",
 		Model:     "modelscope/Qwen/Qwen3-235B-A22B-Instruct-2507",
 		APIKey:    "test-key",
 		APIBase:   "https://api-inference.modelscope.cn/v1",
 	}
 	provider, modelID, err := CreateProviderFromConfig(cfg)
 	if err != nil {
 		t.Fatalf("CreateProviderFromConfig() error = %v", err)
 	}
 	if provider == nil {
 		t.Fatal("CreateProviderFromConfig() returned nil provider")
 	}
 	if modelID != "Qwen/Qwen3-235B-A22B-Instruct-2507" {
 		t.Errorf("modelID = %q, want %q", modelID, "Qwen/Qwen3-235B-A22B-Instruct-2507")
 	}
 	if _, ok := provider.(*HTTPProvider); !ok {
 		t.Fatalf("expected *HTTPProvider, got %T", provider)
 	}
 }
 func TestGetDefaultAPIBase_ModelScope(t *testing.T) {
 	if got := getDefaultAPIBase("modelscope"); got != "https://api-inference.modelscope.cn/v1" {
 		t.Fatalf("getDefaultAPIBase(%q) = %q, want %q", "modelscope", got, "https://api-inference.modelscope.cn/v1")
 	}
 }
 func TestCreateProviderFromConfig_Anthropic(t *testing.T) {
 	cfg := &config.ModelConfig{
 		ModelName: "test-anthropic",
@ -341,3 +377,69 @@ func TestCreateProviderFromConfig_RequestTimeoutPropagation(t *testing.T) {
 		t.Fatalf("Chat() error = %q, want timeout-related error", errMsg)
 	}
 }
 func TestCreateProviderFromConfig_Azure(t *testing.T) {
 	cfg := &config.ModelConfig{
 		ModelName: "azure-gpt5",
 		Model:     "azure/my-gpt5-deployment",
 		APIKey:    "test-azure-key",
 		APIBase:   "https://my-resource.openai.azure.com",
 	}
 	provider, modelID, err := CreateProviderFromConfig(cfg)
 	if err != nil {
 		t.Fatalf("CreateProviderFromConfig() error = %v", err)
 	}
 	if provider == nil {
 		t.Fatal("CreateProviderFromConfig() returned nil provider")
 	}
 	if modelID != "my-gpt5-deployment" {
 		t.Errorf("modelID = %q, want %q", modelID, "my-gpt5-deployment")
 	}
 }
 func TestCreateProviderFromConfig_AzureOpenAIAlias(t *testing.T) {
 	cfg := &config.ModelConfig{
 		ModelName: "azure-gpt4",
 		Model:     "azure-openai/my-deployment",
 		APIKey:    "test-azure-key",
 		APIBase:   "https://my-resource.openai.azure.com",
 	}
 	provider, modelID, err := CreateProviderFromConfig(cfg)
 	if err != nil {
 		t.Fatalf("CreateProviderFromConfig() error = %v", err)
 	}
 	if provider == nil {
 		t.Fatal("CreateProviderFromConfig() returned nil provider")
 	}
 	if modelID != "my-deployment" {
 		t.Errorf("modelID = %q, want %q", modelID, "my-deployment")
 	}
 }
 func TestCreateProviderFromConfig_AzureMissingAPIKey(t *testing.T) {
 	cfg := &config.ModelConfig{
 		ModelName: "azure-gpt5",
 		Model:     "azure/my-gpt5-deployment",
 		APIBase:   "https://my-resource.openai.azure.com",
 	}
 	_, _, err := CreateProviderFromConfig(cfg)
 	if err == nil {
 		t.Fatal("CreateProviderFromConfig() expected error for missing API key")
 	}
 }
 func TestCreateProviderFromConfig_AzureMissingAPIBase(t *testing.T) {
 	cfg := &config.ModelConfig{
 		ModelName: "azure-gpt5",
 		Model:     "azure/my-gpt5-deployment",
 		APIKey:    "test-azure-key",
 	}
 	_, _, err := CreateProviderFromConfig(cfg)
 	if err == nil {
 		t.Fatal("CreateProviderFromConfig() expected error for missing API base")
 	}
 }
--- a/pkg/providers/http_provider.go
+++ b/pkg/providers/http_provider.go
@ -55,3 +55,7 @@ func (p *HTTPProvider) Chat(
 func (p *HTTPProvider) GetDefaultModel() string {
 	return ""
 }
 func (p *HTTPProvider) SupportsNativeSearch() bool {
 	return p.delegate.SupportsNativeSearch()
 }
--- a/pkg/providers/openai_compat/provider.go
+++ b/pkg/providers/openai_compat/provider.go
@ -1,18 +1,16 @@
 package openai_compat
 import (
 	"bufio"
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"log"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
 	"github.com/sipeed/picoclaw/pkg/providers/common"
 	"github.com/sipeed/picoclaw/pkg/providers/protocoltypes"
 )
@ -38,7 +36,7 @@ type Provider struct {
 type Option func(*Provider)
-const defaultRequestTimeout = 120 * time.Second
+const defaultRequestTimeout = common.DefaultRequestTimeout
 func WithMaxTokensField(maxTokensField string) Option {
 	return func(p *Provider) {
@ -55,25 +53,10 @@ func WithRequestTimeout(timeout time.Duration) Option {
 }
 func NewProvider(apiKey, apiBase, proxy string, opts ...Option) *Provider {
 	client := &http.Client{
 		Timeout: defaultRequestTimeout,
 	}
 	if proxy != "" {
 		parsed, err := url.Parse(proxy)
 		if err == nil {
 			client.Transport = &http.Transport{
 				Proxy: http.ProxyURL(parsed),
 			}
 		} else {
 			log.Printf("openai_compat: invalid proxy URL %q: %v", proxy, err)
 		}
 	}
 	p := &Provider{
 		apiKey:     apiKey,
 		apiBase:    strings.TrimRight(apiBase, "/"),
-		httpClient: client,
+		httpClient: common.NewHTTPClient(proxy),
 	}
 	for _, opt := range opts {
@ -117,15 +100,18 @@ func (p *Provider) Chat(
 	requestBody := map[string]any{
 		"model":    model,
-		"messages": serializeMessages(messages),
+		"messages": common.SerializeMessages(messages),
 	}
-	if len(tools) > 0 {
+	// When fallback uses a different provider (e.g. DeepSeek), that provider must not inject web_search_preview.
-		requestBody["tools"] = tools
+	nativeSearch, _ := options["native_search"].(bool)
 	nativeSearch = nativeSearch && isNativeSearchHost(p.apiBase)
 	if len(tools) > 0 || nativeSearch {
 		requestBody["tools"] = buildToolsList(tools, nativeSearch)
 		requestBody["tool_choice"] = "auto"
 	}
-	if maxTokens, ok := asInt(options["max_tokens"]); ok {
+	if maxTokens, ok := common.AsInt(options["max_tokens"]); ok {
 		// Use configured maxTokensField if specified, otherwise fallback to model-based detection
 		fieldName := p.maxTokensField
 		if fieldName == "" {
@ -141,7 +127,7 @@ func (p *Provider) Chat(
 		requestBody[fieldName] = maxTokens
 	}
-	if temperature, ok := asFloat(options["temperature"]); ok {
+	if temperature, ok := common.AsFloat(options["temperature"]); ok {
 		lowerModel := strings.ToLower(model)
 		// Kimi k2 models only support temperature=1.
 		if strings.Contains(lowerModel, "kimi") && strings.Contains(lowerModel, "k2") {
@ -185,275 +171,11 @@ func (p *Provider) Chat(
 	}
 	defer resp.Body.Close()
 	contentType := resp.Header.Get("Content-Type")
 	// Non-200: read a prefix to tell HTML error page apart from JSON error body.
 	if resp.StatusCode != http.StatusOK {
-		body, readErr := io.ReadAll(io.LimitReader(resp.Body, 256))
+		return nil, common.HandleErrorResponse(resp, p.apiBase)
 		if readErr != nil {
 			return nil, fmt.Errorf("failed to read response: %w", readErr)
 		}
 		if looksLikeHTML(body, contentType) {
 			return nil, wrapHTMLResponseError(resp.StatusCode, body, contentType, p.apiBase)
 		}
 		return nil, fmt.Errorf(
 			"API request failed:\n  Status: %d\n  Body:   %s",
 			resp.StatusCode,
 			responsePreview(body, 128),
 		)
 	}
-	// Peek without consuming so the full stream reaches the JSON decoder.
+	return common.ReadAndParseResponse(resp, p.apiBase)
 	reader := bufio.NewReader(resp.Body)
 	prefix, err := reader.Peek(256) // io.EOF/ErrBufferFull are normal; only real errors abort
 	if err != nil && err != io.EOF && err != bufio.ErrBufferFull {
 		return nil, fmt.Errorf("failed to inspect response: %w", err)
 	}
 	if looksLikeHTML(prefix, contentType) {
 		return nil, wrapHTMLResponseError(resp.StatusCode, prefix, contentType, p.apiBase)
 	}
 	out, err := parseResponse(reader)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse JSON response: %w", err)
 	}
 	return out, nil
 }
 func wrapHTMLResponseError(statusCode int, body []byte, contentType, apiBase string) error {
 	respPreview := responsePreview(body, 128)
 	return fmt.Errorf(
 		"API request failed: %s returned HTML instead of JSON (content-type: %s); check api_base or proxy configuration.\n  Status: %d\n  Body:   %s",
 		apiBase,
 		contentType,
 		statusCode,
 		respPreview,
 	)
 }
 func looksLikeHTML(body []byte, contentType string) bool {
 	contentType = strings.ToLower(strings.TrimSpace(contentType))
 	if strings.Contains(contentType, "text/html") || strings.Contains(contentType, "application/xhtml+xml") {
 		return true
 	}
 	prefix := bytes.ToLower(leadingTrimmedPrefix(body, 128))
 	return bytes.HasPrefix(prefix, []byte("<!doctype html")) ||
 		bytes.HasPrefix(prefix, []byte("<html")) ||
 		bytes.HasPrefix(prefix, []byte("<head")) ||
 		bytes.HasPrefix(prefix, []byte("<body"))
 }
 func leadingTrimmedPrefix(body []byte, maxLen int) []byte {
 	i := 0
 	for i < len(body) {
 		switch body[i] {
 		case ' ', '\t', '\n', '\r', '\f', '\v':
 			i++
 		default:
 			end := i + maxLen
 			if end > len(body) {
 				end = len(body)
 			}
 			return body[i:end]
 		}
 	}
 	return nil
 }
 func responsePreview(body []byte, maxLen int) string {
 	trimmed := bytes.TrimSpace(body)
 	if len(trimmed) == 0 {
 		return "<empty>"
 	}
 	if len(trimmed) <= maxLen {
 		return string(trimmed)
 	}
 	return string(trimmed[:maxLen]) + "..."
 }
 func parseResponse(body io.Reader) (*LLMResponse, error) {
 	var apiResponse struct {
 		Choices []struct {
 			Message struct {
 				Content          string            `json:"content"`
 				ReasoningContent string            `json:"reasoning_content"`
 				Reasoning        string            `json:"reasoning"`
 				ReasoningDetails []ReasoningDetail `json:"reasoning_details"`
 				ToolCalls        []struct {
 					ID       string `json:"id"`
 					Type     string `json:"type"`
 					Function *struct {
 						Name      string          `json:"name"`
 						Arguments json.RawMessage `json:"arguments"`
 					} `json:"function"`
 					ExtraContent *struct {
 						Google *struct {
 							ThoughtSignature string `json:"thought_signature"`
 						} `json:"google"`
 					} `json:"extra_content"`
 				} `json:"tool_calls"`
 			} `json:"message"`
 			FinishReason string `json:"finish_reason"`
 		} `json:"choices"`
 		Usage *UsageInfo `json:"usage"`
 	}
 	if err := json.NewDecoder(body).Decode(&apiResponse); err != nil {
 		return nil, fmt.Errorf("failed to decode response: %w", err)
 	}
 	if len(apiResponse.Choices) == 0 {
 		return &LLMResponse{
 			Content:      "",
 			FinishReason: "stop",
 		}, nil
 	}
 	choice := apiResponse.Choices[0]
 	toolCalls := make([]ToolCall, 0, len(choice.Message.ToolCalls))
 	for _, tc := range choice.Message.ToolCalls {
 		arguments := make(map[string]any)
 		name := ""
 		// Extract thought_signature from Gemini/Google-specific extra content
 		thoughtSignature := ""
 		if tc.ExtraContent != nil && tc.ExtraContent.Google != nil {
 			thoughtSignature = tc.ExtraContent.Google.ThoughtSignature
 		}
 		if tc.Function != nil {
 			name = tc.Function.Name
 			arguments = decodeToolCallArguments(tc.Function.Arguments, name)
 		}
 		// Build ToolCall with ExtraContent for Gemini 3 thought_signature persistence
 		toolCall := ToolCall{
 			ID:               tc.ID,
 			Name:             name,
 			Arguments:        arguments,
 			ThoughtSignature: thoughtSignature,
 		}
 		if thoughtSignature != "" {
 			toolCall.ExtraContent = &ExtraContent{
 				Google: &GoogleExtra{
 					ThoughtSignature: thoughtSignature,
 				},
 			}
 		}
 		toolCalls = append(toolCalls, toolCall)
 	}
 	return &LLMResponse{
 		Content:          choice.Message.Content,
 		ReasoningContent: choice.Message.ReasoningContent,
 		Reasoning:        choice.Message.Reasoning,
 		ReasoningDetails: choice.Message.ReasoningDetails,
 		ToolCalls:        toolCalls,
 		FinishReason:     choice.FinishReason,
 		Usage:            apiResponse.Usage,
 	}, nil
 }
 func decodeToolCallArguments(raw json.RawMessage, name string) map[string]any {
 	arguments := make(map[string]any)
 	raw = bytes.TrimSpace(raw)
 	if len(raw) == 0 || bytes.Equal(raw, []byte("null")) {
 		return arguments
 	}
 	var decoded any
 	if err := json.Unmarshal(raw, &decoded); err != nil {
 		log.Printf("openai_compat: failed to decode tool call arguments payload for %q: %v", name, err)
 		arguments["raw"] = string(raw)
 		return arguments
 	}
 	switch v := decoded.(type) {
 	case string:
 		if strings.TrimSpace(v) == "" {
 			return arguments
 		}
 		if err := json.Unmarshal([]byte(v), &arguments); err != nil {
 			log.Printf("openai_compat: failed to decode tool call arguments for %q: %v", name, err)
 			arguments["raw"] = v
 		}
 		return arguments
 	case map[string]any:
 		return v
 	default:
 		log.Printf("openai_compat: unsupported tool call arguments type for %q: %T", name, decoded)
 		arguments["raw"] = string(raw)
 		return arguments
 	}
 }
 // openaiMessage is the wire-format message for OpenAI-compatible APIs.
 // It mirrors protocoltypes.Message but omits SystemParts, which is an
 // internal field that would be unknown to third-party endpoints.
 type openaiMessage struct {
 	Role             string     `json:"role"`
 	Content          string     `json:"content"`
 	ReasoningContent string     `json:"reasoning_content,omitempty"`
 	ToolCalls        []ToolCall `json:"tool_calls,omitempty"`
 	ToolCallID       string     `json:"tool_call_id,omitempty"`
 }
 // serializeMessages converts internal Message structs to the OpenAI wire format.
 // - Strips SystemParts (unknown to third-party endpoints)
 // - Converts messages with Media to multipart content format (text + image_url parts)
 // - Preserves ToolCallID, ToolCalls, and ReasoningContent for all messages
 func serializeMessages(messages []Message) []any {
 	out := make([]any, 0, len(messages))
 	for _, m := range messages {
 		if len(m.Media) == 0 {
 			out = append(out, openaiMessage{
 				Role:             m.Role,
 				Content:          m.Content,
 				ReasoningContent: m.ReasoningContent,
 				ToolCalls:        m.ToolCalls,
 				ToolCallID:       m.ToolCallID,
 			})
 			continue
 		}
 		// Multipart content format for messages with media
 		parts := make([]map[string]any, 0, 1+len(m.Media))
 		if m.Content != "" {
 			parts = append(parts, map[string]any{
 				"type": "text",
 				"text": m.Content,
 			})
 		}
 		for _, mediaURL := range m.Media {
 			if strings.HasPrefix(mediaURL, "data:image/") {
 				parts = append(parts, map[string]any{
 					"type": "image_url",
 					"image_url": map[string]any{
 						"url": mediaURL,
 					},
 				})
 			}
 		}
 		msg := map[string]any{
 			"role":    m.Role,
 			"content": parts,
 		}
 		if m.ToolCallID != "" {
 			msg["tool_call_id"] = m.ToolCallID
 		}
 		if len(m.ToolCalls) > 0 {
 			msg["tool_calls"] = m.ToolCalls
 		}
 		if m.ReasoningContent != "" {
 			msg["reasoning_content"] = m.ReasoningContent
 		}
 		out = append(out, msg)
 	}
 	return out
 }
 func normalizeModel(model, apiBase string) string {
@ -476,34 +198,31 @@ func normalizeModel(model, apiBase string) string {
 	}
 }
-func asInt(v any) (int, bool) {
+func buildToolsList(tools []ToolDefinition, nativeSearch bool) []any {
-	switch val := v.(type) {
+	result := make([]any, 0, len(tools)+1)
-	case int:
+	for _, t := range tools {
-		return val, true
+		if nativeSearch && strings.EqualFold(t.Function.Name, "web_search") {
-	case int64:
+			continue
 		return int(val), true
 	case float64:
 		return int(val), true
 	case float32:
 		return int(val), true
 	default:
 		return 0, false
 		}
 		result = append(result, t)
 	}
 	if nativeSearch {
 		result = append(result, map[string]any{"type": "web_search_preview"})
 	}
 	return result
 }
-func asFloat(v any) (float64, bool) {
+func (p *Provider) SupportsNativeSearch() bool {
-	switch val := v.(type) {
+	return isNativeSearchHost(p.apiBase)
 	case float64:
 		return val, true
 	case float32:
 		return float64(val), true
 	case int:
 		return float64(val), true
 	case int64:
 		return float64(val), true
 	default:
 		return 0, false
 }
 func isNativeSearchHost(apiBase string) bool {
 	u, err := url.Parse(apiBase)
 	if err != nil {
 		return false
 	}
 	host := u.Hostname()
 	return host == "api.openai.com" || strings.HasSuffix(host, ".openai.azure.com")
 }
 // supportsPromptCacheKey reports whether the given API base is known to
--- a/Show more
+++ b/Show more