docs(lark-doc): document poll block xml no-meego

Change-Id: I1f1e3fd17618d29e40f93b00258c8afd92516acf
2026-08-03 08:32:46 +08:00 · 2026-07-09 03:01:12 +08:00
553 changed files with 3880 additions and 40383 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,4 @@
 name: CI
-run-name: ${{ github.event_name == 'pull_request' && format('CI / {0}', github.event.pull_request.number) || '' }}

 on:
  push:
@@ -9,12 +8,6 @@ on:
    types: [opened, synchronize, reopened, edited]
  workflow_dispatch:

-# PR metadata edits can retrigger full CI for the same head. Keep only the
-# newest run for a pull request; push and manual runs use a unique run ID.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 permissions:
  contents: read
  actions: read
@@ -54,34 +47,6 @@ jobs:
            exit 1
          fi

-  plugin-integration:
-    needs: fast-gate
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
-        with:
-          persist-credentials: false
-      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
-        with:
-          go-version-file: go.mod
-      # No fetch_meta: the git-archive clean tree must embed only the
-      # committed meta_data stub (reproduces the bare-module customer state).
-      - name: Run plugin-integration L4 tests
-        run: go test -count=1 -timeout=15m ./tests/plugin_e2e/...
-
-  sidecar-integration:
-    needs: fast-gate
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
-        with:
-          persist-credentials: false
-      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
-        with:
-          go-version-file: go.mod
-      - name: Run sidecar tag build + HMAC round-trip
-        run: make sidecar-test
-
  # ── Layer 2: Quality Gate ──────────────────────────────────────────
  unit-test:
    needs: fast-gate
@@ -121,10 +86,8 @@ jobs:
        run: echo "QUALITY_GATE_CHANGED_FROM=$(bash scripts/resolve-changed-from.sh)" >> "$GITHUB_ENV"
      - name: Run golangci-lint
        run: go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.6 run --new-from-rev="$QUALITY_GATE_CHANGED_FROM"
-      - name: Run source-contract lint guards (lintcheck)
+      - name: Run errs/ lint guards (lintcheck)
        run: go run -C lint . --changed-from "$QUALITY_GATE_CHANGED_FROM" ..
-      - name: Run lint module tests
-        run: go test -C lint ./... -count=1

  script-test:
    needs: fast-gate
@@ -211,11 +174,7 @@ jobs:
        run: python3 scripts/fetch_meta.py
      - name: Run tests with coverage
        run: |
-          # tests/ holds only L3/L4 suites (cli_e2e, plugin_e2e, sidecar_e2e) that
-          # have dedicated jobs; exclude the whole subtree so none of them runs a
-          # second time here — and, crucially, so an observe-only suite's failure
-          # can never block merges through coverage's spot in the results loop.
-          packages=$(go list ./... | grep -v '^github.com/larksuite/cli/tests/')
+          packages=$(go list ./... | grep -v '^github.com/larksuite/cli/tests/cli_e2e$' | grep -v '^github.com/larksuite/cli/tests/cli_e2e/')
          go test -race -coverprofile=coverage.txt -covermode=atomic $packages
      - name: Upload coverage to Codecov
        if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork }}
@@ -302,11 +261,6 @@ jobs:
  e2e-dry-run:
    needs: [unit-test, lint, script-test, deterministic-gate]
    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    outputs:
-      mode: ${{ steps.e2e_domains.outputs.mode }}
-      reason: ${{ steps.e2e_domains.outputs.reason }}
-      live_packages: ${{ steps.e2e_domains.outputs.live_packages }}
    steps:
      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
        with:
@@ -320,23 +274,6 @@ jobs:
      - name: Resolve CLI E2E domains
        id: e2e_domains
        run: node scripts/e2e_domains.js
-      - name: Validate CLI E2E domain outputs
-        env:
-          E2E_MODE: ${{ steps.e2e_domains.outputs.mode }}
-          E2E_LIVE_PACKAGES: ${{ steps.e2e_domains.outputs.live_packages }}
-        run: |
-          case "$E2E_MODE" in
-            skip)
-              [ -z "$E2E_LIVE_PACKAGES" ] || { echo "::error::Skip mode must not resolve live packages"; exit 1; }
-              ;;
-            full|subset)
-              [ -n "$E2E_LIVE_PACKAGES" ] || { echo "::error::No live packages resolved for mode $E2E_MODE"; exit 1; }
-              ;;
-            *)
-              echo "::error::Invalid CLI E2E mode: $E2E_MODE"
-              exit 1
-              ;;
-          esac
      - name: Build lark-cli
        if: ${{ steps.e2e_domains.outputs.mode != 'skip' }}
        run: make build
@@ -370,22 +307,16 @@ jobs:
          fi

  e2e-live:
-    needs: [unit-test, lint, script-test, deterministic-gate, e2e-dry-run]
-    if: ${{ always() && (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork) && needs.unit-test.result == 'success' && needs.lint.result == 'success' && needs.script-test.result == 'success' && needs.deterministic-gate.result == 'success' && needs.e2e-dry-run.result == 'success' && (needs.e2e-dry-run.outputs.mode == 'full' || needs.e2e-dry-run.outputs.mode == 'subset') && needs.e2e-dry-run.outputs.live_packages != '' }}
+    needs: [unit-test, lint, script-test, deterministic-gate]
+    if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork }}
    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    # Live E2E uses one repository-wide execution slot.
-    concurrency:
-      group: lark-cli-e2e-live
-      cancel-in-progress: false
-      queue: max
    permissions:
-      actions: read
      contents: read
      checks: write
    env:
      TEST_BOT1_APP_ID: ${{ secrets.TEST_BOT1_APP_ID }}
-      LARKSUITE_CLI_BRAND: feishu
+      TEST_BOT1_APP_SECRET: ${{ secrets.TEST_BOT1_APP_SECRET }}
+      TEST_USER_ACCESS_TOKEN: ${{ secrets.TEST_USER_ACCESS_TOKEN }}
    steps:
      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
        with:
@@ -396,68 +327,31 @@ jobs:
      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
        with:
          python-version: '3.x'
+      - name: Resolve CLI E2E domains
+        id: e2e_domains
+        run: node scripts/e2e_domains.js
      - name: Build lark-cli
-        id: build_cli
+        if: ${{ steps.e2e_domains.outputs.mode != 'skip' }}
        run: make build
-      - name: Prepare shared live E2E tenant token
-        id: live_e2e_tat
-        env:
-          LARKSUITE_CLI_APP_ID: ${{ secrets.TEST_BOT1_APP_ID }}
-          TEST_BOT1_APP_SECRET: ${{ secrets.TEST_BOT1_APP_SECRET }}
-        run: node scripts/fetch_e2e_tat.js
-      - name: Run CLI E2E tests
-        # Keep an active Go test alive so t.Cleanup can finish. A queued stale
-        # run is rejected below before it can start live E2E.
-        if: ${{ always() && steps.build_cli.outcome == 'success' && steps.live_e2e_tat.outcome == 'success' }}
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-          REPOSITORY: ${{ github.repository }}
-          EVENT_NAME: ${{ github.event_name }}
-          RUN_ID: ${{ github.run_id }}
-          RUN_NUMBER: ${{ github.run_number }}
-          RUN_GENERATION: ${{ github.event_name == 'pull_request' && format('CI / {0}', github.event.pull_request.number) || '' }}
-          LARK_CLI_BIN: ${{ github.workspace }}/lark-cli
-          E2E_MODE: ${{ needs.e2e-dry-run.outputs.mode }}
-          E2E_REASON: ${{ needs.e2e-dry-run.outputs.reason }}
-          E2E_LIVE_PACKAGES: ${{ needs.e2e-dry-run.outputs.live_packages }}
-          E2E_TENANT_AUTH_FILE: ${{ steps.live_e2e_tat.outputs.path }}
-          TEST_USER_ACCESS_TOKEN: ${{ secrets.TEST_USER_ACCESS_TOKEN }}
+      - name: Configure bot credentials
+        if: ${{ steps.e2e_domains.outputs.mode != 'skip' }}
        run: |
-          if [ "$EVENT_NAME" = "pull_request" ]; then
-            workflow_id="$(gh api "repos/$REPOSITORY/actions/runs/$RUN_ID" --jq '.workflow_id')"
-            newer_runs="$(
-              gh api --paginate -X GET "repos/$REPOSITORY/actions/workflows/$workflow_id/runs" \
-                -f event=pull_request -f branch="$GITHUB_HEAD_REF" -f per_page=100 |
-                jq -r --arg repository "$REPOSITORY" --arg generation "$RUN_GENERATION" --argjson run_number "$RUN_NUMBER" \
-                  '.workflow_runs[] | select(.head_repository.full_name == $repository and .display_title == $generation and .run_number > $run_number) | .id'
-            )"
-            if [ -n "$newer_runs" ]; then
-              echo "::error::Superseded before live E2E started by newer workflow run(s): $newer_runs"
-              exit 1
-            fi
-          fi
-          if [ -z "${E2E_TENANT_AUTH_FILE:-}" ] || [ ! -f "$E2E_TENANT_AUTH_FILE" ]; then
-            echo "::error::Missing shared live E2E tenant token file"
+          if [ -z "$TEST_BOT1_APP_ID" ] || [ -z "$TEST_BOT1_APP_SECRET" ]; then
+            echo "::error::Missing required secrets: TEST_BOT1_APP_ID / TEST_BOT1_APP_SECRET"
            exit 1
          fi
-          export TEST_TENANT_ACCESS_TOKEN="$(cat "$E2E_TENANT_AUTH_FILE")"
-          rm -f "$E2E_TENANT_AUTH_FILE"
-          if ! LARKSUITE_CLI_APP_ID="$TEST_BOT1_APP_ID" \
-            LARKSUITE_CLI_TENANT_ACCESS_TOKEN="$TEST_TENANT_ACCESS_TOKEN" \
-            ./lark-cli whoami --as bot | node -e '
-            let input = "";
-            process.stdin.setEncoding("utf8");
-            process.stdin.on("data", (chunk) => { input += chunk; });
-            process.stdin.on("end", () => {
-              const result = JSON.parse(input);
-              if (result.identity !== "bot" || result.available !== true || result.tokenStatus !== "ready") process.exit(1);
-            });
-          '; then
-            echo "::error::Tenant credential preflight failed"
-            exit 1
+          printf '%s\n' "$TEST_BOT1_APP_SECRET" | ./lark-cli config init --app-id "$TEST_BOT1_APP_ID" --app-secret-stdin
+      - name: Run CLI E2E tests
+        env:
+          LARK_CLI_BIN: ${{ github.workspace }}/lark-cli
+          E2E_MODE: ${{ steps.e2e_domains.outputs.mode }}
+          E2E_REASON: ${{ steps.e2e_domains.outputs.reason }}
+          E2E_LIVE_PACKAGES: ${{ steps.e2e_domains.outputs.live_packages }}
+        run: |
+          if [ "$E2E_MODE" = "skip" ]; then
+            echo "No live CLI E2E needed: $E2E_REASON"
+            exit 0
          fi
-          echo "Tenant credential preflight succeeded"
          packages="$E2E_LIVE_PACKAGES"
          if [ -z "$packages" ]; then
            echo "::error::No live CLI E2E packages resolved for mode $E2E_MODE"
@@ -467,7 +361,7 @@ jobs:
          echo "Live CLI E2E packages: $packages"
          go run gotest.tools/gotestsum@v1.12.3 --rerun-fails=2 --rerun-fails-max-failures=20 --packages="$packages" --format testname --junitfile cli-e2e-report.xml -- -count=1 -v
      - name: Publish CLI E2E test report
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && steps.e2e_domains.outputs.mode != 'skip' }}
        uses: dorny/test-reporter@a43b3a5f7366b97d083190328d2c652e1a8b6aa2 # v3.0.0
        with:
          name: CLI E2E Tests
@@ -520,7 +414,7 @@ jobs:
  # ── Results Gate (single required check for branch protection) ─────
  results:
    if: ${{ always() }}
-    needs: [fast-gate, unit-test, lint, script-test, deterministic-gate, coverage, deadcode, e2e-dry-run, e2e-live, security, license-header, plugin-integration, sidecar-integration]
+    needs: [fast-gate, unit-test, lint, script-test, deterministic-gate, coverage, deadcode, e2e-dry-run, e2e-live, security, license-header]
    runs-on: ubuntu-latest
    steps:
      - name: Evaluate results
@@ -540,19 +434,10 @@ jobs:
          echo "| L3 | e2e-live | ${{ needs.e2e-live.result }} |" >> $GITHUB_STEP_SUMMARY
          echo "| L4 | security | ${{ needs.security.result }} |" >> $GITHUB_STEP_SUMMARY
          echo "| L4 | license-header | ${{ needs.license-header.result }} |" >> $GITHUB_STEP_SUMMARY
-          echo "| L4 | plugin-integration (observe-only) | ${{ needs.plugin-integration.result }} |" >> $GITHUB_STEP_SUMMARY
-          echo "| L4 | sidecar-integration (observe-only) | ${{ needs.sidecar-integration.result }} |" >> $GITHUB_STEP_SUMMARY

          # Any failure or cancellation in any job blocks the merge.
-          # Legitimately skipped jobs (deadcode on push, e2e-live when not
-          # needed or on a fork, license-header on push) are OK.
-          #
-          # plugin-integration and sidecar-integration are intentionally NOT
-          # in this loop yet: they run on every PR and their status is shown
-          # in the table above, but a failure is observe-only (non-blocking)
-          # during the initial soak. Graduation to required is tracked in
-          # https://github.com/larksuite/cli/issues/1894 (criteria: 4
-          # consecutive weeks with zero false positives).
+          # Legitimately skipped jobs (deadcode on push, e2e-live on fork,
+          # license-header on push) are OK.
          FAILED=0
          for result in \
            "${{ needs.fast-gate.result }}" \
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,54 +9,10 @@ permissions:
  contents: read

 jobs:
-  preflight:
+  goreleaser:
    runs-on: ubuntu-22.04
    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6
-        with:
-          node-version: '22.14.0'
-
-      - name: Validate tag and commit
-        env:
-          TAG: ${{ github.ref_name }}
-          REHEARSAL_BRANCH: test/npm-staged-publish-rehearsal
-        run: |
-          set -euo pipefail
-          node scripts/release-preflight.js --tag "$TAG"
-          HEAD_SHA="$(git rev-parse --verify 'HEAD^{commit}')"
-          TAG_SHA="$(git rev-parse --verify "refs/tags/${TAG}^{commit}")"
-          if [[ "$TAG_SHA" != "$HEAD_SHA" ]]; then
-            echo "Tag ${TAG} does not resolve to the checked-out HEAD commit." >&2
-            exit 1
-          fi
-
-          if [[ "$TAG" == *-beta.* ]]; then
-            git fetch origin "$REHEARSAL_BRANCH"
-            REHEARSAL_SHA="$(git rev-parse --verify 'FETCH_HEAD^{commit}')"
-            if [[ "$HEAD_SHA" != "$REHEARSAL_SHA" ]]; then
-              echo "Beta rehearsal tag ${TAG} must point to the current origin/${REHEARSAL_BRANCH} commit." >&2
-              exit 1
-            fi
-          else
-            git fetch origin main
-            MAIN_SHA="$(git rev-parse --verify 'FETCH_HEAD^{commit}')"
-            if ! git merge-base --is-ancestor "$HEAD_SHA" "$MAIN_SHA"; then
-              echo "Tag ${TAG} does not point to a commit contained in origin/main." >&2
-              exit 1
-            fi
-          fi
-
-  build-stage-assets:
-    needs: preflight
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: read
+      contents: write
    steps:
      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
        with:
@@ -70,87 +26,35 @@ jobs:
        with:
          python-version: '3.x'

-      - uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6
-        with:
-          node-version: '22.14.0'
-          registry-url: 'https://registry.npmjs.org'
-          package-manager-cache: false
-
-      - name: Install pinned npm
-        run: npm install --global npm@11.16.0
-
      - name: Run GoReleaser
        uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6
        with:
          version: '~> v2'
-          args: release --clean --skip=publish
-
-      - name: Verify release checksums
-        run: |
-          set -euo pipefail
-          printf '%064d  dist/rehearsal-checksum-mismatch\n' 0 >> dist/checksums.txt
-          test -s dist/checksums.txt
-          (cd dist && sha256sum --check checksums.txt)
-          cp dist/checksums.txt checksums.txt
-
-      - name: Pack npm tarball
-        id: pack
-        run: |
-          set -euo pipefail
-          PACK_JSON="$(npm pack --ignore-scripts --json)"
-          PACK_FILE="$(node -e 'const p=JSON.parse(process.argv[1]); if(p.length!==1 || !p[0].filename) process.exit(1); process.stdout.write(p[0].filename)' "$PACK_JSON")"
-          test -s "$PACK_FILE"
-          tar -tzf "$PACK_FILE" | grep -qx 'package/checksums.txt'
-          echo "filename=$PACK_FILE" >> "$GITHUB_OUTPUT"
-
-      - name: Collect rehearsal assets
+          args: release --clean
        env:
-          PACK_FILE: ${{ steps.pack.outputs.filename }}
-        run: |
-          set -euo pipefail
-          mkdir staged-release-assets
-          cp dist/*.tar.gz dist/*.zip dist/checksums.txt "$PACK_FILE" staged-release-assets/
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-      - name: Upload rehearsal artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        with:
-          name: staged-release-assets-${{ github.run_id }}
-          path: staged-release-assets/
-          if-no-files-found: error
-          overwrite: true
-
-  stage-publish:
-    needs: build-stage-assets
+  publish-npm:
+    needs: goreleaser
    runs-on: ubuntu-22.04
-    environment: npm-production
-    permissions:
-      id-token: write
    steps:
-      - uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
        with:
-          node-version: '22.14.0'
+          node-version: '20'
          registry-url: 'https://registry.npmjs.org'
-          package-manager-cache: false

-      - name: Install pinned npm
-        run: npm install --global npm@11.16.0
-
-      - name: Download rehearsal artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
-        with:
-          name: staged-release-assets-${{ github.run_id }}
-          path: staged-release-assets
-
-      - name: Verify rehearsal asset
-        id: asset
+      - name: Download checksums from release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
          set -euo pipefail
-          (cd staged-release-assets && sha256sum --check checksums.txt)
-          PACK_FILE="$(find staged-release-assets -maxdepth 1 -type f -name '*.tgz' -print -quit)"
-          test -n "$PACK_FILE"
-          test -s "$PACK_FILE"
-          tar -tzf "$PACK_FILE" | grep -qx 'package/checksums.txt'
-          echo "filename=$PACK_FILE" >> "$GITHUB_OUTPUT"
+          TAG="${GITHUB_REF_NAME}"
+          gh release download "${TAG}" --pattern checksums.txt --dir .
+          test -s checksums.txt || { echo "checksums.txt missing or empty for ${TAG}"; exit 1; }

-      - name: Stage npm package
-        run: npm stage publish "${{ steps.asset.outputs.filename }}" --access public --tag beta
+      - name: Publish to npm
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm publish --access public
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -105,20 +105,6 @@ Signatures that are easy to guess wrong:

 Program output (JSON envelopes) goes to stdout. Progress, warnings, hints go to stderr. Mixing them corrupts pipe chains.

-### Typed data over loose maps
-
-Parse `map[string]interface{}` into a typed struct at the boundary — one projection function per shape — and let everything downstream consume struct fields, not string keys. A typo'd map key compiles fine and fails at runtime, which an agent then debugs blind.
-
-Use distinct types when two values could be swapped silently: see `internal/meta.Token` — a bare string compiles on either side of a string/string signature, a distinct type does not.
-
-Legacy loose-map code exists in older paths. Match its call sites when touching it, but do not copy the pattern into new code.
-
-### Transcribe faithfully — no silent fallbacks
-
-When code echoes input onward (request previews, transformations, proxies), transcribe verbatim. A `default:` branch that coerces unrecognized input into a plausible value ("unknown HTTP verb → GET") makes the output lie, and an agent reasons from the lie.
-
-The same rule applies to flag combinations and internal wiring: if a requested option cannot be honored, return a typed validation error — never silently substitute another behavior and exit 0. Silent guesses (defaulting a missing identity, discarding writes on a nil writer) are bugs even when every current caller happens to avoid them.
-
 ### Use `vfs.*` instead of `os.*`

 All filesystem access goes through `internal/vfs`. This enables test mocking.
@@ -130,7 +116,6 @@ CLI arguments are untrusted (they come from AI agents). Call `validate.SafeInput
 ### Tests

 - Every behavior change needs a test alongside the change.
- A contract test must fail if the implementation is reverted. If you can undo the code change and the suite stays green, the contract is not pinned — assert the new field/behavior directly, not a happy-path substring.
 - `cmdutil.TestFactory(t, config)` for test factories.
 - `t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())` to isolate config state.

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,160 +2,6 @@

 All notable changes to this project will be documented in this file.

-## [v1.0.72] - 2026-07-17
-
-### Features
-
- **slides**: lint table out of canvas
- **slides**: report resolved table size mismatches
- **approval**: support approval event consumption (#1924)
-
-### Bug Fixes
-
- **vc**: don't fail +detail for in-progress meetings (#1930)
- stabilize drive delete E2E terminal-state checks (#1939)
-
-### Documentation
-
- **slides**: document table dimensions
- document base field default values (#1500)
- **sheets**: use English placeholder in table-get guidance (#1936)
-
-### Tests
-
- stabilize live e2e auth retries (#1904)
- use tri-state wiki node identity in delete verification (#1931)
- fix drive cover download retries (#1934)
-
-## [v1.0.71] - 2026-07-16
-
-### Features
-
- add wiki move-to-drive shortcut (#1869)
- **apps**: add role management shortcuts (#1881)
- **drive**: add secure label support and clarify comment location API (#1913)
-
-### Bug Fixes
-
- **base**: improve dashboard shortcut guidance (#1787)
-
-### Documentation
-
- **apps**: add platform SQL authoring guide to the db-execute skill (#1912)
-
-### Misc
-
- add L4 plugin-integration and sidecar-integration CI jobs (#1840)
- **drive**: optimize drive +delete workflow (#1909)
-
-## [v1.0.70] - 2026-07-15
-
-### Features
-
- add minutes permission application shortcut (#1876)
- **drive**: support apps in list comments (#1877)
- slide style
- edit ppt template
- **slides**: add sxsd validation to slides lint
- **slides**: validate iconpark icon types in slides lint
- **slides**: lint before create
- **apps**: add automation trigger commands for Miaoda (#1886)
-
-### Bug Fixes
-
- unify dry-run output contract (#1870)
- **skills**: align skill guidance with the typed error contract (#1786)
- **slides**: limit slides screenshot page requests
- **slides**: detect lark slides text overflow overlap
- **vc**: align meeting query scopes by identity (#1850)
-
-### Documentation
-
- clarify task search relevance filters (#1884)
- surface minutes permission application in skill description (#1890)
- clarify okr progress children (#1861)
- **slides**: prefer slides xml-get shortcut
- **calendar**: document setting meeting owner via full API (#1903)
-
-### Refactoring
-
- **slides**: streamline create workflow and validate SML namespaces
-
-### Misc
-
- **slides**: address PR review feedback
-
-## [v1.0.69] - 2026-07-13
-
-### Features
-
- support docs fetch selection anchors (#1815)
- **apps**: support modern_html app type with TOS publish path and app type querying
- **im**: show bot sender display names when reading messages (#1829)
- add drive list comments shortcut (#1845)
- support wiki sources in drive export (#1802)
- add application domain with slash command management shortcuts (#1806)
- validate IM idempotency key length (#1797)
- surface reply context and mentions in im.message.receive_v1 (#1798)
-
-### Bug Fixes
-
- route brand-sensitive endpoints through the resolver (#1836)
-
-### Documentation
-
- document OKR block XML guidance (#1648)
- refine doubao whiteboard workflow routing (#1841)
- clarify Mindnote token handling (#1827)
-
-### Tests
-
- isolate semantic waiver fixtures from wall clock
-
-### Misc
-
- Merge lark sheets development branch (#1833)
-
-## [v1.0.68] - 2026-07-09
-
-### Features
-
- **drive**: Strengthen lark-drive high-risk write operations and read-only recognition boundaries. (#1801)
- **slides**: add slides chart demo reference
-
-### Bug Fixes
-
- register and consume --json shorthand for custom-format shortcuts (#1737)
- **drive**: abort push on parent sibling limit (#1813)
-
-### Documentation
-
- require native charts in slide planning
- register knowledge organize workflow (#1828)
-
-## [v1.0.67] - 2026-07-08
-
-### Features
-
- **mail**: add message modify and trash shortcuts (#1567)
- support whiteboard file inputs in docs XML (#1784)
- **vc**: refine meeting-events output and reaction forwarding (#1674)
- **affordance**: usage guidance for shortcuts and per-command skills (#1793)
-
-### Bug Fixes
-
- accept opaque wiki node tokens (#1789)
- **apps**: make db --environment optional, auto-select branch server-side (#1735)
- preserve original filename in multipart file upload (#1767)
-
-### Documentation
-
- restore one-time authorization guidance in lark-apps skill (#1794)
-
-### Misc
-
- e2e: harden CLI E2E retry, cleanup, and domain selection (#1709)
-
 ## [v1.0.66] - 2026-07-07

 ### Features
@@ -1552,12 +1398,6 @@ Bundled AI agent skills for intelligent assistance:
 - Bilingual documentation (English & Chinese).
 - CI/CD pipelines: linting, testing, coverage reporting, and automated releases.

-[v1.0.72]: https://github.com/larksuite/cli/releases/tag/v1.0.72
-[v1.0.71]: https://github.com/larksuite/cli/releases/tag/v1.0.71
-[v1.0.70]: https://github.com/larksuite/cli/releases/tag/v1.0.70
-[v1.0.69]: https://github.com/larksuite/cli/releases/tag/v1.0.69
-[v1.0.68]: https://github.com/larksuite/cli/releases/tag/v1.0.68
-[v1.0.67]: https://github.com/larksuite/cli/releases/tag/v1.0.67
 [v1.0.66]: https://github.com/larksuite/cli/releases/tag/v1.0.66
 [v1.0.65]: https://github.com/larksuite/cli/releases/tag/v1.0.65
 [v1.0.64]: https://github.com/larksuite/cli/releases/tag/v1.0.64
--- a/15
+++ b/15
@@ -23,7 +23,7 @@ PREFIX   ?= /usr/local
 TEST_GOARCH := $(or $(GOARCH),$(shell go env GOARCH))
 RACE_FLAG := $(if $(filter riscv64,$(TEST_GOARCH)),,-race)

-.PHONY: all build vet fmt-check script-test test unit-test integration-test examples-build quality-gate install uninstall clean fetch_meta gitleaks sidecar-test
+.PHONY: all build vet fmt-check script-test test unit-test integration-test examples-build quality-gate install uninstall clean fetch_meta gitleaks

 all: test

@@ -51,7 +51,7 @@ script-test:
 	bash scripts/resolve-changed-from.test.sh
 	bash scripts/ci-workflow.test.sh
 	bash scripts/semantic-review-workflow.test.sh
-	$(NODE) --test scripts/e2e_domains.test.js scripts/fetch_e2e_tat.test.js scripts/install.test.js scripts/release-preflight.test.js scripts/release-workflow.test.js scripts/semantic-review-verify-artifact.test.js scripts/pr-quality-summary.test.js scripts/semantic-review-publish.test.js scripts/ci-quality-summary-publish.test.js
+	$(NODE) --test scripts/e2e_domains.test.js scripts/semantic-review-verify-artifact.test.js scripts/pr-quality-summary.test.js scripts/semantic-review-publish.test.js scripts/ci-quality-summary-publish.test.js

 # ./extension/... keeps the public plugin SDK in the default test matrix.
 unit-test: fetch_meta
@@ -64,9 +64,6 @@ examples-build:
 	go build ./extension/platform/examples/audit-observer
 	go build ./extension/platform/examples/readonly-policy

-# ./tests/... includes tests/plugin_e2e, which builds ~20 customer-fork
-# binaries (~1 min warm; a cold module cache also downloads via GOPROXY).
-# Deliberate: local `make test` exercises the L4 plugin contract by default.
 integration-test: build
 	go test -v -count=1 ./tests/...

@@ -108,14 +105,6 @@ uninstall:
 clean:
 	rm -f $(BINARY)

-# sidecar-test compiles and runs the authsidecar* build-tagged code that the
-# default CI matrix never sees (they carry //go:build tags).
-sidecar-test:
-	go build -tags authsidecar -o /dev/null .
-	go test $(RACE_FLAG) -count=1 -tags authsidecar ./extension/credential/sidecar/ ./extension/transport/sidecar/ ./internal/cmdutil/
-	go test $(RACE_FLAG) -count=1 -tags authsidecar_demo ./sidecar/server-demo/
-	go test $(RACE_FLAG) -count=1 -tags authsidecar ./tests/sidecar_e2e/
-
 # Run secret-leak checks locally before pushing.
 # Step 1: check-doc-tokens catches realistic-looking example tokens in reference
 #         docs and asks you to use _EXAMPLE_TOKEN placeholders instead.
--- a/cmd/api/api.go
+++ b/cmd/api/api.go
@@ -130,13 +130,6 @@ func buildAPIRequest(opts *APIOptions) (client.RawApiRequest, *cmdutil.FileUploa
 	stdin := opts.Factory.IOStreams.In
 	fileIO := opts.Factory.ResolveFileIO(opts.Ctx)

-	if opts.Method == "" {
-		return client.RawApiRequest{}, nil, errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"HTTP method must not be empty").
-			WithHint("pass the verb as the first argument, e.g. lark-cli api GET /open-apis/...").
-			WithParam("<method>")
-	}
-
 	// Validate --file mutual exclusions first.
 	if err := cmdutil.ValidateFileFlag(opts.File, opts.Params, opts.Data, opts.Output, opts.PageAll, opts.Method); err != nil {
 		return client.RawApiRequest{}, nil, err
@@ -250,9 +243,9 @@ func apiRun(opts *APIOptions) error {

 	if opts.DryRun {
 		if fileMeta != nil {
-			return cmdutil.PrintDryRunWithFile(request, config, dryRunOutputOptions(f, opts), *fileMeta)
+			return cmdutil.PrintDryRunWithFile(f.IOStreams.Out, request, config, opts.Format, fileMeta.FieldName, fileMeta.FilePath, fileMeta.FormFields)
 		}
-		return apiDryRun(f, request, config, opts)
+		return apiDryRun(f, request, config, opts.Format)
 	}
 	// Identity info is now included in the JSON envelope; skip stderr printing.
 	// cmdutil.PrintIdentity(f.IOStreams.ErrOut, opts.As, config, f.IdentityAutoDetected)
@@ -304,19 +297,8 @@ func apiRun(opts *APIOptions) error {
 	return nil
 }

-func apiDryRun(f *cmdutil.Factory, request client.RawApiRequest, config *core.CliConfig, opts *APIOptions) error {
-	return cmdutil.PrintDryRun(request, config, dryRunOutputOptions(f, opts))
-}
-
-func dryRunOutputOptions(f *cmdutil.Factory, opts *APIOptions) cmdutil.DryRunOutputOptions {
-	return cmdutil.DryRunOutputOptions{
-		Format:      opts.Format,
-		JqExpr:      opts.JqExpr,
-		CommandPath: opts.Cmd.CommandPath(),
-		Identity:    opts.As,
-		Out:         f.IOStreams.Out,
-		ErrOut:      f.IOStreams.ErrOut,
-	}
+func apiDryRun(f *cmdutil.Factory, request client.RawApiRequest, config *core.CliConfig, format string) error {
+	return cmdutil.PrintDryRun(f.IOStreams.Out, request, config, format)
 }

 func apiPaginate(ctx context.Context, ac *client.APIClient, request client.RawApiRequest, format output.Format, jqExpr string, out, errOut io.Writer, commandPath string, pagOpts client.PaginationOptions) error {
--- a/cmd/api/api_test.go
+++ b/cmd/api/api_test.go
@@ -69,7 +69,7 @@ func TestApiCmd_FlagParsing(t *testing.T) {
 }

 func TestApiCmd_DryRun(t *testing.T) {
-	f, stdout, stderr, _ := cmdutil.TestFactory(t, &core.CliConfig{
+	f, stdout, _, _ := cmdutil.TestFactory(t, &core.CliConfig{
 		AppID: "test-app", AppSecret: "test-secret", Brand: core.BrandFeishu,
 	})

@@ -79,42 +79,12 @@ func TestApiCmd_DryRun(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	var got map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &got); err != nil {
-		t.Fatalf("dry-run stdout is not JSON: %v\nstdout:\n%s\nstderr:\n%s", err, stdout.String(), stderr.String())
+	output := stdout.String()
+	if !strings.Contains(output, "Dry Run") {
+		t.Error("expected dry run output")
 	}
-	if got["ok"] != true || got["identity"] != "bot" || got["dry_run"] != true {
-		t.Fatalf("unexpected dry-run envelope: %#v", got)
-	}
-	data, ok := got["data"].(map[string]interface{})
-	if !ok {
-		t.Fatalf("data = %#v, want object", got["data"])
-	}
-	api, ok := data["api"].([]interface{})
-	if !ok || len(api) != 1 {
-		t.Fatalf("api = %#v, want one call", data["api"])
-	}
-	call, ok := api[0].(map[string]interface{})
-	if !ok || call["url"] != "/open-apis/test" {
-		t.Fatalf("api[0] = %#v", api[0])
-	}
-	if strings.Contains(stdout.String(), "=== Dry Run ===") {
-		t.Fatalf("stdout should not contain dry-run banner: %s", stdout.String())
-	}
-}
-
-func TestApiCmd_DryRunWithJq(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, &core.CliConfig{
-		AppID: "test-app", AppSecret: "test-secret", Brand: core.BrandFeishu,
-	})
-
-	cmd := newTestApiCmd(f, nil)
-	cmd.SetArgs([]string{"GET", "/open-apis/test", "--as", "bot", "--dry-run", "--jq", ".data.api[0].url"})
-	if err := cmd.Execute(); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if got := strings.TrimSpace(stdout.String()); got != "/open-apis/test" {
-		t.Fatalf("jq output = %q, want /open-apis/test", got)
+	if !strings.Contains(output, "/open-apis/test") {
+		t.Error("expected path in dry run output")
 	}
 }

@@ -182,22 +152,6 @@ func TestApiCmd_MissingArgs(t *testing.T) {
 	}
 }

-func TestApiCmd_EmptyMethodRejected(t *testing.T) {
-	f, _, _, _ := cmdutil.TestFactory(t, &core.CliConfig{
-		AppID: "test-app", AppSecret: "test-secret", Brand: core.BrandFeishu,
-	})
-
-	cmd := newTestApiCmd(f, nil)
-	cmd.SetArgs([]string{"", "/open-apis/test", "--as", "bot", "--dry-run"})
-	err := cmd.Execute()
-	if err == nil {
-		t.Fatal("expected validation error for empty HTTP method")
-	}
-	if !strings.Contains(err.Error(), "method") {
-		t.Fatalf("error should name the method argument, got: %v", err)
-	}
-}
-
 func TestApiCmd_InvalidParamsJSON(t *testing.T) {
 	f, _, _, _ := cmdutil.TestFactory(t, &core.CliConfig{
 		AppID: "test-app", AppSecret: "test-secret", Brand: core.BrandFeishu,
@@ -1046,23 +1000,11 @@ func TestApiCmd_DryRunWithFile(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	out := stdout.String()
-	var env map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &env); err != nil {
-		t.Fatalf("dry-run stdout is not JSON: %v\n%s", err, out)
+	if !strings.Contains(out, "image") {
+		t.Errorf("expected dry-run output to mention file field, got: %s", out)
 	}
-	if env["dry_run"] != true {
-		t.Fatalf("dry_run = %#v, want true", env["dry_run"])
-	}
-	data := env["data"].(map[string]interface{})
-	api := data["api"].([]interface{})
-	call := api[0].(map[string]interface{})
-	body := call["body"].(map[string]interface{})
-	file := body["file"].(map[string]interface{})
-	if file["field"] != "image" || file["path"] != tmpFile {
-		t.Fatalf("unexpected file dry-run body: %#v", body)
-	}
-	if strings.Contains(out, "=== Dry Run ===") {
-		t.Fatalf("stdout should not contain dry-run banner: %s", out)
+	if !strings.Contains(out, "Dry Run") {
+		t.Errorf("expected dry-run header, got: %s", out)
 	}
 }

--- a/cmd/auth/login_messages.go
+++ b/cmd/auth/login_messages.go
@@ -128,5 +128,5 @@ func getLoginMsg(lang i18n.Lang) *loginMsg {
 // (not backed by from_meta service specs). Descriptions are now centralized in
 // service_descriptions.json.
 func getShortcutOnlyDomainNames() []string {
-	return []string{"application", "base", "contact", "docs", "markdown", "apps", "note"}
+	return []string{"base", "contact", "docs", "markdown", "apps", "note"}
 }
--- a/cmd/build.go
+++ b/cmd/build.go
@@ -25,10 +25,8 @@ import (
 	"github.com/larksuite/cli/internal/build"
 	"github.com/larksuite/cli/internal/cmdpolicy"
 	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/hook"
 	"github.com/larksuite/cli/internal/keychain"
-	"github.com/larksuite/cli/internal/registry"
 	"github.com/larksuite/cli/shortcuts"
 	"github.com/spf13/cobra"
 )
@@ -44,18 +42,6 @@ type buildConfig struct {
 	skipStrictMode bool
 	skipService    bool
 	serviceCatalog *apicatalog.Catalog
-	startupBrand   core.LarkBrand
-}
-
-// WithStartupBrand initializes the API registry with the given brand before
-// any command registration touches the runtime catalog. Without it the
-// registry's sync.Once locks onto the Feishu default at first catalog access,
-// long before the lazily-resolved config brand is known — see
-// ResolveStartupBrand for the caller-side resolution.
-func WithStartupBrand(brand core.LarkBrand) BuildOption {
-	return func(c *buildConfig) {
-		c.startupBrand = brand
-	}
 }

 // WithIO sets the IO streams for the CLI by wrapping raw reader/writers.
@@ -168,12 +154,6 @@ func buildInternal(ctx context.Context, inv cmdutil.InvocationContext, opts ...B
 		cfg.streams = cmdutil.SystemIO()
 	}

-	// Initialize the registry brand before anything touches the runtime
-	// catalog (its sync.Once would otherwise lock onto the Feishu default).
-	if cfg.startupBrand != "" {
-		registry.InitWithBrand(cfg.startupBrand)
-	}
-
 	f := cmdutil.NewDefault(cfg.streams, inv)
 	if cfg.keychain != nil {
 		f.Keychain = cfg.keychain
--- a/cmd/config/bind_test.go
+++ b/cmd/config/bind_test.go
@@ -916,6 +916,25 @@ func TestReadDotenv_ValueWithEquals(t *testing.T) {
 	}
 }

+func TestNormalizeBrand(t *testing.T) {
+	tests := []struct {
+		input string
+		want  string
+	}{
+		{"", "feishu"},
+		{"feishu", "feishu"},
+		{"lark", "lark"},
+		{"LARK", "lark"},
+		{" lark ", "lark"},
+		{"Lark", "lark"},
+	}
+	for _, tt := range tests {
+		if got := normalizeBrand(tt.input); got != tt.want {
+			t.Errorf("normalizeBrand(%q) = %q, want %q", tt.input, got, tt.want)
+		}
+	}
+}
+
 func TestResolveOpenClawConfigPath_Overrides(t *testing.T) {
 	t.Run("OPENCLAW_CONFIG_PATH wins", func(t *testing.T) {
 		custom := filepath.Join(t.TempDir(), "custom.json")
--- a/cmd/config/binder.go
+++ b/cmd/config/binder.go
@@ -205,7 +205,7 @@ func (b *openclawBinder) Build(appID string) (*core.AppConfig, error) {
 	return &core.AppConfig{
 		AppId:     selected.AppID,
 		AppSecret: stored,
-		Brand:     core.ParseBrand(selected.Brand),
+		Brand:     core.LarkBrand(normalizeBrand(selected.Brand)),
 	}, nil
 }

@@ -261,7 +261,7 @@ func (b *hermesBinder) Build(appID string) (*core.AppConfig, error) {
 	return &core.AppConfig{
 		AppId:     appID,
 		AppSecret: stored,
-		Brand:     core.ParseBrand(b.envMap["FEISHU_DOMAIN"]),
+		Brand:     core.LarkBrand(normalizeBrand(b.envMap["FEISHU_DOMAIN"])),
 	}, nil
 }

@@ -326,7 +326,7 @@ func (b *larkChannelBinder) Build(appID string) (*core.AppConfig, error) {
 	return &core.AppConfig{
 		AppId:     appID,
 		AppSecret: stored,
-		Brand:     core.ParseBrand(b.cfg.Accounts.App.Tenant),
+		Brand:     core.LarkBrand(normalizeBrand(b.cfg.Accounts.App.Tenant)),
 	}, nil
 }

@@ -350,6 +350,16 @@ func sourceDisplayName(source string) string {
 	}
 }

+// normalizeBrand applies .strip().lower() and defaults to "feishu".
+// Aligns with Hermes gateway/platforms/feishu.py:1119 behavior.
+func normalizeBrand(raw string) string {
+	s := strings.TrimSpace(strings.ToLower(raw))
+	if s == "" {
+		return "feishu"
+	}
+	return s
+}
+
 // resolveHermesEnvPath returns the path to Hermes's .env file.
 // Respects HERMES_HOME override; defaults to ~/.hermes/.env.
 //
--- a/cmd/config/init_interactive.go
+++ b/cmd/config/init_interactive.go
@@ -5,9 +5,7 @@ package config

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

 	"github.com/charmbracelet/huh"
 	"github.com/larksuite/cli/internal/build"
@@ -182,9 +180,9 @@ func runCreateAppFlow(ctx context.Context, f *cmdutil.Factory, brandOverride cor
 	// Use the shared proxy-plugin-aware transport so registration traffic is not
 	// a bypass of proxy plugin mode.
 	httpClient := transport.NewHTTPClient(0)
-	authResp, err := larkauth.RequestAppRegistration(ctx, httpClient, larkBrand, f.IOStreams.ErrOut)
+	authResp, err := larkauth.RequestAppRegistration(httpClient, larkBrand, f.IOStreams.ErrOut)
 	if err != nil {
-		return nil, classifyRegistrationBeginError(err)
+		return nil, errs.NewConfigError(errs.SubtypeInvalidClient, "app registration failed: %v", err).WithCause(err)
 	}

 	// Step 2: Build and display verification URL + QR code
@@ -210,17 +208,33 @@ func runCreateAppFlow(ctx context.Context, f *cmdutil.Factory, brandOverride cor
 		fmt.Fprintf(f.IOStreams.ErrOut, "  %s\n\n", verificationURL)
 		fmt.Fprintf(f.IOStreams.ErrOut, "%s\n", msg.WaitingForScanNonTTY)
 	}
-	// Step 4: Poll for credentials (brand discovery lives in internal/auth);
-	// this layer only classifies the terminal error and saves the result.
-	result, finalBrand, err := larkauth.RegisterAppWithDiscovery(ctx, httpClient, authResp, f.IOStreams.ErrOut)
+	result, err := larkauth.PollAppRegistration(ctx, httpClient, core.BrandFeishu, authResp.DeviceCode, authResp.Interval, authResp.ExpiresIn, f.IOStreams.ErrOut)
 	if err != nil {
-		return nil, classifyRegistrationError(err)
+		return nil, errs.NewAuthenticationError(errs.SubtypeUnknown, "%v", err).WithCause(err)
+	}
+
+	// Step 4: Handle Lark brand special case
+	// If tenant_brand=lark and no client_secret, retry with lark brand endpoint
+	if result.ClientSecret == "" && result.UserInfo != nil && result.UserInfo.TenantBrand == "lark" {
+		// fmt.Fprintf(f.IOStreams.ErrOut, "%s\n", msg.DetectedLarkTenant)
+		result, err = larkauth.PollAppRegistration(ctx, httpClient, core.BrandLark, authResp.DeviceCode, authResp.Interval, authResp.ExpiresIn, f.IOStreams.ErrOut)
+		if err != nil {
+			return nil, errs.NewNetworkError(errs.SubtypeNetworkTransport, "lark endpoint retry failed: %v", err).WithCause(err)
+		}
 	}

 	if result.ClientID == "" || result.ClientSecret == "" {
 		return nil, errs.NewConfigError(errs.SubtypeInvalidClient, "app registration succeeded but missing client_id or client_secret")
 	}

+	// Determine final brand from response
+	finalBrand := larkBrand
+	if result.UserInfo != nil && result.UserInfo.TenantBrand == "lark" {
+		finalBrand = core.BrandLark
+	} else if result.UserInfo != nil && result.UserInfo.TenantBrand == "feishu" {
+		finalBrand = core.BrandFeishu
+	}
+
 	fmt.Fprintln(f.IOStreams.ErrOut)
 	output.PrintSuccess(f.IOStreams.ErrOut, fmt.Sprintf(msg.AppCreated, result.ClientID))

@@ -231,40 +245,3 @@ func runCreateAppFlow(ctx context.Context, f *cmdutil.Factory, brandOverride cor
 		AppSecret: result.ClientSecret,
 	}, nil
 }
-
-// classifyRegistrationBeginError keeps transport/cancellation failures out of
-// the invalid-client category: the begin request sends no app credentials.
-func classifyRegistrationBeginError(err error) error {
-	switch {
-	case errors.Is(err, context.Canceled):
-		return errs.NewAuthenticationError(errs.SubtypeUnknown, "app registration cancelled").WithCause(err)
-	case errors.Is(err, context.DeadlineExceeded):
-		return errs.NewNetworkError(errs.SubtypeNetworkTimeout, "app registration begin timed out: %v", err).WithCause(err)
-	}
-	var netErr net.Error
-	if errors.As(err, &netErr) {
-		subtype := errs.SubtypeNetworkTransport
-		if netErr.Timeout() {
-			subtype = errs.SubtypeNetworkTimeout
-		}
-		return errs.NewNetworkError(subtype, "app registration begin failed: %v", err).WithCause(err)
-	}
-	return errs.NewAPIError(errs.SubtypeUnknown, "app registration begin failed: %v", err).WithCause(err)
-}
-
-// classifyRegistrationError maps registration terminal outcomes to typed
-// errors, preserving causes.
-func classifyRegistrationError(err error) error {
-	switch {
-	case errors.Is(err, larkauth.ErrRegistrationDenied):
-		return errs.NewAuthenticationError(errs.SubtypeUnknown, "%v", err).
-			WithHint("re-run `lark-cli config init --new` and approve the authorization request").
-			WithCause(err)
-	case errors.Is(err, larkauth.ErrRegistrationExpired), errors.Is(err, larkauth.ErrRegistrationTimedOut):
-		return errs.NewAuthenticationError(errs.SubtypeTokenExpired, "%v", err).
-			WithHint("re-run `lark-cli config init --new` and complete the scan before the code expires").
-			WithCause(err)
-	default:
-		return errs.NewAuthenticationError(errs.SubtypeUnknown, "app registration failed: %v", err).WithCause(err)
-	}
-}
--- a/cmd/config/init_interactive_test.go
+++ b/cmd/config/init_interactive_test.go
@@ -1,70 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package config
-
-import (
-	"context"
-	"errors"
-	"net"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	larkauth "github.com/larksuite/cli/internal/auth"
-)
-
-func assertRegistrationProblem(t *testing.T, got, cause error, category errs.Category, subtype errs.Subtype) *errs.Problem {
-	t.Helper()
-	p, ok := errs.ProblemOf(got)
-	if !ok {
-		t.Fatalf("error %T is not typed: %v", got, got)
-	}
-	if p.Category != category || p.Subtype != subtype {
-		t.Errorf("problem = (%q, %q), want (%q, %q)", p.Category, p.Subtype, category, subtype)
-	}
-	if !errors.Is(got, cause) {
-		t.Errorf("error %v does not preserve cause %v", got, cause)
-	}
-	return p
-}
-
-func TestClassifyRegistrationBeginError(t *testing.T) {
-	tests := []struct {
-		name     string
-		err      error
-		category errs.Category
-		subtype  errs.Subtype
-	}{
-		{"cancelled", context.Canceled, errs.CategoryAuthentication, errs.SubtypeUnknown},
-		{"deadline", context.DeadlineExceeded, errs.CategoryNetwork, errs.SubtypeNetworkTimeout},
-		{"transport", &net.DNSError{Err: "lookup failed", Name: "accounts.example"}, errs.CategoryNetwork, errs.SubtypeNetworkTransport},
-		{"response", errors.New("response not JSON"), errs.CategoryAPI, errs.SubtypeUnknown},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			assertRegistrationProblem(t, classifyRegistrationBeginError(tt.err), tt.err, tt.category, tt.subtype)
-		})
-	}
-}
-
-func TestClassifyRegistrationError(t *testing.T) {
-	tests := []struct {
-		name    string
-		err     error
-		subtype errs.Subtype
-		hint    bool
-	}{
-		{"denied", larkauth.ErrRegistrationDenied, errs.SubtypeUnknown, true},
-		{"expired", larkauth.ErrRegistrationExpired, errs.SubtypeTokenExpired, true},
-		{"timed-out", larkauth.ErrRegistrationTimedOut, errs.SubtypeTokenExpired, true},
-		{"cancelled", context.Canceled, errs.SubtypeUnknown, false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			p := assertRegistrationProblem(t, classifyRegistrationError(tt.err), tt.err, errs.CategoryAuthentication, tt.subtype)
-			if (p.Hint != "") != tt.hint {
-				t.Errorf("hint = %q, want non-empty=%v", p.Hint, tt.hint)
-			}
-		})
-	}
-}
--- a/cmd/event/list_test.go
+++ b/cmd/event/list_test.go
@@ -17,8 +17,6 @@ import (

 func TestEventLookup_VCMeetingLifecycleKeys(t *testing.T) {
 	for _, key := range []string{
-		"approval.instance.status_changed_v4",
-		"approval.task.status_changed_v4",
 		"vc.meeting.participant_meeting_started_v1",
 		"vc.meeting.participant_meeting_joined_v1",
 	} {
@@ -38,8 +36,6 @@ func TestRunList_TextOutput(t *testing.T) {
 	out := stdout.String()
 	for _, want := range []string{
 		"KEY", "AUTH", "PARAMS", "DESCRIPTION",
-		"approval.instance.status_changed_v4",
-		"approval.task.status_changed_v4",
 		"im.message.receive_v1",
 		"im.message.message_read_v1",
 		"task.task.update_user_access_v2",
@@ -94,8 +90,6 @@ func TestRunList_JSONOutput(t *testing.T) {
 		t.Fatal("event list JSON missing task.task.update_user_access_v2")
 	}
 	for _, want := range []string{
-		"approval.instance.status_changed_v4",
-		"approval.task.status_changed_v4",
 		"vc.meeting.participant_meeting_started_v1",
 		"vc.meeting.participant_meeting_joined_v1",
 	} {
--- a/cmd/event/schema_test.go
+++ b/cmd/event/schema_test.go
@@ -19,29 +19,6 @@ import (
 	_ "github.com/larksuite/cli/events"
 )

-type approvalSchemaJSONPayload struct {
-	JQRootPath           string                           `json:"jq_root_path"`
-	AuthTypes            []string                         `json:"auth_types"`
-	Scopes               []string                         `json:"scopes"`
-	Params               []approvalSchemaJSONParam        `json:"params"`
-	ResolvedOutputSchema approvalSchemaJSONResolvedSchema `json:"resolved_output_schema"`
-}
-
-type approvalSchemaJSONParam struct {
-	Name            string `json:"name"`
-	Type            string `json:"type"`
-	Required        bool   `json:"required"`
-	SubscriptionKey bool   `json:"subscription_key"`
-}
-
-type approvalSchemaJSONResolvedSchema struct {
-	Properties map[string]approvalSchemaJSONProperty `json:"properties"`
-}
-
-type approvalSchemaJSONProperty struct {
-	Format string `json:"format"`
-}
-
 func TestRunSchema_ProcessedKey_Text(t *testing.T) {
 	f, stdout, _, _ := cmdutil.TestFactory(t, &core.CliConfig{AppID: "test"})

@@ -119,40 +96,6 @@ func TestRunSchema_JSONOutput(t *testing.T) {
 	}
 }

-func TestRunSchema_ReceiveMessageAgentFieldsJSON(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, &core.CliConfig{AppID: "test"})
-
-	if err := runSchema(f, "im.message.receive_v1", true); err != nil {
-		t.Fatalf("runSchema json: %v", err)
-	}
-
-	var payload map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &payload); err != nil {
-		t.Fatalf("output is not valid JSON: %v\n%s", err, stdout.String())
-	}
-	resolved := payload["resolved_output_schema"].(map[string]interface{})
-	props := resolved["properties"].(map[string]interface{})
-	for _, field := range []string{
-		"root_id",
-		"thread_id",
-		"reply_to",
-		"sender_type",
-		"mentions",
-	} {
-		if _, ok := props[field]; !ok {
-			t.Errorf("receive schema missing field %q", field)
-		}
-	}
-	msgDesc := props["message_id"].(map[string]interface{})["description"].(string)
-	if !strings.Contains(msgDesc, "Recommended idempotency key") {
-		t.Errorf("message_id description should guide deduplication, got %q", msgDesc)
-	}
-	eventDesc := props["event_id"].(map[string]interface{})["description"].(string)
-	if strings.Contains(eventDesc, "safe for deduplication") {
-		t.Errorf("event_id description should not recommend deduplication, got %q", eventDesc)
-	}
-}
-
 func TestRunSchema_TaskUpdateUserAccessJSON(t *testing.T) {
 	f, stdout, _, _ := cmdutil.TestFactory(t, &core.CliConfig{AppID: "test"})

@@ -181,60 +124,6 @@ func TestRunSchema_TaskUpdateUserAccessJSON(t *testing.T) {
 	}
 }

-func TestRunSchema_ApprovalStatusChangedJSON(t *testing.T) {
-	tests := []struct {
-		key   string
-		scope string
-	}{
-		{"approval.instance.status_changed_v4", "approval:instance:read"},
-		{"approval.task.status_changed_v4", "approval:task:read"},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.key, func(t *testing.T) {
-			t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-			f, stdout, _, _ := cmdutil.TestFactory(t, &core.CliConfig{AppID: "test"})
-
-			if err := runSchema(f, tc.key, true); err != nil {
-				t.Fatalf("runSchema json: %v", err)
-			}
-
-			var payload approvalSchemaJSONPayload
-			if err := json.Unmarshal(stdout.Bytes(), &payload); err != nil {
-				t.Fatalf("output is not valid JSON: %v\n%s", err, stdout.String())
-			}
-			if payload.JQRootPath != "." {
-				t.Errorf("jq_root_path = %v, want .", payload.JQRootPath)
-			}
-			if got := payload.AuthTypes; !reflect.DeepEqual(got, []string{"user"}) {
-				t.Errorf("auth_types = %#v, want user", got)
-			}
-			if got := payload.Scopes; !reflect.DeepEqual(got, []string{tc.scope}) {
-				t.Errorf("scopes = %#v, want %s", got, tc.scope)
-			}
-			if len(payload.Params) != 1 {
-				t.Fatalf("params = %#v, want one subscription_type param", payload.Params)
-			}
-			param := payload.Params[0]
-			if param.Name != "subscription_type" || param.Type != "multi" || param.Required || param.SubscriptionKey {
-				t.Fatalf("subscription_type param = %#v, want optional multi non-subscription-key param", param)
-			}
-			props := payload.ResolvedOutputSchema.Properties
-			for _, field := range []string{"type", "event_id", "timestamp", "approval_code", "instance_code", "status", "operate_time"} {
-				if _, ok := props[field]; !ok {
-					t.Errorf("approval schema missing flat field %q: %+v", field, props)
-				}
-			}
-			if _, ok := props["event"]; ok {
-				t.Errorf("approval Custom schema should be flat, got envelope field event: %+v", props)
-			}
-			if got := props["operate_time"].Format; got != "timestamp_ms" {
-				t.Errorf("operate_time format = %v, want timestamp_ms", got)
-			}
-		})
-	}
-}
-
 func TestRunSchema_JSONOutput_VCMeetingLifecycleKeys(t *testing.T) {
 	for _, key := range []string{
 		"vc.meeting.participant_meeting_started_v1",
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -107,7 +107,6 @@ func Execute() int {
 		ctx, inv,
 		WithIO(os.Stdin, os.Stdout, os.Stderr),
 		HideProfile(isSingleAppMode()),
-		WithStartupBrand(ResolveStartupBrand(inv.Profile)),
 	)

 	// --- Notices (non-blocking) ---
--- a/cmd/service/service.go
+++ b/cmd/service/service.go
@@ -403,9 +403,9 @@ func serviceMethodRun(opts *ServiceMethodOptions) error {

 	if opts.DryRun {
 		if fileMeta != nil {
-			return cmdutil.PrintDryRunWithFile(request, config, serviceDryRunOutputOptions(f, opts), *fileMeta)
+			return cmdutil.PrintDryRunWithFile(f.IOStreams.Out, request, config, opts.Format, fileMeta.FieldName, fileMeta.FilePath, fileMeta.FormFields)
 		}
-		return serviceDryRun(f, request, config, opts)
+		return serviceDryRun(f, request, config, opts.Format)
 	}

 	if opts.Method.Risk == cmdutil.RiskHighRiskWrite {
@@ -667,19 +667,8 @@ func buildServiceRequest(opts *ServiceMethodOptions) (client.RawApiRequest, *cmd
 	return request, nil, nil
 }

-func serviceDryRun(f *cmdutil.Factory, request client.RawApiRequest, config *core.CliConfig, opts *ServiceMethodOptions) error {
-	return cmdutil.PrintDryRun(request, config, serviceDryRunOutputOptions(f, opts))
-}
-
-func serviceDryRunOutputOptions(f *cmdutil.Factory, opts *ServiceMethodOptions) cmdutil.DryRunOutputOptions {
-	return cmdutil.DryRunOutputOptions{
-		Format:      opts.Format,
-		JqExpr:      opts.JqExpr,
-		CommandPath: opts.Cmd.CommandPath(),
-		Identity:    opts.As,
-		Out:         f.IOStreams.Out,
-		ErrOut:      f.IOStreams.ErrOut,
-	}
+func serviceDryRun(f *cmdutil.Factory, request client.RawApiRequest, config *core.CliConfig, format string) error {
+	return cmdutil.PrintDryRun(f.IOStreams.Out, request, config, format)
 }

 func servicePaginate(ctx context.Context, ac *client.APIClient, request client.RawApiRequest, format output.Format, jqExpr string, out, errOut io.Writer, commandPath string, pagOpts client.PaginationOptions, checkErr func(interface{}, core.Identity) error) error {
--- a/cmd/service/service_test.go
+++ b/cmd/service/service_test.go
@@ -224,39 +224,13 @@ func TestServiceMethod_DryRun_PathParam(t *testing.T) {
 			if err := cmd.Execute(); err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}
-			var got map[string]interface{}
-			if err := json.Unmarshal(stdout.Bytes(), &got); err != nil {
-				t.Fatalf("dry-run stdout is not JSON: %v\n%s", err, stdout.String())
-			}
-			if got["ok"] != true || got["dry_run"] != true {
-				t.Fatalf("unexpected dry-run envelope: %#v", got)
-			}
-			data := got["data"].(map[string]interface{})
-			api := data["api"].([]interface{})
-			call := api[0].(map[string]interface{})
-			if call["url"] != tt.wantInURL {
-				t.Errorf("url = %q, want %q\nstdout:\n%s", call["url"], tt.wantInURL, stdout.String())
+			if !strings.Contains(stdout.String(), tt.wantInURL) {
+				t.Errorf("expected URL containing %q, got:\n%s", tt.wantInURL, stdout.String())
 			}
 		})
 	}
 }

-func TestServiceMethod_DryRunWithJq(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, testConfig)
-	cmd := NewCmdServiceMethod(f, driveSpec(), driveMethod("GET", nil), "get", "files", nil)
-	cmd.SetArgs([]string{
-		"--params", `{"file_token":"boxcn123abc"}`,
-		"--dry-run",
-		"--jq", ".data.api[0].url",
-	})
-	if err := cmd.Execute(); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if got, want := strings.TrimSpace(stdout.String()), "/open-apis/drive/v1/files/boxcn123abc/copy"; got != want {
-		t.Fatalf("jq output = %q, want %q", got, want)
-	}
-}
-
 func TestServiceMethod_PathParamRejectsTraversal(t *testing.T) {
 	tests := []struct {
 		name      string
@@ -344,12 +318,8 @@ func TestServiceMethod_PaginationParamSkippedWithPageAll(t *testing.T) {
 	if err != nil {
 		t.Fatalf("expected no error with --page-all skipping page_size, got: %v", err)
 	}
-	var got map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &got); err != nil {
-		t.Fatalf("dry-run stdout is not JSON: %v\n%s", err, stdout.String())
-	}
-	if got["dry_run"] != true {
-		t.Fatalf("dry_run = %#v, want true", got["dry_run"])
+	if !strings.Contains(stdout.String(), "Dry Run") {
+		t.Error("expected dry-run output")
 	}
 }

@@ -1111,23 +1081,11 @@ func TestServiceMethod_FileUpload_DryRun(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	out := stdout.String()
-	var env map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &env); err != nil {
-		t.Fatalf("dry-run stdout is not JSON: %v\n%s", err, out)
+	if !strings.Contains(out, "image") {
+		t.Errorf("expected dry-run output to mention file field, got: %s", out)
 	}
-	if env["dry_run"] != true {
-		t.Fatalf("dry_run = %#v, want true", env["dry_run"])
-	}
-	data := env["data"].(map[string]interface{})
-	api := data["api"].([]interface{})
-	call := api[0].(map[string]interface{})
-	body := call["body"].(map[string]interface{})
-	file := body["file"].(map[string]interface{})
-	if file["field"] != "image" || file["path"] != tmpFile {
-		t.Fatalf("unexpected file dry-run body: %#v", body)
-	}
-	if strings.Contains(out, "=== Dry Run ===") {
-		t.Fatalf("stdout should not contain dry-run banner: %s", out)
+	if !strings.Contains(out, "Dry Run") {
+		t.Errorf("expected dry-run header, got: %s", out)
 	}
 }

--- a/cmd/startup_brand.go
+++ b/cmd/startup_brand.go
@@ -1,28 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package cmd
-
-import (
-	"os"
-
-	"github.com/larksuite/cli/internal/core"
-	"github.com/larksuite/cli/internal/envvars"
-)
-
-// ResolveStartupBrand resolves the brand before the command tree is built, so
-// the registry's remote metadata overlay uses the configured brand from the
-// first catalog access. It mirrors the credential chain's brand precedence —
-// environment, then the active profile's raw config entry — without touching
-// the keychain (no secrets are needed to know the brand).
-func ResolveStartupBrand(profile string) core.LarkBrand {
-	if raw := os.Getenv(envvars.CliBrand); raw != "" {
-		return core.ParseBrand(raw)
-	}
-	if cfg, err := core.LoadMultiAppConfig(); err == nil {
-		if app := cfg.CurrentAppConfig(profile); app != nil {
-			return core.ParseBrand(string(app.Brand))
-		}
-	}
-	return core.BrandFeishu
-}
--- a/cmd/startup_brand_test.go
+++ b/cmd/startup_brand_test.go
@@ -1,87 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package cmd
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/core"
-	"github.com/larksuite/cli/internal/registry"
-)
-
-func TestResolveStartupBrand_Precedence(t *testing.T) {
-	tmp := t.TempDir()
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", tmp)
-	t.Setenv("LARKSUITE_CLI_BRAND", "")
-	os.Unsetenv("LARKSUITE_CLI_BRAND")
-
-	// No config at all → default brand.
-	if got := ResolveStartupBrand(""); got != core.BrandFeishu {
-		t.Errorf("empty state brand = %q, want feishu", got)
-	}
-
-	// Raw config supplies the active profile's brand — no keychain involved.
-	raw := `{"currentApp":"feishu-app","apps":[` +
-		`{"name":"feishu-app","appId":"cli_f","appSecret":"test-secret","brand":"feishu","users":[]},` +
-		`{"name":"lark-prof","appId":"cli_l","appSecret":"test-secret","brand":"LARK","users":[]}]}`
-	if err := os.WriteFile(filepath.Join(tmp, "config.json"), []byte(raw), 0600); err != nil {
-		t.Fatal(err)
-	}
-	if got := ResolveStartupBrand(""); got != core.BrandFeishu {
-		t.Errorf("default profile brand = %q, want feishu", got)
-	}
-	if got := ResolveStartupBrand("lark-prof"); got != core.BrandLark {
-		t.Errorf("lark profile brand = %q, want lark (normalized)", got)
-	}
-
-	// Environment wins over the config file.
-	t.Setenv("LARKSUITE_CLI_BRAND", "lark")
-	if got := ResolveStartupBrand(""); got != core.BrandLark {
-		t.Errorf("env brand = %q, want lark", got)
-	}
-}
-
-// TestStartupBrandReachesRegistry_RealStartupOrder proves the fix for the
-// production startup sequence: building the command tree locks the registry's
-// sync.Once, so the brand must be injected before the first catalog access.
-// It runs in a subprocess because the registry is process-global.
-func TestStartupBrandReachesRegistry_RealStartupOrder(t *testing.T) {
-	if os.Getenv("GO_TEST_STARTUP_BRAND_HELPER") == "1" {
-		// Helper: replicate Execute()'s build wiring with a lark config.
-		buildInternal(
-			context.Background(), cmdutil.InvocationContext{},
-			WithIO(strings.NewReader(""), os.Stdout, os.Stderr),
-			WithStartupBrand(ResolveStartupBrand("")),
-		)
-		fmt.Printf("CONFIGURED_BRAND=%s\n", registry.ConfiguredBrand())
-		os.Exit(0)
-	}
-
-	tmp := t.TempDir()
-	raw := `{"apps":[{"appId":"cli_l","appSecret":"test-secret","brand":"lark","users":[]}]}`
-	if err := os.WriteFile(filepath.Join(tmp, "config.json"), []byte(raw), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	cmd := exec.Command(os.Args[0], "-test.run", "TestStartupBrandReachesRegistry_RealStartupOrder")
-	cmd.Env = append(os.Environ(),
-		"GO_TEST_STARTUP_BRAND_HELPER=1",
-		"LARKSUITE_CLI_CONFIG_DIR="+tmp,
-		"LARKSUITE_CLI_REMOTE_META=off", // no network during the subprocess build
-	)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("subprocess failed: %v\n%s", err, out)
-	}
-	if !strings.Contains(string(out), "CONFIGURED_BRAND=lark") {
-		t.Errorf("registry brand after real startup order = %s, want lark", out)
-	}
-}
--- a/cmd/update/update.go
+++ b/cmd/update/update.go
@@ -5,7 +5,6 @@ package cmdupdate

 import (
 	"fmt"
-	stdio "io"
 	"runtime"
 	"strings"

@@ -14,7 +13,6 @@ import (
 	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/build"
 	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/output"
 	"github.com/larksuite/cli/internal/selfupdate"
 	"github.com/larksuite/cli/internal/skillscheck"
@@ -127,15 +125,13 @@ func updateRun(opts *UpdateOptions) error {
 	io := opts.Factory.IOStreams
 	cur := currentVersion()
 	updater := newUpdater()
-	// Brand only steers skills sync. updateRun skips that resolution in --check,
-	// where the Updater's zero-value brand retains the Feishu default.
+
 	if !opts.Check {
-		updater.Brand = resolveSkillsBrand(opts.Factory, io.ErrOut)
 		updater.CleanupStaleFiles()
 	}
 	output.PendingNotice = nil

-	// 1. Fetch latest version.
+	// 1. Fetch latest version
 	latest, err := fetchLatest()
 	if err != nil {
 		return reportError(opts, io, "network",
@@ -157,7 +153,7 @@ func updateRun(opts *UpdateOptions) error {
 		return reportAlreadyUpToDate(opts, io, cur, latest, skillsResult, opts.Check)
 	}

-	// 4. Detect installation method.
+	// 4. Detect installation method
 	detect := updater.DetectInstallMethod()

 	// 5. --check
@@ -172,22 +168,6 @@ func updateRun(opts *UpdateOptions) error {
 	return doAutoUpdate(opts, io, cur, latest, detect, updater)
 }

-// resolveSkillsBrand returns the skills-source brand: resolved config first,
-// then the active profile's raw config entry (the brand is not a secret; a
-// locked keychain must not flip the source), then the default with a notice.
-func resolveSkillsBrand(f *cmdutil.Factory, errOut stdio.Writer) core.LarkBrand {
-	if cfg, err := f.Config(); err == nil && cfg != nil {
-		return core.ParseBrand(string(cfg.Brand))
-	}
-	if raw, err := core.LoadMultiAppConfig(); err == nil {
-		if app := raw.CurrentAppConfig(f.Invocation.Profile); app != nil {
-			return core.ParseBrand(string(app.Brand))
-		}
-	}
-	fmt.Fprintf(errOut, "note: could not resolve the configured brand; syncing skills from the default source\n")
-	return core.BrandFeishu
-}
-
 // --- Output helpers ---

 // reportError emits the failure on the requested surface: JSON mode prints the
--- a/cmd/update/update_test.go
+++ b/cmd/update/update_test.go
@@ -9,9 +9,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"os"
 	"os/exec"
-	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -1733,64 +1731,3 @@ func containsString(values []string, target string) bool {
 	}
 	return false
 }
-
-func TestResolveSkillsBrand_LayeredFallback(t *testing.T) {
-	// Layer 1: resolved config wins.
-	var errBuf bytes.Buffer
-	f := &cmdutil.Factory{Config: func() (*core.CliConfig, error) {
-		return &core.CliConfig{Brand: core.LarkBrand(" LARK ")}, nil
-	}}
-	if got := resolveSkillsBrand(f, &errBuf); got != core.BrandLark {
-		t.Errorf("resolved-config brand = %q, want lark", got)
-	}
-
-	// Layer 2: credential resolution fails, raw config file still supplies the
-	// brand (a locked keychain must not flip a Lark profile to Feishu).
-	tmp := t.TempDir()
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", tmp)
-	raw := `{"apps":[{"appId":"cli_x","appSecret":"test-secret","brand":"lark","users":[]}]}`
-	if err := os.WriteFile(filepath.Join(tmp, "config.json"), []byte(raw), 0600); err != nil {
-		t.Fatal(err)
-	}
-	f = &cmdutil.Factory{Config: func() (*core.CliConfig, error) { return nil, errors.New("keychain locked") }}
-	errBuf.Reset()
-	if got := resolveSkillsBrand(f, &errBuf); got != core.BrandLark {
-		t.Errorf("raw-config brand = %q, want lark", got)
-	}
-	if errBuf.Len() != 0 {
-		t.Errorf("unexpected notice when raw config supplied the brand: %q", errBuf.String())
-	}
-
-	// Layer 3: nothing readable → default brand with a notice.
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-	errBuf.Reset()
-	if got := resolveSkillsBrand(f, &errBuf); got != core.BrandFeishu {
-		t.Errorf("fallback brand = %q, want feishu", got)
-	}
-	if !strings.Contains(errBuf.String(), "could not resolve the configured brand") {
-		t.Errorf("expected fallback notice, got %q", errBuf.String())
-	}
-}
-
-// The raw-config fallback must read the active profile, not the default one.
-func TestResolveSkillsBrand_RespectsActiveProfile(t *testing.T) {
-	tmp := t.TempDir()
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", tmp)
-	raw := `{"currentApp":"feishu-app","apps":[` +
-		`{"name":"feishu-app","appId":"cli_f","appSecret":"test-secret","brand":"feishu","users":[]},` +
-		`{"name":"lark-prof","appId":"cli_l","appSecret":"test-secret","brand":"lark","users":[]}]}`
-	if err := os.WriteFile(filepath.Join(tmp, "config.json"), []byte(raw), 0600); err != nil {
-		t.Fatal(err)
-	}
-	f := &cmdutil.Factory{
-		Invocation: cmdutil.InvocationContext{Profile: "lark-prof"},
-		Config:     func() (*core.CliConfig, error) { return nil, errors.New("keychain locked") },
-	}
-	var errBuf bytes.Buffer
-	if got := resolveSkillsBrand(f, &errBuf); got != core.BrandLark {
-		t.Errorf("brand = %q, want lark (the active profile's brand)", got)
-	}
-	if errBuf.Len() != 0 {
-		t.Errorf("unexpected notice: %q", errBuf.String())
-	}
-}
--- a/events/approval/preconsume.go
+++ b/events/approval/preconsume.go
@@ -1,155 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package approval
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/event"
-)
-
-type approvalEventType string
-type approvalSubscriptionPath string
-
-type approvalSubscriptionConfig struct {
-	eventType     approvalEventType
-	subscribePath approvalSubscriptionPath
-}
-
-func approvalSubscriptionPreConsume(cfg approvalSubscriptionConfig) func(context.Context, event.APIClient, map[string]string) (func() error, error) {
-	return func(ctx context.Context, rt event.APIClient, params map[string]string) (func() error, error) {
-		if rt == nil {
-			return nil, errs.NewInternalError(errs.SubtypeUnknown,
-				"runtime API client is required for pre-consume subscription")
-		}
-
-		eventType := string(cfg.eventType)
-		subscribePath := string(cfg.subscribePath)
-		subscriptionTypes, err := approvalSubscriptionTypes(eventType, params)
-		if err != nil {
-			return nil, err
-		}
-
-		registered := make([]string, 0, len(subscriptionTypes))
-		for _, subscriptionType := range subscriptionTypes {
-			body := map[string]string{"subscription_type": subscriptionType}
-			if _, err := rt.CallAPI(ctx, "POST", subscribePath, body); err != nil {
-				return nil, approvalSubscriptionRegistrationError(eventType, registered, subscriptionType, err)
-			}
-			registered = append(registered, subscriptionType)
-		}
-
-		// Approval subscriptions are durable user-auth relations. Consuming events
-		// should not cancel that relation when this local process exits.
-		return nil, nil
-	}
-}
-
-func approvalSubscriptionTypes(eventType string, params map[string]string) ([]string, error) {
-	raw := strings.TrimSpace(params["subscription_type"])
-	if raw == "" {
-		return append([]string(nil), approvalAllSubscriptionTypes...), nil
-	}
-
-	values, err := parseApprovalSubscriptionTypeValues(raw)
-	if err != nil {
-		return nil, invalidApprovalSubscriptionTypeError(eventType, raw)
-	}
-
-	selected := make(map[string]bool, len(values))
-	for _, value := range values {
-		value = strings.TrimSpace(value)
-		switch value {
-		case approvalSubscriptionTypeInvolved, approvalSubscriptionTypeManaged:
-			selected[value] = true
-		default:
-			return nil, invalidApprovalSubscriptionTypeError(eventType, value)
-		}
-	}
-
-	result := make([]string, 0, len(selected))
-	for _, value := range approvalAllSubscriptionTypes {
-		if selected[value] {
-			result = append(result, value)
-		}
-	}
-	if len(result) == 0 {
-		return nil, invalidApprovalSubscriptionTypeError(eventType, raw)
-	}
-	return result, nil
-}
-
-func parseApprovalSubscriptionTypeValues(raw string) ([]string, error) {
-	if strings.HasPrefix(raw, "[") {
-		var values []string
-		if err := json.Unmarshal([]byte(raw), &values); err != nil {
-			return nil, err
-		}
-		return values, nil
-	}
-	return strings.Split(raw, ","), nil
-}
-
-func approvalSubscriptionRegistrationError(eventType string, registered []string, failed string, err error) error {
-	if err == nil {
-		return nil
-	}
-
-	msg := fmt.Sprintf(
-		"approval subscription pre-consume failed for EventKey %s: failed subscription_type %s",
-		eventType,
-		failed,
-	)
-	hint := fmt.Sprintf(
-		"no approval subscription relation was registered for EventKey %s; fix the cause and retry",
-		eventType,
-	)
-	if len(registered) > 0 {
-		msg = fmt.Sprintf(
-			"approval subscription pre-consume partially completed for EventKey %s: registered subscription_type(s) [%s], failed subscription_type %s",
-			eventType,
-			strings.Join(registered, ", "),
-			failed,
-		)
-		hint = fmt.Sprintf(
-			"server-side approval subscription relation(s) already registered for EventKey %s: %s; after fixing the cause, retry with --param subscription_type=%s to register the failed relation",
-			eventType,
-			strings.Join(registered, ", "),
-			failed,
-		)
-	}
-
-	if p, ok := errs.ProblemOf(err); ok {
-		if upstream := strings.TrimSpace(p.Message); upstream != "" {
-			p.Message = msg + ": " + upstream
-		} else {
-			p.Message = msg
-		}
-		if upstreamHint := strings.TrimSpace(p.Hint); upstreamHint != "" {
-			p.Hint = upstreamHint + "\n" + hint
-		} else {
-			p.Hint = hint
-		}
-		return err
-	}
-	return errs.NewInternalError(errs.SubtypeSDKError, "%s: %v", msg, err).
-		WithHint("%s", hint).
-		WithCause(err)
-}
-
-func invalidApprovalSubscriptionTypeError(eventType, value string) error {
-	return errs.NewValidationError(errs.SubtypeInvalidArgument,
-		"invalid subscription_type for EventKey %s: %q", eventType, value).
-		WithParam("--param").
-		WithHint("omit subscription_type to register both approval subscription relations, or pass --param subscription_type=%s, --param subscription_type=%s, or --param subscription_type=%s,%s; run `lark-cli event schema %s` for details",
-			approvalSubscriptionTypeInvolved,
-			approvalSubscriptionTypeManaged,
-			approvalSubscriptionTypeInvolved,
-			approvalSubscriptionTypeManaged,
-			eventType)
-}
--- a/events/approval/register.go
+++ b/events/approval/register.go
@@ -1,179 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-// Package approval registers Approval-domain EventKeys.
-package approval
-
-import (
-	"context"
-	"encoding/json"
-	"reflect"
-
-	"github.com/larksuite/cli/internal/event"
-)
-
-const (
-	eventTypeApprovalInstanceStatusChangedV4 = "approval.instance.status_changed_v4"
-	eventTypeApprovalTaskStatusChangedV4     = "approval.task.status_changed_v4"
-
-	pathApprovalInstancesSubscription = "/open-apis/approval/v4/instances/subscription"
-	pathApprovalTasksSubscription     = "/open-apis/approval/v4/tasks/subscription"
-
-	approvalSubscriptionTypeInvolved = "INVOLVED_APPROVAL"
-	approvalSubscriptionTypeManaged  = "MANAGED_APPROVAL"
-)
-
-var approvalAllSubscriptionTypes = []string{
-	approvalSubscriptionTypeInvolved,
-	approvalSubscriptionTypeManaged,
-}
-
-// Keys returns all Approval-domain EventKey definitions.
-func Keys() []event.KeyDefinition {
-	return []event.KeyDefinition{
-		{
-			Key:         eventTypeApprovalInstanceStatusChangedV4,
-			DisplayName: "Approval instance status changed",
-			Description: "Triggered after an approval instance status becomes visible to the requester or approval participants",
-			EventType:   eventTypeApprovalInstanceStatusChangedV4,
-			Params:      approvalSubscriptionParams(),
-			Schema: event.SchemaDef{
-				Custom: &event.SchemaSpec{Type: reflect.TypeOf(ApprovalInstanceStatusChangedV4Output{})},
-			},
-			Process: processApprovalInstanceStatusChanged,
-			PreConsume: approvalSubscriptionPreConsume(approvalSubscriptionConfig{
-				eventType:     eventTypeApprovalInstanceStatusChangedV4,
-				subscribePath: pathApprovalInstancesSubscription,
-			}),
-			Scopes: []string{"approval:instance:read"},
-			AuthTypes: []string{
-				"user",
-			},
-			RequiredConsoleEvents: []string{eventTypeApprovalInstanceStatusChangedV4},
-		},
-		{
-			Key:         eventTypeApprovalTaskStatusChangedV4,
-			DisplayName: "Approval task status changed",
-			Description: "Triggered after an approval task status becomes visible to the requester or task approver",
-			EventType:   eventTypeApprovalTaskStatusChangedV4,
-			Params:      approvalSubscriptionParams(),
-			Schema: event.SchemaDef{
-				Custom: &event.SchemaSpec{Type: reflect.TypeOf(ApprovalTaskStatusChangedV4Output{})},
-			},
-			Process: processApprovalTaskStatusChanged,
-			PreConsume: approvalSubscriptionPreConsume(approvalSubscriptionConfig{
-				eventType:     eventTypeApprovalTaskStatusChangedV4,
-				subscribePath: pathApprovalTasksSubscription,
-			}),
-			Scopes: []string{"approval:task:read"},
-			AuthTypes: []string{
-				"user",
-			},
-			RequiredConsoleEvents: []string{eventTypeApprovalTaskStatusChangedV4},
-		},
-	}
-}
-
-func approvalSubscriptionParams() []event.ParamDef {
-	return []event.ParamDef{
-		{
-			Name:        "subscription_type",
-			Type:        event.ParamMulti,
-			Description: "Approval subscription relation type(s) to register for the current authorized user. Omit to register both involved and managed approval relations.",
-			Values: []event.ParamValue{
-				{
-					Value: approvalSubscriptionTypeInvolved,
-					Desc:  "Receive events where the current user is the approval requester or approver.",
-				},
-				{
-					Value: approvalSubscriptionTypeManaged,
-					Desc:  "Receive events under approval definitions managed by the current user.",
-				},
-			},
-		},
-	}
-}
-
-func processApprovalInstanceStatusChanged(_ context.Context, _ event.APIClient, raw *event.RawEvent, _ map[string]string) (json.RawMessage, error) {
-	if raw == nil {
-		return nil, nil
-	}
-	var envelope struct {
-		Header struct {
-			EventID    string `json:"event_id"`
-			EventType  string `json:"event_type"`
-			CreateTime string `json:"create_time"`
-		} `json:"header"`
-		Event struct {
-			ApprovalCode string          `json:"approval_code"`
-			InstanceCode string          `json:"instance_code"`
-			ExternalID   string          `json:"external_id"`
-			Status       string          `json:"status"`
-			OperateTime  string          `json:"operate_time"`
-			StartUser    *ApprovalUserID `json:"start_user"`
-		} `json:"event"`
-	}
-	if err := json.Unmarshal(raw.Payload, &envelope); err != nil {
-		return raw.Payload, nil //nolint:nilerr // passthrough on malformed payload so consumers still see the event
-	}
-
-	out := &ApprovalInstanceStatusChangedV4Output{
-		Type:         envelope.Header.EventType,
-		EventID:      envelope.Header.EventID,
-		Timestamp:    envelope.Header.CreateTime,
-		ApprovalCode: envelope.Event.ApprovalCode,
-		InstanceCode: envelope.Event.InstanceCode,
-		ExternalID:   envelope.Event.ExternalID,
-		Status:       envelope.Event.Status,
-		OperateTime:  envelope.Event.OperateTime,
-		StartUser:    envelope.Event.StartUser,
-	}
-	if out.Type == "" {
-		out.Type = raw.EventType
-	}
-	return json.Marshal(out)
-}
-
-func processApprovalTaskStatusChanged(_ context.Context, _ event.APIClient, raw *event.RawEvent, _ map[string]string) (json.RawMessage, error) {
-	if raw == nil {
-		return nil, nil
-	}
-	var envelope struct {
-		Header struct {
-			EventID    string `json:"event_id"`
-			EventType  string `json:"event_type"`
-			CreateTime string `json:"create_time"`
-		} `json:"header"`
-		Event struct {
-			ApprovalCode   string          `json:"approval_code"`
-			InstanceCode   string          `json:"instance_code"`
-			TaskID         string          `json:"task_id"`
-			ExternalID     string          `json:"external_id"`
-			TaskExternalID string          `json:"task_external_id"`
-			AssignedUser   *ApprovalUserID `json:"assigned_user"`
-			Status         string          `json:"status"`
-			OperateTime    string          `json:"operate_time"`
-		} `json:"event"`
-	}
-	if err := json.Unmarshal(raw.Payload, &envelope); err != nil {
-		return raw.Payload, nil //nolint:nilerr // passthrough on malformed payload so consumers still see the event
-	}
-
-	out := &ApprovalTaskStatusChangedV4Output{
-		Type:           envelope.Header.EventType,
-		EventID:        envelope.Header.EventID,
-		Timestamp:      envelope.Header.CreateTime,
-		ApprovalCode:   envelope.Event.ApprovalCode,
-		InstanceCode:   envelope.Event.InstanceCode,
-		TaskID:         envelope.Event.TaskID,
-		ExternalID:     envelope.Event.ExternalID,
-		TaskExternalID: envelope.Event.TaskExternalID,
-		AssignedUser:   envelope.Event.AssignedUser,
-		Status:         envelope.Event.Status,
-		OperateTime:    envelope.Event.OperateTime,
-	}
-	if out.Type == "" {
-		out.Type = raw.EventType
-	}
-	return json.Marshal(out)
-}
--- a/events/approval/register_test.go
+++ b/events/approval/register_test.go
@@ -1,654 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package approval
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/event"
-	"github.com/larksuite/cli/internal/event/schemas"
-)
-
-type recordedCall struct {
-	method string
-	path   string
-	body   interface{}
-}
-
-type fakeAPIClient struct {
-	calls     []recordedCall
-	err       error
-	errOnCall int
-}
-
-func (f *fakeAPIClient) CallAPI(_ context.Context, method, path string, body interface{}) (json.RawMessage, error) {
-	f.calls = append(f.calls, recordedCall{method: method, path: path, body: body})
-	if f.err != nil && (f.errOnCall == 0 || f.errOnCall == len(f.calls)) {
-		return nil, f.err
-	}
-	return json.RawMessage(`{}`), nil
-}
-
-func TestKeysApprovalMetadata(t *testing.T) {
-	keys := Keys()
-	if len(keys) != 2 {
-		t.Fatalf("len(Keys()) = %d, want 2", len(keys))
-	}
-
-	tests := []struct {
-		key        string
-		scope      string
-		schemaType reflect.Type
-		subscribe  string
-	}{
-		{
-			key:        eventTypeApprovalInstanceStatusChangedV4,
-			scope:      "approval:instance:read",
-			schemaType: reflect.TypeOf(ApprovalInstanceStatusChangedV4Output{}),
-			subscribe:  pathApprovalInstancesSubscription,
-		},
-		{
-			key:        eventTypeApprovalTaskStatusChangedV4,
-			scope:      "approval:task:read",
-			schemaType: reflect.TypeOf(ApprovalTaskStatusChangedV4Output{}),
-			subscribe:  pathApprovalTasksSubscription,
-		},
-	}
-
-	byKey := make(map[string]event.KeyDefinition, len(keys))
-	for _, def := range keys {
-		byKey[def.Key] = def
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.key, func(t *testing.T) {
-			def, ok := byKey[tc.key]
-			if !ok {
-				t.Fatalf("missing key %s", tc.key)
-			}
-			if def.EventType != tc.key {
-				t.Errorf("EventType = %q, want %q", def.EventType, tc.key)
-			}
-			if def.Schema.Custom == nil || def.Schema.Custom.Type != tc.schemaType {
-				t.Fatalf("Custom schema Type = %v, want %v", def.Schema.Custom, tc.schemaType)
-			}
-			if def.Schema.Native != nil {
-				t.Fatal("approval events must use Custom schema while SDK event types are not exported")
-			}
-			if def.Process == nil {
-				t.Fatal("Process must flatten raw V2 envelopes")
-			}
-			if def.PreConsume == nil {
-				t.Fatal("PreConsume must subscribe approval user-auth events")
-			}
-			if !reflect.DeepEqual(def.Scopes, []string{tc.scope}) {
-				t.Errorf("Scopes = %#v, want %q", def.Scopes, tc.scope)
-			}
-			if !reflect.DeepEqual(def.AuthTypes, []string{"user"}) {
-				t.Errorf("AuthTypes = %#v, want user", def.AuthTypes)
-			}
-			if !reflect.DeepEqual(def.RequiredConsoleEvents, []string{tc.key}) {
-				t.Errorf("RequiredConsoleEvents = %#v, want %q", def.RequiredConsoleEvents, tc.key)
-			}
-			assertSubscriptionParam(t, def.Params)
-		})
-	}
-}
-
-func assertSubscriptionParam(t *testing.T, params []event.ParamDef) {
-	t.Helper()
-	if len(params) != 1 {
-		t.Fatalf("len(params) = %d, want 1", len(params))
-	}
-	p := params[0]
-	if p.Name != "subscription_type" || p.Type != event.ParamMulti || p.Required || p.SubscriptionKey {
-		t.Fatalf("subscription_type param = %+v, want optional multi non-subscription-key param", p)
-	}
-	got := map[string]string{}
-	for _, v := range p.Values {
-		got[v.Value] = v.Desc
-	}
-	for _, want := range []string{approvalSubscriptionTypeInvolved, approvalSubscriptionTypeManaged} {
-		if got[want] == "" {
-			t.Errorf("subscription_type value %q missing or empty desc; values=%+v", want, p.Values)
-		}
-	}
-}
-
-type reflectedApprovalSchema struct {
-	Properties map[string]reflectedApprovalSchemaProperty `json:"properties"`
-}
-
-type reflectedApprovalSchemaProperty struct {
-	Format     string                                     `json:"format"`
-	Enum       []string                                   `json:"enum"`
-	Properties map[string]reflectedApprovalSchemaProperty `json:"properties"`
-}
-
-func TestApprovalSchemasAnnotations(t *testing.T) {
-	tests := []struct {
-		name         string
-		schemaType   reflect.Type
-		eventType    string
-		statusValues []string
-		userField    string
-	}{
-		{
-			name:         "instance",
-			schemaType:   reflect.TypeOf(ApprovalInstanceStatusChangedV4Output{}),
-			eventType:    eventTypeApprovalInstanceStatusChangedV4,
-			statusValues: []string{"PENDING", "APPROVED", "REJECTED", "CANCELED", "DELETED", "REVERTED", "OVERTIME_CLOSE", "OVERTIME_RECOVER"},
-			userField:    "start_user",
-		},
-		{
-			name:         "task",
-			schemaType:   reflect.TypeOf(ApprovalTaskStatusChangedV4Output{}),
-			eventType:    eventTypeApprovalTaskStatusChangedV4,
-			statusValues: []string{"REVERTED", "PENDING", "APPROVED", "REJECTED", "TRANSFERRED", "ROLLBACK", "DONE", "OVERTIME_CLOSE", "OVERTIME_RECOVER"},
-			userField:    "assigned_user",
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			var schema reflectedApprovalSchema
-			if err := json.Unmarshal(schemas.FromType(tc.schemaType), &schema); err != nil {
-				t.Fatalf("unmarshal schema: %v", err)
-			}
-			props := schema.Properties
-			eventTypeEnum := props["type"].Enum
-			if len(eventTypeEnum) != 1 || eventTypeEnum[0] != tc.eventType {
-				t.Fatalf("type enum = %v, want %s", eventTypeEnum, tc.eventType)
-			}
-			if got := props["timestamp"].Format; got != "timestamp_ms" {
-				t.Errorf("timestamp format = %v, want timestamp_ms", got)
-			}
-			assertEnumContains(t, props["status"].Enum, tc.statusValues)
-			if got := props["operate_time"].Format; got != "timestamp_ms" {
-				t.Errorf("event.operate_time format = %v, want timestamp_ms", got)
-			}
-
-			userProps := props[tc.userField].Properties
-			if got := userProps["open_id"].Format; got != "open_id" {
-				t.Errorf("%s.open_id format = %v, want open_id", tc.userField, got)
-			}
-			if got := userProps["union_id"].Format; got != "union_id" {
-				t.Errorf("%s.union_id format = %v, want union_id", tc.userField, got)
-			}
-			if got := userProps["user_id"].Format; got != "user_id" {
-				t.Errorf("%s.user_id format = %v, want user_id", tc.userField, got)
-			}
-		})
-	}
-}
-
-func assertEnumContains(t *testing.T, raw []string, wants []string) {
-	t.Helper()
-	got := make(map[string]bool, len(raw))
-	for _, v := range raw {
-		got[v] = true
-	}
-	for _, want := range wants {
-		if !got[want] {
-			t.Errorf("enum missing %q; enum=%v", want, raw)
-		}
-	}
-}
-
-func TestApprovalPreConsumeRegistersSubscriptionTypesWithoutCleanup(t *testing.T) {
-	tests := []struct {
-		name          string
-		eventType     string
-		subscribePath string
-		params        map[string]string
-		wantTypes     []string
-	}{
-		{
-			name:          "instance omitted subscription_type registers both",
-			eventType:     eventTypeApprovalInstanceStatusChangedV4,
-			subscribePath: pathApprovalInstancesSubscription,
-			wantTypes: []string{
-				approvalSubscriptionTypeInvolved,
-				approvalSubscriptionTypeManaged,
-			},
-		},
-		{
-			name:          "task explicit single managed",
-			eventType:     eventTypeApprovalTaskStatusChangedV4,
-			subscribePath: pathApprovalTasksSubscription,
-			params:        map[string]string{"subscription_type": approvalSubscriptionTypeManaged},
-			wantTypes:     []string{approvalSubscriptionTypeManaged},
-		},
-		{
-			name:          "task comma separated multi canonicalizes and deduplicates",
-			eventType:     eventTypeApprovalTaskStatusChangedV4,
-			subscribePath: pathApprovalTasksSubscription,
-			params: map[string]string{
-				"subscription_type": approvalSubscriptionTypeManaged + "," + approvalSubscriptionTypeInvolved + "," + approvalSubscriptionTypeManaged,
-			},
-			wantTypes: []string{
-				approvalSubscriptionTypeInvolved,
-				approvalSubscriptionTypeManaged,
-			},
-		},
-		{
-			name:          "instance json array multi",
-			eventType:     eventTypeApprovalInstanceStatusChangedV4,
-			subscribePath: pathApprovalInstancesSubscription,
-			params: map[string]string{
-				"subscription_type": `["MANAGED_APPROVAL","INVOLVED_APPROVAL"]`,
-			},
-			wantTypes: []string{
-				approvalSubscriptionTypeInvolved,
-				approvalSubscriptionTypeManaged,
-			},
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			pc := approvalSubscriptionPreConsume(approvalSubscriptionConfig{
-				eventType:     approvalEventType(tc.eventType),
-				subscribePath: approvalSubscriptionPath(tc.subscribePath),
-			})
-			rt := &fakeAPIClient{}
-			cleanup, err := pc(context.Background(), rt, tc.params)
-			if err != nil {
-				t.Fatalf("PreConsume returned error: %v", err)
-			}
-			if cleanup != nil {
-				t.Fatal("cleanup must be nil; approval consume must not unsubscribe on exit")
-			}
-			assertSubscriptionCalls(t, rt.calls, tc.subscribePath, tc.wantTypes)
-		})
-	}
-}
-
-func assertSubscriptionCalls(t *testing.T, got []recordedCall, wantPath string, wantTypes []string) {
-	t.Helper()
-	if len(got) != len(wantTypes) {
-		t.Fatalf("calls after pre-consume = %d, want %d; calls=%+v", len(got), len(wantTypes), got)
-	}
-	for i, wantType := range wantTypes {
-		assertCall(t, got[i], "POST", wantPath, map[string]string{"subscription_type": wantType})
-	}
-}
-
-func assertCall(t *testing.T, got recordedCall, wantMethod, wantPath string, wantBody interface{}) {
-	t.Helper()
-	if got.method != wantMethod {
-		t.Errorf("method = %q, want %q", got.method, wantMethod)
-	}
-	if got.path != wantPath {
-		t.Errorf("path = %q, want %q", got.path, wantPath)
-	}
-	if !reflect.DeepEqual(got.body, wantBody) {
-		t.Errorf("body = %#v, want %#v", got.body, wantBody)
-	}
-}
-
-func TestApprovalPreConsumeValidationErrors(t *testing.T) {
-	t.Run("nil runtime", func(t *testing.T) {
-		pc := approvalSubscriptionPreConsume(approvalSubscriptionConfig{
-			eventType: eventTypeApprovalInstanceStatusChangedV4,
-		})
-		_, err := pc(context.Background(), nil, map[string]string{"subscription_type": approvalSubscriptionTypeInvolved})
-		if err == nil {
-			t.Fatal("expected nil runtime error")
-		}
-		p, ok := errs.ProblemOf(err)
-		if !ok || p.Category != errs.CategoryInternal {
-			t.Fatalf("err = %T/%v, want typed internal error", err, err)
-		}
-	})
-
-	for _, raw := range []string{"BAD", "[]", `["INVOLVED_APPROVAL",3]`} {
-		t.Run("invalid subscription type "+raw, func(t *testing.T) {
-			pc := approvalSubscriptionPreConsume(approvalSubscriptionConfig{
-				eventType: eventTypeApprovalInstanceStatusChangedV4,
-			})
-			cleanup, err := pc(context.Background(), &fakeAPIClient{}, map[string]string{"subscription_type": raw})
-			if err == nil {
-				t.Fatal("expected invalid subscription_type error")
-			}
-			if cleanup != nil {
-				t.Fatal("cleanup must be nil on validation error")
-			}
-			var ve *errs.ValidationError
-			if !errors.As(err, &ve) {
-				t.Fatalf("err = %T/%v, want *errs.ValidationError", err, err)
-			}
-			if ve.Subtype != errs.SubtypeInvalidArgument || ve.Param != "--param" {
-				t.Errorf("subtype/param = %s/%q, want invalid_argument/--param", ve.Subtype, ve.Param)
-			}
-			if ve.Hint == "" {
-				t.Error("invalid subscription_type should carry a hint")
-			}
-		})
-	}
-
-	t.Run("partial registration failure reports registered and failed relation types", func(t *testing.T) {
-		upstream := errs.NewAPIError(errs.SubtypeServerError, "approval subscription API failed")
-		rt := &fakeAPIClient{err: upstream, errOnCall: 2}
-		pc := approvalSubscriptionPreConsume(approvalSubscriptionConfig{
-			eventType:     eventTypeApprovalTaskStatusChangedV4,
-			subscribePath: pathApprovalTasksSubscription,
-		})
-
-		cleanup, err := pc(context.Background(), rt, map[string]string{})
-		if err == nil {
-			t.Fatal("expected partial registration error")
-		}
-		if cleanup != nil {
-			t.Fatal("cleanup must be nil on registration error")
-		}
-		assertSubscriptionCalls(t, rt.calls, pathApprovalTasksSubscription, []string{
-			approvalSubscriptionTypeInvolved,
-			approvalSubscriptionTypeManaged,
-		})
-		p, ok := errs.ProblemOf(err)
-		if !ok {
-			t.Fatalf("err = %T/%v, want typed error", err, err)
-		}
-		if p.Category != errs.CategoryAPI || p.Subtype != errs.SubtypeServerError {
-			t.Fatalf("category/subtype = %s/%s, want api/server_error", p.Category, p.Subtype)
-		}
-		for _, want := range []string{
-			"registered subscription_type(s) [INVOLVED_APPROVAL]",
-			"failed subscription_type MANAGED_APPROVAL",
-		} {
-			if !strings.Contains(p.Message, want) {
-				t.Errorf("partial error message missing %q: %q", want, p.Message)
-			}
-		}
-		for _, want := range []string{
-			"already registered",
-			"--param subscription_type=MANAGED_APPROVAL",
-		} {
-			if !strings.Contains(p.Hint, want) {
-				t.Errorf("partial error hint missing %q: %q", want, p.Hint)
-			}
-		}
-	})
-}
-
-func TestApprovalSubscriptionRegistrationErrorVariants(t *testing.T) {
-	t.Run("nil error", func(t *testing.T) {
-		if err := approvalSubscriptionRegistrationError(eventTypeApprovalTaskStatusChangedV4, nil, approvalSubscriptionTypeInvolved, nil); err != nil {
-			t.Fatalf("nil cause returned error: %v", err)
-		}
-	})
-
-	t.Run("typed error with existing hint and empty message", func(t *testing.T) {
-		upstream := errs.NewAPIError(errs.SubtypeServerError, "").WithHint("retry later")
-		err := approvalSubscriptionRegistrationError(
-			eventTypeApprovalTaskStatusChangedV4,
-			nil,
-			approvalSubscriptionTypeInvolved,
-			upstream,
-		)
-		if err != upstream {
-			t.Fatalf("typed error should be annotated in place; got %T/%v", err, err)
-		}
-		p, ok := errs.ProblemOf(err)
-		if !ok {
-			t.Fatalf("err = %T/%v, want typed error", err, err)
-		}
-		if !strings.Contains(p.Message, "failed subscription_type INVOLVED_APPROVAL") {
-			t.Errorf("message missing failed relation: %q", p.Message)
-		}
-		for _, want := range []string{"retry later", "no approval subscription relation was registered"} {
-			if !strings.Contains(p.Hint, want) {
-				t.Errorf("hint missing %q: %q", want, p.Hint)
-			}
-		}
-	})
-
-	t.Run("untyped error is wrapped with retry context", func(t *testing.T) {
-		cause := errors.New("transport closed")
-		err := approvalSubscriptionRegistrationError(
-			eventTypeApprovalTaskStatusChangedV4,
-			nil,
-			approvalSubscriptionTypeInvolved,
-			cause,
-		)
-		if !errors.Is(err, cause) {
-			t.Fatalf("wrapped error should preserve cause; got %T/%v", err, err)
-		}
-		p, ok := errs.ProblemOf(err)
-		if !ok {
-			t.Fatalf("err = %T/%v, want typed error", err, err)
-		}
-		if p.Category != errs.CategoryInternal || p.Subtype != errs.SubtypeSDKError {
-			t.Fatalf("category/subtype = %s/%s, want internal/sdk_error", p.Category, p.Subtype)
-		}
-		if !strings.Contains(p.Hint, "no approval subscription relation was registered") {
-			t.Errorf("hint missing no-registration context: %q", p.Hint)
-		}
-	})
-}
-
-func TestProcessApprovalInstanceStatusChanged(t *testing.T) {
-	out := runApprovalInstanceStatusChanged(t, `{
-		"schema": "2.0",
-		"header": {
-			"event_id": "evt_approval_instance_001",
-			"event_type": "approval.instance.status_changed_v4",
-			"create_time": "1710000000000"
-		},
-		"event": {
-			"approval_code": "approval_code_001",
-			"instance_code": "instance_code_001",
-			"external_id": "external_001",
-			"status": "PENDING",
-			"operate_time": "1666079207003",
-			"start_user": {
-				"open_id": "ou_start",
-				"union_id": "on_start",
-				"user_id": "user_start"
-			}
-		}
-	}`)
-
-	if out.Type != eventTypeApprovalInstanceStatusChangedV4 {
-		t.Errorf("Type = %q, want %q", out.Type, eventTypeApprovalInstanceStatusChangedV4)
-	}
-	if out.EventID != "evt_approval_instance_001" || out.Timestamp != "1710000000000" {
-		t.Errorf("EventID/Timestamp = %q/%q", out.EventID, out.Timestamp)
-	}
-	if out.ApprovalCode != "approval_code_001" || out.InstanceCode != "instance_code_001" {
-		t.Errorf("approval/instance code = %q/%q", out.ApprovalCode, out.InstanceCode)
-	}
-	if out.ExternalID != "external_001" || out.Status != "PENDING" || out.OperateTime != "1666079207003" {
-		t.Errorf("external/status/operate_time = %q/%q/%q", out.ExternalID, out.Status, out.OperateTime)
-	}
-	if out.StartUser == nil || out.StartUser.OpenID != "ou_start" || out.StartUser.UnionID != "on_start" || out.StartUser.UserID != "user_start" {
-		t.Fatalf("StartUser = %+v, want full user ids", out.StartUser)
-	}
-}
-
-func TestProcessApprovalTaskStatusChanged(t *testing.T) {
-	out := runApprovalTaskStatusChanged(t, `{
-		"schema": "2.0",
-		"header": {
-			"event_id": "evt_approval_task_001",
-			"event_type": "approval.task.status_changed_v4",
-			"create_time": "1710000000001"
-		},
-		"event": {
-			"approval_code": "approval_code_002",
-			"instance_code": "instance_code_002",
-			"task_id": "task_001",
-			"external_id": "external_002",
-			"task_external_id": "task_external_001",
-			"status": "APPROVED",
-			"operate_time": "1666079207004",
-			"assigned_user": {
-				"open_id": "ou_assignee",
-				"union_id": "on_assignee",
-				"user_id": "user_assignee"
-			}
-		}
-	}`)
-
-	if out.Type != eventTypeApprovalTaskStatusChangedV4 {
-		t.Errorf("Type = %q, want %q", out.Type, eventTypeApprovalTaskStatusChangedV4)
-	}
-	if out.EventID != "evt_approval_task_001" || out.Timestamp != "1710000000001" {
-		t.Errorf("EventID/Timestamp = %q/%q", out.EventID, out.Timestamp)
-	}
-	if out.ApprovalCode != "approval_code_002" || out.InstanceCode != "instance_code_002" || out.TaskID != "task_001" {
-		t.Errorf("approval/instance/task = %q/%q/%q", out.ApprovalCode, out.InstanceCode, out.TaskID)
-	}
-	if out.ExternalID != "external_002" || out.TaskExternalID != "task_external_001" || out.Status != "APPROVED" || out.OperateTime != "1666079207004" {
-		t.Errorf("external/task_external/status/operate_time = %q/%q/%q/%q", out.ExternalID, out.TaskExternalID, out.Status, out.OperateTime)
-	}
-	if out.AssignedUser == nil || out.AssignedUser.OpenID != "ou_assignee" || out.AssignedUser.UnionID != "on_assignee" || out.AssignedUser.UserID != "user_assignee" {
-		t.Fatalf("AssignedUser = %+v, want full user ids", out.AssignedUser)
-	}
-}
-
-func TestProcessApprovalStatusChangedUsesRawEventTypeFallback(t *testing.T) {
-	instance := runApprovalInstanceStatusChanged(t, `{
-		"schema": "2.0",
-		"header": {
-			"event_id": "evt_approval_instance_fallback",
-			"create_time": "1710000000002"
-		},
-		"event": {
-			"approval_code": "approval_code_fallback",
-			"instance_code": "instance_code_fallback",
-			"status": "APPROVED",
-			"operate_time": "1666079207005"
-		}
-	}`)
-	if instance.Type != eventTypeApprovalInstanceStatusChangedV4 {
-		t.Errorf("instance Type fallback = %q, want %q", instance.Type, eventTypeApprovalInstanceStatusChangedV4)
-	}
-
-	task := runApprovalTaskStatusChanged(t, `{
-		"schema": "2.0",
-		"header": {
-			"event_id": "evt_approval_task_fallback",
-			"create_time": "1710000000003"
-		},
-		"event": {
-			"approval_code": "approval_code_fallback",
-			"instance_code": "instance_code_fallback",
-			"task_id": "task_fallback",
-			"status": "DONE",
-			"operate_time": "1666079207006"
-		}
-	}`)
-	if task.Type != eventTypeApprovalTaskStatusChangedV4 {
-		t.Errorf("task Type fallback = %q, want %q", task.Type, eventTypeApprovalTaskStatusChangedV4)
-	}
-}
-
-func TestProcessApprovalStatusChangedMalformedPayloadPassthrough(t *testing.T) {
-	for _, tc := range []struct {
-		name      string
-		eventType string
-		process   event.ProcessFunc
-	}{
-		{"instance", eventTypeApprovalInstanceStatusChangedV4, processApprovalInstanceStatusChanged},
-		{"task", eventTypeApprovalTaskStatusChangedV4, processApprovalTaskStatusChanged},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			raw := &event.RawEvent{
-				EventType: tc.eventType,
-				Payload:   json.RawMessage(`not json`),
-				Timestamp: time.Now(),
-			}
-			got, err := tc.process(context.Background(), nil, raw, nil)
-			if err != nil {
-				t.Fatalf("Process should swallow parse errors, got %v", err)
-			}
-			if string(got) != "not json" {
-				t.Errorf("malformed fallback output = %q, want original bytes", string(got))
-			}
-		})
-	}
-}
-
-func TestProcessApprovalStatusChangedNilRaw(t *testing.T) {
-	for _, tc := range []struct {
-		name    string
-		process event.ProcessFunc
-	}{
-		{"instance", processApprovalInstanceStatusChanged},
-		{"task", processApprovalTaskStatusChanged},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			got, err := tc.process(context.Background(), nil, nil, nil)
-			if err != nil {
-				t.Fatalf("Process nil raw returned error: %v", err)
-			}
-			if got != nil {
-				t.Fatalf("Process nil raw output = %s, want nil", string(got))
-			}
-		})
-	}
-}
-
-func runApprovalInstanceStatusChanged(t *testing.T, payload string) ApprovalInstanceStatusChangedV4Output {
-	t.Helper()
-	raw := &event.RawEvent{
-		EventType: eventTypeApprovalInstanceStatusChangedV4,
-		Payload:   json.RawMessage(payload),
-		Timestamp: time.Now(),
-	}
-	got, err := processApprovalInstanceStatusChanged(context.Background(), nil, raw, nil)
-	if err != nil {
-		t.Fatalf("Process returned error: %v", err)
-	}
-	var out ApprovalInstanceStatusChangedV4Output
-	if err := json.Unmarshal(got, &out); err != nil {
-		t.Fatalf("Process output is not valid instance JSON: %v\nraw=%s", err, string(got))
-	}
-	return out
-}
-
-func runApprovalTaskStatusChanged(t *testing.T, payload string) ApprovalTaskStatusChangedV4Output {
-	t.Helper()
-	raw := &event.RawEvent{
-		EventType: eventTypeApprovalTaskStatusChangedV4,
-		Payload:   json.RawMessage(payload),
-		Timestamp: time.Now(),
-	}
-	got, err := processApprovalTaskStatusChanged(context.Background(), nil, raw, nil)
-	if err != nil {
-		t.Fatalf("Process returned error: %v", err)
-	}
-	var out ApprovalTaskStatusChangedV4Output
-	if err := json.Unmarshal(got, &out); err != nil {
-		t.Fatalf("Process output is not valid task JSON: %v\nraw=%s", err, string(got))
-	}
-	return out
-}
-
-func TestApprovalKeysRegisterCleanly(t *testing.T) {
-	for _, key := range []string{eventTypeApprovalInstanceStatusChangedV4, eventTypeApprovalTaskStatusChangedV4} {
-		event.UnregisterKeyForTest(key)
-		t.Cleanup(func() { event.UnregisterKeyForTest(key) })
-	}
-
-	for _, def := range Keys() {
-		event.RegisterKey(def)
-	}
-	for _, key := range []string{eventTypeApprovalInstanceStatusChangedV4, eventTypeApprovalTaskStatusChangedV4} {
-		if _, ok := event.Lookup(key); !ok {
-			t.Fatalf("event.Lookup(%q) not registered", key)
-		}
-	}
-}
-
-var _ event.APIClient = (*fakeAPIClient)(nil)
--- a/events/approval/types.go
+++ b/events/approval/types.go
@@ -1,42 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package approval
-
-// ApprovalUserID identifies a user in the three Lark ID formats included by
-// approval status-change events.
-type ApprovalUserID struct {
-	OpenID  string `json:"open_id,omitempty"  desc:"User open_id; prefixed with ou_" kind:"open_id"`
-	UnionID string `json:"union_id,omitempty" desc:"User union_id"                  kind:"union_id"`
-	UserID  string `json:"user_id,omitempty"  desc:"User id within the tenant"       kind:"user_id"`
-}
-
-// ApprovalInstanceStatusChangedV4Output is the flattened shape for
-// approval.instance.status_changed_v4.
-type ApprovalInstanceStatusChangedV4Output struct {
-	Type         string          `json:"type"                    desc:"Event type; always approval.instance.status_changed_v4" enum:"approval.instance.status_changed_v4"`
-	EventID      string          `json:"event_id,omitempty"      desc:"Globally unique event ID; safe for deduplication"`
-	Timestamp    string          `json:"timestamp,omitempty"     desc:"Event delivery time (ms timestamp string); taken from header.create_time when present" kind:"timestamp_ms"`
-	ApprovalCode string          `json:"approval_code,omitempty" desc:"Approval definition code; not a subscription dimension"`
-	InstanceCode string          `json:"instance_code,omitempty" desc:"Approval instance code"`
-	ExternalID   string          `json:"external_id,omitempty"   desc:"Third-party approval instance id; present only for third-party approvals"`
-	Status       string          `json:"status,omitempty"        desc:"Approval instance status" enum:"PENDING,APPROVED,REJECTED,CANCELED,DELETED,REVERTED,OVERTIME_CLOSE,OVERTIME_RECOVER"`
-	OperateTime  string          `json:"operate_time,omitempty"  desc:"Status change time in milliseconds" kind:"timestamp_ms"`
-	StartUser    *ApprovalUserID `json:"start_user,omitempty"    desc:"Approval instance starter; omitted when unavailable"`
-}
-
-// ApprovalTaskStatusChangedV4Output is the flattened shape for
-// approval.task.status_changed_v4.
-type ApprovalTaskStatusChangedV4Output struct {
-	Type           string          `json:"type"                      desc:"Event type; always approval.task.status_changed_v4" enum:"approval.task.status_changed_v4"`
-	EventID        string          `json:"event_id,omitempty"        desc:"Globally unique event ID; safe for deduplication"`
-	Timestamp      string          `json:"timestamp,omitempty"       desc:"Event delivery time (ms timestamp string); taken from header.create_time when present" kind:"timestamp_ms"`
-	ApprovalCode   string          `json:"approval_code,omitempty"     desc:"Approval definition code; not a subscription dimension"`
-	InstanceCode   string          `json:"instance_code,omitempty"     desc:"Approval instance code"`
-	TaskID         string          `json:"task_id,omitempty"           desc:"Approval task id"`
-	ExternalID     string          `json:"external_id,omitempty"       desc:"Third-party approval external id; present only for third-party approvals"`
-	TaskExternalID string          `json:"task_external_id,omitempty"  desc:"Third-party approval task external id; present only when emitted by the upstream service"`
-	AssignedUser   *ApprovalUserID `json:"assigned_user,omitempty"     desc:"Task assignee or operator user ids; omitted for automatic flows without an operator"`
-	Status         string          `json:"status,omitempty"            desc:"Approval task status" enum:"REVERTED,PENDING,APPROVED,REJECTED,TRANSFERRED,ROLLBACK,DONE,OVERTIME_CLOSE,OVERTIME_RECOVER"`
-	OperateTime    string          `json:"operate_time,omitempty"      desc:"Status change time in milliseconds" kind:"timestamp_ms"`
-}
--- a/events/im/message_receive.go
+++ b/events/im/message_receive.go
@@ -13,29 +13,17 @@ import (

 // ImMessageReceiveOutput is the flattened shape for im.message.receive_v1; `desc` tags drive the reflected schema.
 type ImMessageReceiveOutput struct {
-	Type        string          `json:"type"                   desc:"Event type; always im.message.receive_v1"`
-	EventID     string          `json:"event_id,omitempty"     desc:"Event delivery ID. Do not use as the message deduplication key; use message_id instead."`
-	Timestamp   string          `json:"timestamp,omitempty"    desc:"Event delivery time (ms timestamp string); prefers header.create_time"                                                                                                              kind:"timestamp_ms"`
-	ID          string          `json:"id,omitempty"           desc:"Message ID (legacy alias of message_id, kept for compatibility)"                                                                                                                     kind:"message_id"`
-	MessageID   string          `json:"message_id,omitempty"   desc:"Message ID; prefixed with om_. Recommended idempotency key for im.message.receive_v1 consumers."                                                                                     kind:"message_id"`
-	CreateTime  string          `json:"create_time,omitempty"  desc:"Message creation time (ms timestamp string)"                                                                                                                                         kind:"timestamp_ms"`
-	UpdateTime  string          `json:"update_time,omitempty"  desc:"Message update time (ms timestamp string); emitted only when different from create_time"                                                                                              kind:"timestamp_ms"`
-	ChatID      string          `json:"chat_id,omitempty"      desc:"Chat/conversation ID; prefixed with oc_"                                                                                                                                             kind:"chat_id"`
-	ChatType    string          `json:"chat_type,omitempty"    desc:"Conversation type"                                                                                                                                                                   enum:"p2p,group"`
-	MessageType string          `json:"message_type,omitempty" desc:"Message type"`
-	SenderID    string          `json:"sender_id,omitempty"    desc:"Sender open_id; prefixed with ou_"                                                                                                                                                   kind:"open_id"`
-	SenderType  string          `json:"sender_type,omitempty"  desc:"Sender type"                                                                                                                                                                         enum:"user,bot"`
-	RootID      string          `json:"root_id,omitempty"      desc:"Root message ID of the reply/thread context, when present"                                                                                                                           kind:"message_id"`
-	ThreadID    string          `json:"thread_id,omitempty"    desc:"Thread ID, when present"`
-	ReplyTo     string          `json:"reply_to,omitempty"     desc:"Parent message ID of the direct reply context, when present"                                                                                                                         kind:"message_id"`
-	Content     string          `json:"content,omitempty"      desc:"Message content. For most types (text/post/image/file/audio, etc.) this is pre-rendered human-readable text."`
-	Mentions    []MentionOutput `json:"mentions,omitempty" desc:"Compact mentions aligned with im +messages-mget"`
-}
-
-type MentionOutput struct {
-	Key  string `json:"key,omitempty"  desc:"Mention placeholder key, for example @_user_1"`
-	ID   string `json:"id,omitempty"   desc:"Mentioned user open_id; prefixed with ou_"        kind:"open_id"`
-	Name string `json:"name,omitempty" desc:"Mentioned display name"`
+	Type        string `json:"type"                   desc:"Event type; always im.message.receive_v1"`
+	EventID     string `json:"event_id,omitempty"     desc:"Globally unique event ID; safe for deduplication"`
+	Timestamp   string `json:"timestamp,omitempty"    desc:"Event delivery time (ms timestamp string); prefers header.create_time"                                                                                                              kind:"timestamp_ms"`
+	ID          string `json:"id,omitempty"           desc:"Message ID (legacy alias of message_id, kept for compatibility)"                                                                                                                     kind:"message_id"`
+	MessageID   string `json:"message_id,omitempty"   desc:"Message ID; prefixed with om_"                                                                                                                                                       kind:"message_id"`
+	CreateTime  string `json:"create_time,omitempty"  desc:"Message creation time (ms timestamp string)"                                                                                                                                         kind:"timestamp_ms"`
+	ChatID      string `json:"chat_id,omitempty"      desc:"Chat/conversation ID; prefixed with oc_"                                                                                                                                             kind:"chat_id"`
+	ChatType    string `json:"chat_type,omitempty"    desc:"Conversation type"                                                                                                                                                                   enum:"p2p,group"`
+	MessageType string `json:"message_type,omitempty" desc:"Message type"`
+	SenderID    string `json:"sender_id,omitempty"    desc:"Sender open_id; prefixed with ou_"                                                                                                                                                   kind:"open_id"`
+	Content     string `json:"content,omitempty"      desc:"Message content. For most types (text/post/image/file/audio, etc.) this is pre-rendered human-readable text."`
 }

 func processImMessageReceive(_ context.Context, _ event.APIClient, raw *event.RawEvent, _ map[string]string) (json.RawMessage, error) {
@@ -48,20 +36,15 @@ func processImMessageReceive(_ context.Context, _ event.APIClient, raw *event.Ra
 		Event struct {
 			Message struct {
 				MessageID   string        `json:"message_id"`
-				RootID      string        `json:"root_id"`
-				ParentID    string        `json:"parent_id"`
-				ThreadID    string        `json:"thread_id"`
 				ChatID      string        `json:"chat_id"`
 				ChatType    string        `json:"chat_type"`
 				MessageType string        `json:"message_type"`
 				Content     string        `json:"content"`
 				CreateTime  string        `json:"create_time"`
-				UpdateTime  string        `json:"update_time"`
 				Mentions    []interface{} `json:"mentions"`
 			} `json:"message"`
 			Sender struct {
-				SenderType string `json:"sender_type"`
-				SenderID   struct {
+				SenderID struct {
 					OpenID string `json:"open_id"`
 				} `json:"sender_id"`
 			} `json:"sender"`
@@ -98,54 +81,7 @@ func processImMessageReceive(_ context.Context, _ event.APIClient, raw *event.Ra
 		ChatType:    msg.ChatType,
 		MessageType: msg.MessageType,
 		SenderID:    envelope.Event.Sender.SenderID.OpenID,
-		SenderType:  envelope.Event.Sender.SenderType,
-		RootID:      msg.RootID,
-		ThreadID:    msg.ThreadID,
-		ReplyTo:     msg.ParentID,
 		Content:     content,
-		Mentions:    compactMentions(msg.Mentions),
-	}
-	if msg.UpdateTime != "" && msg.UpdateTime != msg.CreateTime {
-		out.UpdateTime = msg.UpdateTime
 	}
 	return json.Marshal(out)
 }
-
-func compactMentions(mentions []interface{}) []MentionOutput {
-	if len(mentions) == 0 {
-		return nil
-	}
-	out := make([]MentionOutput, 0, len(mentions))
-	for _, raw := range mentions {
-		item, _ := raw.(map[string]interface{})
-		mention := MentionOutput{
-			Key:  stringField(item, "key"),
-			ID:   mentionOpenID(item["id"]),
-			Name: stringField(item, "name"),
-		}
-		if mention.Key != "" || mention.ID != "" || mention.Name != "" {
-			out = append(out, mention)
-		}
-	}
-	if len(out) == 0 {
-		return nil
-	}
-	return out
-}
-
-func stringField(m map[string]interface{}, key string) string {
-	v, _ := m[key].(string)
-	return v
-}
-
-func mentionOpenID(raw interface{}) string {
-	switch v := raw.(type) {
-	case map[string]interface{}:
-		openID, _ := v["open_id"].(string)
-		return openID
-	case string:
-		return v
-	default:
-		return ""
-	}
-}
--- a/events/im/message_receive_test.go
+++ b/events/im/message_receive_test.go
@@ -84,32 +84,19 @@ func TestProcessImMessageReceive_Text(t *testing.T) {
 		},
 		"event": {
 			"sender": {
-				"sender_type": "user",
 				"sender_id": {"open_id": "ou_sender"}
 			},
 			"message": {
 				"message_id":   "om_text_001",
-				"root_id":      "om_root_001",
-				"parent_id":    "om_parent_001",
-				"thread_id":    "omt_thread_001",
 				"chat_id":      "oc_chat",
 				"chat_type":    "p2p",
 				"message_type": "text",
 				"create_time":  "1776409468987",
-				"update_time":  "1776409469999",
-				"content":      "{\"text\":\"hello @_user_1\"}",
-				"mentions": [
-					{
-						"key": "@_user_1",
-						"id": {"open_id": "ou_mentioned"},
-						"name": "Alice"
-					}
-				]
+				"content":      "{\"text\":\"hello there\"}"
 			}
 		}
 	}`
 	out := runReceive(t, payload)
-	outMap := runReceiveMap(t, payload)

 	if out.Type != "im.message.receive_v1" {
 		t.Errorf("Type = %q", out.Type)
@@ -123,69 +110,12 @@ func TestProcessImMessageReceive_Text(t *testing.T) {
 	if out.SenderID != "ou_sender" {
 		t.Errorf("SenderID = %q", out.SenderID)
 	}
-	if out.Content != "hello @Alice" {
-		t.Errorf("Content = %q, want \"hello @Alice\"", out.Content)
+	if out.Content != "hello there" {
+		t.Errorf("Content = %q, want \"hello there\"", out.Content)
 	}
 	if out.Timestamp != "1776409469273" {
 		t.Errorf("Timestamp = %q", out.Timestamp)
 	}
-	for field, want := range map[string]string{
-		"sender_type": "user",
-		"root_id":     "om_root_001",
-		"thread_id":   "omt_thread_001",
-		"reply_to":    "om_parent_001",
-		"update_time": "1776409469999",
-	} {
-		if got, _ := outMap[field].(string); got != want {
-			t.Errorf("%s = %q, want %q", field, got, want)
-		}
-	}
-	mentions, _ := outMap["mentions"].([]interface{})
-	if len(mentions) != 1 {
-		t.Fatalf("mentions length = %d, want 1: %#v", len(mentions), outMap["mentions"])
-	}
-	mention, _ := mentions[0].(map[string]interface{})
-	for field, want := range map[string]string{
-		"key":  "@_user_1",
-		"id":   "ou_mentioned",
-		"name": "Alice",
-	} {
-		if got, _ := mention[field].(string); got != want {
-			t.Errorf("mentions[0].%s = %q, want %q", field, got, want)
-		}
-	}
-}
-
-func TestProcessImMessageReceive_OmitsUnchangedUpdateTime(t *testing.T) {
-	payload := `{
-		"schema": "2.0",
-		"header": {
-			"event_id": "ev_test_text",
-			"event_type": "im.message.receive_v1",
-			"create_time": "1776409469273",
-			"app_id": "cli_test"
-		},
-		"event": {
-			"sender": {
-				"sender_type": "user",
-				"sender_id": {"open_id": "ou_sender"}
-			},
-			"message": {
-				"message_id":   "om_text_001",
-				"chat_id":      "oc_chat",
-				"chat_type":    "p2p",
-				"message_type": "text",
-				"create_time":  "1776409468987",
-				"update_time":  "1776409468987",
-				"content":      "{\"text\":\"hello there\"}"
-			}
-		}
-	}`
-	outMap := runReceiveMap(t, payload)
-
-	if _, ok := outMap["update_time"]; ok {
-		t.Errorf("update_time should be omitted when it equals create_time: %#v", outMap)
-	}
 }

 func TestProcessImMessageReceive_Interactive(t *testing.T) {
@@ -258,22 +188,3 @@ func runReceive(t *testing.T, payload string) ImMessageReceiveOutput {
 	}
 	return out
 }
-
-func runReceiveMap(t *testing.T, payload string) map[string]interface{} {
-	t.Helper()
-	raw := &event.RawEvent{
-		EventID:   "ev_test",
-		EventType: "im.message.receive_v1",
-		Payload:   json.RawMessage(payload),
-		Timestamp: time.Now(),
-	}
-	got, err := processImMessageReceive(context.Background(), nil, raw, nil)
-	if err != nil {
-		t.Fatalf("Process error: %v", err)
-	}
-	var out map[string]interface{}
-	if err := json.Unmarshal(got, &out); err != nil {
-		t.Fatalf("Process output is not valid JSON: %v\nraw=%s", err, string(got))
-	}
-	return out
-}
--- a/events/register.go
+++ b/events/register.go
@@ -5,7 +5,6 @@
 package events

 import (
-	"github.com/larksuite/cli/events/approval"
 	"github.com/larksuite/cli/events/im"
 	"github.com/larksuite/cli/events/minutes"
 	"github.com/larksuite/cli/events/task"
@@ -17,7 +16,6 @@ import (
 // Mail is intentionally omitted in this phase.
 func init() {
 	all := [][]event.KeyDefinition{
-		approval.Keys(),
 		im.Keys(),
 		minutes.Keys(),
 		task.Keys(),
--- a/extension/credential/env/env.go
+++ b/extension/credential/env/env.go
@@ -9,7 +9,6 @@ import (
 	"os"

 	"github.com/larksuite/cli/extension/credential"
-	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/envvars"
 )

@@ -42,7 +41,10 @@ func (p *Provider) ResolveAccount(ctx context.Context) (*credential.Account, err
 			Reason:   envvars.CliAppID + " is set but no app secret or access token is available",
 		}
 	}
-	brand := credential.Brand(core.ParseBrand(os.Getenv(envvars.CliBrand)))
+	brand := credential.Brand(os.Getenv(envvars.CliBrand))
+	if brand == "" {
+		brand = credential.BrandFeishu
+	}
 	acct := &credential.Account{AppID: appID, AppSecret: appSecret, Brand: brand}

 	switch id := credential.Identity(os.Getenv(envvars.CliDefaultAs)); id {
--- a/extension/credential/env/env_test.go
+++ b/extension/credential/env/env_test.go
@@ -22,13 +22,13 @@ func TestProvider_Name(t *testing.T) {
 func TestResolveAccount_BothSet(t *testing.T) {
 	t.Setenv(envvars.CliAppID, "cli_test")
 	t.Setenv(envvars.CliAppSecret, "secret_test")
-	t.Setenv(envvars.CliBrand, " LARK ")
+	t.Setenv(envvars.CliBrand, "feishu")

 	acct, err := (&Provider{}).ResolveAccount(context.Background())
 	if err != nil {
 		t.Fatal(err)
 	}
-	if acct.AppID != "cli_test" || acct.AppSecret != "secret_test" || acct.Brand != "lark" {
+	if acct.AppID != "cli_test" || acct.AppSecret != "secret_test" || acct.Brand != "feishu" {
 		t.Errorf("unexpected: %+v", acct)
 	}
 }
--- a/extension/credential/sidecar/provider.go
+++ b/extension/credential/sidecar/provider.go
@@ -16,7 +16,6 @@ import (
 	"os"

 	"github.com/larksuite/cli/extension/credential"
-	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/envvars"
 	"github.com/larksuite/cli/sidecar"
 )
@@ -59,7 +58,10 @@ func (p *Provider) ResolveAccount(ctx context.Context) (*credential.Account, err
 		}
 	}

-	brand := credential.Brand(core.ParseBrand(os.Getenv(envvars.CliBrand)))
+	brand := credential.Brand(os.Getenv(envvars.CliBrand))
+	if brand == "" {
+		brand = credential.BrandFeishu
+	}

 	acct := &credential.Account{
 		AppID:     appID,
--- a/extension/credential/sidecar/provider_test.go
+++ b/extension/credential/sidecar/provider_test.go
@@ -56,7 +56,7 @@ func TestResolveAccount_Active(t *testing.T) {
 	setEnv(t, envvars.CliAuthProxy, "http://127.0.0.1:16384")
 	setEnv(t, envvars.CliProxyKey, "test-key")
 	setEnv(t, envvars.CliAppID, "cli_test123")
-	setEnv(t, envvars.CliBrand, " LARK ")
+	setEnv(t, envvars.CliBrand, "lark")
 	unsetEnv(t, envvars.CliDefaultAs)
 	unsetEnv(t, envvars.CliStrictMode)

--- a/internal/auth/app_registration.go
+++ b/internal/auth/app_registration.go
@@ -6,7 +6,6 @@ package auth
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -17,46 +16,6 @@ import (
 	"github.com/larksuite/cli/internal/core"
 )

-// Terminal registration outcomes, exposed for typed classification by callers.
-var (
-	ErrRegistrationDenied   = errors.New("app registration denied by user")
-	ErrRegistrationExpired  = errors.New("device code expired, please try again")
-	ErrRegistrationTimedOut = errors.New("app registration timed out, please try again")
-)
-
-// Protocol defaults, mirroring the official SDK registration flow.
-const (
-	registrationBootstrapBrand = core.BrandFeishu
-	defaultPollIntervalSeconds = 5
-	defaultExpireInSeconds     = 600
-	beginRequestTimeout        = 30 * time.Second
-	maxPollIntervalSeconds     = 60
-)
-
-// normalizedInterval clamps a non-positive poll interval to the protocol default.
-func normalizedInterval(v int) int {
-	if v <= 0 {
-		return defaultPollIntervalSeconds
-	}
-	return v
-}
-
-// normalizedExpireIn clamps a non-positive expiry budget to the protocol default.
-func normalizedExpireIn(v int) int {
-	if v <= 0 {
-		return defaultExpireInSeconds
-	}
-	return v
-}
-
-// registrationContextError maps a done context to its terminal reason, keeping the cause.
-func registrationContextError(ctx context.Context) error {
-	if errors.Is(ctx.Err(), context.DeadlineExceeded) {
-		return fmt.Errorf("%w: %w", ErrRegistrationTimedOut, ctx.Err())
-	}
-	return fmt.Errorf("app registration cancelled: %w", ctx.Err())
-}
-
 // AppRegistrationResponse is the response from the app registration begin endpoint.
 type AppRegistrationResponse struct {
 	DeviceCode              string
@@ -80,24 +39,15 @@ type AppRegUserInfo struct {
 	TenantBrand string // "feishu" or "lark"
 }

-// appRegistrationEndpoint returns the brand's accounts registration endpoint.
-func appRegistrationEndpoint(brand core.LarkBrand) string {
-	return core.ResolveEndpoints(brand).Accounts + PathAppRegistration
-}
-
-// RequestAppRegistration initiates the device flow. The registration protocol
-// always bootstraps on Feishu; brand selects the user-facing verification host.
-// The request is bounded by ctx and a begin timeout.
-func RequestAppRegistration(ctx context.Context, httpClient *http.Client, brand core.LarkBrand, errOut io.Writer) (*AppRegistrationResponse, error) {
+// RequestAppRegistration initiates the app registration device flow.
+func RequestAppRegistration(httpClient *http.Client, brand core.LarkBrand, errOut io.Writer) (*AppRegistrationResponse, error) {
 	if errOut == nil {
 		errOut = io.Discard
 	}

-	ctx, cancel := context.WithTimeout(ctx, beginRequestTimeout)
-	defer cancel()
-
 	ep := core.ResolveEndpoints(brand)
-	endpoint := appRegistrationEndpoint(registrationBootstrapBrand)
+	regEp := core.ResolveEndpoints(core.BrandFeishu) // registration begin always uses feishu
+	endpoint := regEp.Accounts + PathAppRegistration

 	form := url.Values{}
 	form.Set("action", "begin")
@@ -105,7 +55,7 @@ func RequestAppRegistration(ctx context.Context, httpClient *http.Client, brand
 	form.Set("auth_method", "client_secret")
 	form.Set("request_user_info", "open_id tenant_brand")

-	req, err := http.NewRequestWithContext(ctx, "POST", endpoint, strings.NewReader(form.Encode()))
+	req, err := http.NewRequest("POST", endpoint, strings.NewReader(form.Encode()))
 	if err != nil {
 		return nil, err
 	}
@@ -120,7 +70,7 @@ func RequestAppRegistration(ctx context.Context, httpClient *http.Client, brand

 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, fmt.Errorf("app registration failed: read body: %w", err)
+		return nil, fmt.Errorf("app registration failed: read body: %v", err)
 	}

 	var data map[string]interface{}
@@ -140,26 +90,15 @@ func RequestAppRegistration(ctx context.Context, httpClient *http.Client, brand
 		return nil, fmt.Errorf("app registration failed: %s", msg)
 	}

-	// The protocol field is expire_in; accept the legacy expires_in spelling,
-	// then normalize to protocol defaults.
-	expiresIn := getInt(data, "expire_in", 0)
-	if expiresIn <= 0 {
-		expiresIn = getInt(data, "expires_in", 0)
-	}
-	expiresIn = normalizedExpireIn(expiresIn)
-	interval := normalizedInterval(getInt(data, "interval", 0))
-
-	deviceCode := getStr(data, "device_code")
-	if deviceCode == "" {
-		return nil, fmt.Errorf("app registration failed: response missing device_code")
-	}
+	expiresIn := getInt(data, "expires_in", 300)
+	interval := getInt(data, "interval", 5)

 	userCode := getStr(data, "user_code")
 	verificationUri := getStr(data, "verification_uri")
 	verificationUriComplete := fmt.Sprintf("%s/page/cli?user_code=%s", ep.Open, userCode)

 	return &AppRegistrationResponse{
-		DeviceCode:              deviceCode,
+		DeviceCode:              getStr(data, "device_code"),
 		UserCode:                getStr(data, "user_code"),
 		VerificationUri:         verificationUri,
 		VerificationUriComplete: verificationUriComplete,
@@ -179,97 +118,72 @@ func BuildVerificationURL(baseURL, cliVersion string) string {
 		"&from=cli"
 }

-// pollOnce performs one ctx-bound poll request and decodes the payload.
-func pollOnce(ctx context.Context, httpClient *http.Client, brand core.LarkBrand, deviceCode string) (map[string]interface{}, error) {
-	form := url.Values{}
-	form.Set("action", "poll")
-	form.Set("device_code", deviceCode)
-
-	req, err := http.NewRequestWithContext(ctx, "POST", appRegistrationEndpoint(brand), strings.NewReader(form.Encode()))
-	if err != nil {
-		return nil, fmt.Errorf("poll request: %w", err)
-	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-
-	resp, err := httpClient.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("poll network error: %w", err)
-	}
-	defer resp.Body.Close()
-	logHTTPResponse(resp)
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("poll read error: %w", err)
-	}
-	var data map[string]interface{}
-	if err := json.Unmarshal(body, &data); err != nil {
-		return nil, fmt.Errorf("poll parse error: %w", err)
-	}
-	return data, nil
-}
-
-// RegisterAppWithDiscovery polls for credentials, mirroring the official SDK
-// flow: the first poll and the (at most one) cross-brand switch are immediate,
-// non-error responses without complete credentials keep polling, and one
-// deadline from the begin expiry bounds all waits and in-flight requests.
-// The returned brand is the one the credentials were issued on.
-func RegisterAppWithDiscovery(ctx context.Context, httpClient *http.Client, resp *AppRegistrationResponse, errOut io.Writer) (*AppRegistrationResult, core.LarkBrand, error) {
+// PollAppRegistration polls the app registration endpoint until the app is created or the flow times out.
+// If the result has ClientSecret == "" and UserInfo.TenantBrand == "lark", the caller should
+// retry with BrandLark to get the secret from accounts.larksuite.com.
+func PollAppRegistration(ctx context.Context, httpClient *http.Client, brand core.LarkBrand, deviceCode string, interval, expiresIn int, errOut io.Writer) (*AppRegistrationResult, error) {
 	if errOut == nil {
 		errOut = io.Discard
 	}

-	// Interval and expiry arrive normalized from begin-response parsing
-	// (normalizedInterval floors them there); the loop trusts them as-is.
-	interval := resp.Interval
-	ctx, cancel := context.WithDeadline(ctx,
-		time.Now().Add(time.Duration(resp.ExpiresIn)*time.Second))
-	defer cancel()
+	const maxPollInterval = 60
+	const maxPollAttempts = 200

-	currentBrand := registrationBootstrapBrand
-	effectiveBrand := currentBrand
-	switched := false
-	waitBeforePoll := false
+	ep := core.ResolveEndpoints(brand)
+	endpoint := ep.Accounts + PathAppRegistration
+	deadline := time.Now().Add(time.Duration(expiresIn) * time.Second)
+	currentInterval := interval
+	attempts := 0

-	for {
-		if waitBeforePoll {
-			select {
-			case <-time.After(time.Duration(interval) * time.Second):
-			case <-ctx.Done():
-				return nil, effectiveBrand, registrationContextError(ctx)
-			}
-		}
-		waitBeforePoll = true
+	for time.Now().Before(deadline) && attempts < maxPollAttempts {
+		attempts++
 		if ctx.Err() != nil {
-			return nil, effectiveBrand, registrationContextError(ctx)
+			return nil, fmt.Errorf("polling was cancelled")
 		}

-		data, err := pollOnce(ctx, httpClient, currentBrand, resp.DeviceCode)
+		select {
+		case <-time.After(time.Duration(currentInterval) * time.Second):
+		case <-ctx.Done():
+			return nil, fmt.Errorf("polling was cancelled")
+		}
+
+		form := url.Values{}
+		form.Set("action", "poll")
+		form.Set("device_code", deviceCode)
+
+		req, err := http.NewRequest("POST", endpoint, strings.NewReader(form.Encode()))
 		if err != nil {
-			fmt.Fprintf(errOut, "[lark-cli] [WARN] app-registration: %v\n", err)
-			interval = minInt(interval+1, maxPollIntervalSeconds)
+			continue
+		}
+		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+
+		resp, err := httpClient.Do(req)
+		if err != nil {
+			fmt.Fprintf(errOut, "[lark-cli] [WARN] app-registration: poll network error: %v\n", err)
+			currentInterval = minInt(currentInterval+1, maxPollInterval)
+			continue
+		}
+		logHTTPResponse(resp)
+
+		body, err := io.ReadAll(resp.Body)
+		resp.Body.Close()
+		if err != nil {
+			fmt.Fprintf(errOut, "[lark-cli] [WARN] app-registration: poll read error: %v\n", err)
+			currentInterval = minInt(currentInterval+1, maxPollInterval)
 			continue
 		}

-		// A cross-brand tenant report switches the polled domain (once,
-		// immediately) regardless of the accompanying status — the signal can
-		// arrive alongside authorization_pending, mirroring the official SDK.
-		if !switched {
-			if userInfoRaw, ok := data["user_info"].(map[string]interface{}); ok {
-				if tb := getStr(userInfoRaw, "tenant_brand"); tb != "" {
-					if actual := core.ParseBrand(tb); actual != currentBrand {
-						currentBrand = actual
-						effectiveBrand = actual
-						switched = true
-						waitBeforePoll = false
-						continue
-					}
-				}
-			}
+		var data map[string]interface{}
+		if err := json.Unmarshal(body, &data); err != nil {
+			fmt.Fprintf(errOut, "[lark-cli] [WARN] app-registration: poll parse error: %v\n", err)
+			currentInterval = minInt(currentInterval+1, maxPollInterval)
+			continue
 		}

 		errStr := getStr(data, "error")
-		if errStr == "" {
+
+		// Success: client_id present
+		if errStr == "" && getStr(data, "client_id") != "" {
 			result := &AppRegistrationResult{
 				ClientID:     getStr(data, "client_id"),
 				ClientSecret: getStr(data, "client_secret"),
@@ -280,37 +194,34 @@ func RegisterAppWithDiscovery(ctx context.Context, httpClient *http.Client, resp
 					TenantBrand: getStr(userInfoRaw, "tenant_brand"),
 				}
 			}
-
-			if result.ClientID != "" && result.ClientSecret != "" {
-				// The issuing domain is authoritative; a contradictory final
-				// tenant report is a protocol violation, not a brand override.
-				if result.UserInfo != nil && result.UserInfo.TenantBrand != "" &&
-					core.ParseBrand(result.UserInfo.TenantBrand) != effectiveBrand {
-					return nil, effectiveBrand, fmt.Errorf("app registration returned credentials with a contradictory tenant brand %q", result.UserInfo.TenantBrand)
-				}
-				return result, effectiveBrand, nil
-			}
-			// Incomplete credentials without an error: keep polling.
-			continue
+			return result, nil
 		}

 		switch errStr {
 		case "authorization_pending":
 			continue
 		case "slow_down":
-			interval = minInt(interval+5, maxPollIntervalSeconds)
-			fmt.Fprintf(errOut, "[lark-cli] app-registration: slow_down, interval increased to %ds\n", interval)
+			currentInterval = minInt(currentInterval+5, maxPollInterval)
+			fmt.Fprintf(errOut, "[lark-cli] app-registration: slow_down, interval increased to %ds\n", currentInterval)
 			continue
 		case "access_denied":
-			return nil, effectiveBrand, ErrRegistrationDenied
+			return nil, fmt.Errorf("app registration denied by user")
 		case "expired_token", "invalid_grant":
-			return nil, effectiveBrand, ErrRegistrationExpired
+			return nil, fmt.Errorf("device code expired, please try again")
 		}

 		desc := getStr(data, "error_description")
 		if desc == "" {
 			desc = errStr
 		}
-		return nil, effectiveBrand, fmt.Errorf("app registration failed: %s", desc)
+		if desc == "" {
+			desc = "Unknown error"
+		}
+		return nil, fmt.Errorf("app registration failed: %s", desc)
 	}
+
+	if attempts >= maxPollAttempts {
+		fmt.Fprintf(errOut, "[lark-cli] [WARN] app-registration: max poll attempts (%d) reached\n", maxPollAttempts)
+	}
+	return nil, fmt.Errorf("app registration timed out, please try again")
 }
--- a/internal/auth/app_registration_test.go
+++ b/internal/auth/app_registration_test.go
@@ -4,28 +4,11 @@
 package auth

 import (
-	"context"
-	"errors"
-	"io"
-	"net/http"
-	"strings"
 	"testing"
-	"time"

-	"github.com/larksuite/cli/internal/core"
 	"github.com/smartystreets/goconvey/convey"
 )

-// jsonResponse builds a canned registration response (transport fakes reuse
-// roundTripFunc from device_flow_test.go).
-func jsonResponse(body string) *http.Response {
-	return &http.Response{
-		StatusCode: http.StatusOK,
-		Body:       io.NopCloser(strings.NewReader(body)),
-		Header:     make(http.Header),
-	}
-}
-
 // Test_BuildVerificationURL verifies that tracking parameters are correctly appended.
 func Test_BuildVerificationURL(t *testing.T) {
 	t.Run("URL不含问号则添加?分隔符", func(t *testing.T) {
@@ -48,358 +31,3 @@ func Test_BuildVerificationURL(t *testing.T) {
 		})
 	})
 }
-
-func TestAppRegistrationEndpoint(t *testing.T) {
-	cases := []struct {
-		brand core.LarkBrand
-		want  string
-	}{
-		{core.BrandFeishu, "https://accounts.feishu.cn" + PathAppRegistration},
-		{core.BrandLark, "https://accounts.larksuite.com" + PathAppRegistration},
-	}
-	for _, c := range cases {
-		if got := appRegistrationEndpoint(c.brand); got != c.want {
-			t.Errorf("brand %q: endpoint = %q, want %q", c.brand, got, c.want)
-		}
-	}
-}
-
-func TestRequestAppRegistration_UsesFeishuBootstrapAndConfiguredVerificationBrand(t *testing.T) {
-	cases := []struct {
-		brand            core.LarkBrand
-		verificationHost string
-	}{
-		{core.BrandFeishu, "open.feishu.cn"},
-		{core.BrandLark, "open.larksuite.com"},
-	}
-	for _, c := range cases {
-		t.Run(string(c.brand), func(t *testing.T) {
-			client := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-				if got, want := r.URL.Host, "accounts.feishu.cn"; got != want {
-					t.Errorf("begin host = %q, want bootstrap host %q", got, want)
-				}
-				return jsonResponse(`{"device_code":"d","user_code":"TEST-CODE","expire_in":60,"interval":5}`), nil
-			})}
-			resp, err := RequestAppRegistration(context.Background(), client, c.brand, io.Discard)
-			if err != nil {
-				t.Fatalf("RequestAppRegistration(%q) error = %v", c.brand, err)
-			}
-			if !strings.HasPrefix(resp.VerificationUriComplete, "https://"+c.verificationHost+"/page/cli?") {
-				t.Errorf("verification URL = %q, want host %q", resp.VerificationUriComplete, c.verificationHost)
-			}
-		})
-	}
-}
-
-// Full Lark routing contract: Lark selects the Lark verification page, while
-// registration bootstraps on Feishu and switches only after the tenant signal.
-// The Lark credential response omits user_info, so the effective domain must
-// still determine the saved brand.
-func TestRegisterAppWithDiscovery_LarkFlowUsesProtocolBootstrap(t *testing.T) {
-	var calls []string
-	client := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		if err := r.ParseForm(); err != nil {
-			t.Fatalf("parse form: %v", err)
-		}
-		action := r.Form.Get("action")
-		calls = append(calls, action+"@"+r.URL.Host)
-		if action == "begin" {
-			return jsonResponse(`{"device_code":"device","user_code":"TEST-CODE","expire_in":60,"interval":0}`), nil
-		}
-		switch r.URL.Host {
-		case "accounts.feishu.cn":
-			return jsonResponse(`{"user_info":{"open_id":"ou_x","tenant_brand":"lark"}}`), nil
-		case "accounts.larksuite.com":
-			return jsonResponse(`{"client_id":"cli_x","client_secret":"test-secret"}`), nil
-		}
-		t.Errorf("unexpected host polled: %s", r.URL.Host)
-		return jsonResponse(`{}`), nil
-	})}
-	resp, err := RequestAppRegistration(context.Background(), client, core.BrandLark, io.Discard)
-	if err != nil {
-		t.Fatalf("RequestAppRegistration error = %v", err)
-	}
-	if got, want := resp.VerificationUriComplete, "https://open.larksuite.com/page/cli?user_code=TEST-CODE"; got != want {
-		t.Errorf("verification URL = %q, want %q", got, want)
-	}
-
-	result, finalBrand, err := RegisterAppWithDiscovery(context.Background(), client, resp, io.Discard)
-	if err != nil {
-		t.Fatalf("RegisterAppWithDiscovery error = %v, want nil", err)
-	}
-	if finalBrand != core.BrandLark {
-		t.Errorf("finalBrand = %q, want %q (credentials were issued on the lark domain)", finalBrand, core.BrandLark)
-	}
-	if result.ClientID != "cli_x" || result.ClientSecret != "test-secret" {
-		t.Errorf("credentials = (%q, %q), want (cli_x, test-secret)", result.ClientID, result.ClientSecret)
-	}
-	want := []string{"begin@accounts.feishu.cn", "poll@accounts.feishu.cn", "poll@accounts.larksuite.com"}
-	if len(calls) != len(want) {
-		t.Fatalf("calls = %v, want %v", calls, want)
-	}
-	for i := range want {
-		if calls[i] != want[i] {
-			t.Errorf("calls = %v, want %v", calls, want)
-			break
-		}
-	}
-}
-
-// Plain path: the bootstrap domain can return complete Feishu credentials in
-// one poll, even when user_info is absent.
-func TestRegisterAppWithDiscovery_BootstrapBrandSinglePoll(t *testing.T) {
-	polls := 0
-	client := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		polls++
-		if got, want := r.URL.Host, "accounts.feishu.cn"; got != want {
-			t.Errorf("poll host = %q, want %q", got, want)
-		}
-		return jsonResponse(`{"client_id":"cli_x","client_secret":"test-secret"}`), nil
-	})}
-	resp := &AppRegistrationResponse{DeviceCode: "device", Interval: 0, ExpiresIn: 5}
-
-	_, finalBrand, err := RegisterAppWithDiscovery(context.Background(), client, resp, io.Discard)
-	if err != nil {
-		t.Fatalf("RegisterAppWithDiscovery error = %v, want nil", err)
-	}
-	if finalBrand != core.BrandFeishu {
-		t.Errorf("finalBrand = %q, want %q", finalBrand, core.BrandFeishu)
-	}
-	if polls != 1 {
-		t.Errorf("polls = %d, want 1", polls)
-	}
-}
-
-// The discovery deadline must cancel in-flight requests: the fake transport
-// hangs until the request context is done.
-func TestRegisterAppWithDiscovery_DeadlineBoundsInFlightRequests(t *testing.T) {
-	client := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		<-r.Context().Done()
-		return nil, r.Context().Err()
-	})}
-	resp := &AppRegistrationResponse{DeviceCode: "device", Interval: 0, ExpiresIn: 1}
-
-	start := time.Now()
-	_, _, err := RegisterAppWithDiscovery(context.Background(), client, resp, io.Discard)
-	if err == nil {
-		t.Fatal("expected timeout error, got nil")
-	}
-	if !strings.Contains(err.Error(), "timed out") {
-		t.Errorf("error = %v, want a timed-out terminal reason", err)
-	}
-	if elapsed := time.Since(start); elapsed > 3*time.Second {
-		t.Errorf("discovery not bounded by its deadline: took %v", elapsed)
-	}
-}
-
-// Empty payloads and incomplete same-brand responses are not terminal.
-func TestRegisterAppWithDiscovery_PollsUntilCredentials(t *testing.T) {
-	responses := []string{
-		`{}`,
-		`{"client_id":"cli_x","user_info":{"open_id":"ou_x","tenant_brand":"feishu"}}`,
-		`{"client_id":"cli_x","client_secret":"test-secret","user_info":{"open_id":"ou_x","tenant_brand":"feishu"}}`,
-	}
-	polls := 0
-	client := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		body := responses[polls]
-		polls++
-		return jsonResponse(body), nil
-	})}
-	resp := &AppRegistrationResponse{DeviceCode: "device", Interval: 0, ExpiresIn: 5}
-
-	result, finalBrand, err := RegisterAppWithDiscovery(context.Background(), client, resp, io.Discard)
-	if err != nil {
-		t.Fatalf("RegisterAppWithDiscovery error = %v, want nil", err)
-	}
-	if polls != 3 {
-		t.Errorf("polls = %d, want 3", polls)
-	}
-	if result.ClientSecret != "test-secret" || finalBrand != core.BrandFeishu {
-		t.Errorf("result = (%q, %q), want (test-secret, feishu)", result.ClientSecret, finalBrand)
-	}
-}
-
-// Neither the first poll nor the cross-brand switch waits out the interval
-// (a 5s interval would blow the elapsed bound).
-func TestRegisterAppWithDiscovery_ImmediateFirstPollAndSwitch(t *testing.T) {
-	var polledHosts []string
-	client := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		polledHosts = append(polledHosts, r.URL.Host)
-		if r.URL.Host == "accounts.feishu.cn" {
-			return jsonResponse(`{"user_info":{"open_id":"ou_x","tenant_brand":"lark"}}`), nil
-		}
-		return jsonResponse(`{"client_id":"cli_x","client_secret":"test-secret"}`), nil
-	})}
-	resp := &AppRegistrationResponse{DeviceCode: "device", Interval: 5, ExpiresIn: 60}
-
-	start := time.Now()
-	result, finalBrand, err := RegisterAppWithDiscovery(context.Background(), client, resp, io.Discard)
-	if err != nil {
-		t.Fatalf("RegisterAppWithDiscovery error = %v, want nil", err)
-	}
-	if elapsed := time.Since(start); elapsed > 2*time.Second {
-		t.Errorf("discovery waited an interval somewhere: took %v", elapsed)
-	}
-	if finalBrand != core.BrandLark || result.ClientSecret != "test-secret" {
-		t.Errorf("result = (%q, %q), want (test-secret, lark)", result.ClientSecret, finalBrand)
-	}
-	want := []string{"accounts.feishu.cn", "accounts.larksuite.com"}
-	if len(polledHosts) != 2 || polledHosts[0] != want[0] || polledHosts[1] != want[1] {
-		t.Errorf("polled hosts = %v, want %v", polledHosts, want)
-	}
-}
-
-// Denial and expiry map to sentinels; cancellation preserves its cause.
-func TestRegisterAppWithDiscovery_TerminalSentinels(t *testing.T) {
-	deny := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		return jsonResponse(`{"error":"access_denied"}`), nil
-	})}
-	resp := &AppRegistrationResponse{DeviceCode: "device", Interval: 0, ExpiresIn: 5}
-	_, _, err := RegisterAppWithDiscovery(context.Background(), deny, resp, io.Discard)
-	if !errors.Is(err, ErrRegistrationDenied) {
-		t.Errorf("denied err = %v, want ErrRegistrationDenied", err)
-	}
-
-	expired := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		return jsonResponse(`{"error":"expired_token"}`), nil
-	})}
-	_, _, err = RegisterAppWithDiscovery(context.Background(), expired, resp, io.Discard)
-	if !errors.Is(err, ErrRegistrationExpired) {
-		t.Errorf("expired err = %v, want ErrRegistrationExpired", err)
-	}
-
-	cancelledCtx, cancel := context.WithCancel(context.Background())
-	cancel()
-	_, _, err = RegisterAppWithDiscovery(cancelledCtx, deny, resp, io.Discard)
-	if !errors.Is(err, context.Canceled) {
-		t.Errorf("cancelled err = %v, want a context.Canceled cause", err)
-	}
-}
-
-// Begin parsing: expire_in (legacy expires_in fallback), normalization, and
-// required device_code.
-func TestRequestAppRegistration_ProtocolFields(t *testing.T) {
-	serve := func(body string) *http.Client {
-		return &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-			return jsonResponse(body), nil
-		})}
-	}
-
-	resp, err := RequestAppRegistration(context.Background(),
-		serve(`{"device_code":"d","expire_in":60,"interval":3}`), core.BrandFeishu, io.Discard)
-	if err != nil {
-		t.Fatalf("begin error = %v", err)
-	}
-	if resp.ExpiresIn != 60 || resp.Interval != 3 {
-		t.Errorf("parsed (expire=%d, interval=%d), want (60, 3)", resp.ExpiresIn, resp.Interval)
-	}
-
-	resp, err = RequestAppRegistration(context.Background(),
-		serve(`{"device_code":"d","expires_in":45}`), core.BrandFeishu, io.Discard)
-	if err != nil {
-		t.Fatalf("legacy begin error = %v", err)
-	}
-	if resp.ExpiresIn != 45 || resp.Interval != 5 {
-		t.Errorf("legacy parsed (expire=%d, interval=%d), want (45, 5 — normalized default)", resp.ExpiresIn, resp.Interval)
-	}
-
-	resp, err = RequestAppRegistration(context.Background(),
-		serve(`{"device_code":"d","interval":0}`), core.BrandFeishu, io.Discard)
-	if err != nil {
-		t.Fatalf("defaults begin error = %v", err)
-	}
-	if resp.ExpiresIn != 600 || resp.Interval != 5 {
-		t.Errorf("defaults parsed (expire=%d, interval=%d), want (600, 5)", resp.ExpiresIn, resp.Interval)
-	}
-
-	if _, err := RequestAppRegistration(context.Background(),
-		serve(`{"interval":5}`), core.BrandFeishu, io.Discard); err == nil {
-		t.Error("missing device_code: expected error, got nil")
-	}
-}
-
-// A tenant signal arriving alongside authorization_pending must still switch
-// the polled domain (the official SDK checks the signal before the error).
-func TestRegisterAppWithDiscovery_PendingWithTenantSignalSwitches(t *testing.T) {
-	var polledHosts []string
-	client := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		polledHosts = append(polledHosts, r.URL.Host)
-		if r.URL.Host == "accounts.feishu.cn" {
-			return jsonResponse(`{"error":"authorization_pending","user_info":{"tenant_brand":"lark"}}`), nil
-		}
-		return jsonResponse(`{"client_id":"cli_x","client_secret":"test-secret"}`), nil
-	})}
-	resp := &AppRegistrationResponse{DeviceCode: "device", Interval: 0, ExpiresIn: 5}
-
-	result, finalBrand, err := RegisterAppWithDiscovery(context.Background(), client, resp, io.Discard)
-	if err != nil {
-		t.Fatalf("RegisterAppWithDiscovery error = %v, want nil", err)
-	}
-	if finalBrand != core.BrandLark || result.ClientSecret != "test-secret" {
-		t.Errorf("result = (%q, %q), want (test-secret, lark)", result.ClientSecret, finalBrand)
-	}
-	want := []string{"accounts.feishu.cn", "accounts.larksuite.com"}
-	if len(polledHosts) != 2 || polledHosts[0] != want[0] || polledHosts[1] != want[1] {
-		t.Errorf("polled hosts = %v, want %v", polledHosts, want)
-	}
-}
-
-// Polling has no attempt cap: only the expiry budget terminates the loop.
-func TestRegisterAppWithDiscovery_NoAttemptCap(t *testing.T) {
-	polls := 0
-	client := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		polls++
-		if polls <= 250 {
-			return jsonResponse(`{"error":"authorization_pending"}`), nil
-		}
-		return jsonResponse(`{"client_id":"cli_x","client_secret":"test-secret"}`), nil
-	})}
-	resp := &AppRegistrationResponse{DeviceCode: "device", Interval: 0, ExpiresIn: 30}
-
-	result, _, err := RegisterAppWithDiscovery(context.Background(), client, resp, io.Discard)
-	if err != nil {
-		t.Fatalf("RegisterAppWithDiscovery error = %v, want nil (no attempts cap)", err)
-	}
-	if polls != 251 || result.ClientSecret != "test-secret" {
-		t.Errorf("polls = %d (want 251), secret = %q", polls, result.ClientSecret)
-	}
-}
-
-// A final tenant report contradicting the issuing domain is a protocol
-// violation, not a brand override: the saved brand must never diverge from
-// the domain that issued the credentials.
-func TestRegisterAppWithDiscovery_ContradictoryFinalBrandFails(t *testing.T) {
-	client := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		if r.URL.Host == "accounts.feishu.cn" {
-			return jsonResponse(`{"error":"authorization_pending","user_info":{"tenant_brand":"lark"}}`), nil
-		}
-		// The lark domain issues credentials but reports a feishu tenant.
-		return jsonResponse(`{"client_id":"cli_x","client_secret":"test-secret","user_info":{"tenant_brand":"feishu"}}`), nil
-	})}
-	resp := &AppRegistrationResponse{DeviceCode: "device", Interval: 0, ExpiresIn: 5}
-
-	_, _, err := RegisterAppWithDiscovery(context.Background(), client, resp, io.Discard)
-	if err == nil || !strings.Contains(err.Error(), "contradictory tenant brand") {
-		t.Errorf("err = %v, want contradictory-tenant-brand protocol error", err)
-	}
-}
-
-// A cancelled body read during begin must keep its context cause so the
-// command layer classifies it as a cancellation, not an API failure.
-func TestRequestAppRegistration_BodyReadCancelKeepsCause(t *testing.T) {
-	client := &http.Client{Transport: roundTripFunc(func(r *http.Request) (*http.Response, error) {
-		return &http.Response{
-			StatusCode: http.StatusOK,
-			Body:       io.NopCloser(&errReader{err: context.Canceled}),
-			Header:     make(http.Header),
-		}, nil
-	})}
-	_, err := RequestAppRegistration(context.Background(), client, core.BrandFeishu, io.Discard)
-	if !errors.Is(err, context.Canceled) {
-		t.Errorf("err = %v, want a context.Canceled cause", err)
-	}
-}
-
-type errReader struct{ err error }
-
-func (r *errReader) Read([]byte) (int, error) { return 0, r.err }
--- a/internal/cmdutil/dryrun.go
+++ b/internal/cmdutil/dryrun.go
@@ -8,29 +8,15 @@ import (
 	"fmt"
 	"io"
 	"net/url"
-	"regexp"
 	"sort"
 	"strings"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/client"
 	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/output"
 	"github.com/larksuite/cli/internal/util"
 )

-var dryRunURLPlaceholderRE = regexp.MustCompile(`:([A-Za-z_][A-Za-z0-9_]*)`)
-
-// DryRunOutputOptions controls dry-run stdout/stderr rendering.
-type DryRunOutputOptions struct {
-	Format      string
-	JqExpr      string
-	CommandPath string
-	Identity    core.Identity
-	Out         io.Writer
-	ErrOut      io.Writer
-}
-
 // DryRunAPICall describes a single API call in dry-run output.
 type DryRunAPICall struct {
 	Desc   string                 `json:"desc,omitempty"`
@@ -40,21 +26,12 @@ type DryRunAPICall struct {
 	Body   interface{}            `json:"body,omitempty"`
 }

-// DryRunContext is the execution context shared by every dry-run preview:
-// which app would make the call and, when known, as which user. The identity
-// itself lives at the envelope top level, not here.
-type DryRunContext struct {
-	AppID      string `json:"app_id,omitempty"`
-	UserOpenID string `json:"user_open_id,omitempty"`
-}
-
 // DryRunAPI is the builder and result type for dry-run output.
 // URL templates use :param placeholders; Set stores actual values; MarshalJSON and Format resolve them.
 type DryRunAPI struct {
-	desc    string
-	calls   []DryRunAPICall
-	context *DryRunContext
-	extra   map[string]interface{}
+	desc  string
+	calls []DryRunAPICall
+	extra map[string]interface{}
 }

 func NewDryRunAPI() *DryRunAPI {
@@ -63,22 +40,30 @@ func NewDryRunAPI() *DryRunAPI {

 // --- HTTP method builders (add a call, return self for chaining) ---

-// call appends a request with the method transcribed verbatim, so previews
-// never misreport what the real client would send.
-func (d *DryRunAPI) call(method, url string) *DryRunAPI {
-	d.calls = append(d.calls, DryRunAPICall{Method: method, URL: url})
+func (d *DryRunAPI) GET(url string) *DryRunAPI {
+	d.calls = append(d.calls, DryRunAPICall{Method: "GET", URL: url})
 	return d
 }

-func (d *DryRunAPI) GET(url string) *DryRunAPI { return d.call("GET", url) }
+func (d *DryRunAPI) POST(url string) *DryRunAPI {
+	d.calls = append(d.calls, DryRunAPICall{Method: "POST", URL: url})
+	return d
+}

-func (d *DryRunAPI) POST(url string) *DryRunAPI { return d.call("POST", url) }
+func (d *DryRunAPI) PUT(url string) *DryRunAPI {
+	d.calls = append(d.calls, DryRunAPICall{Method: "PUT", URL: url})
+	return d
+}

-func (d *DryRunAPI) PUT(url string) *DryRunAPI { return d.call("PUT", url) }
+func (d *DryRunAPI) DELETE(url string) *DryRunAPI {
+	d.calls = append(d.calls, DryRunAPICall{Method: "DELETE", URL: url})
+	return d
+}

-func (d *DryRunAPI) DELETE(url string) *DryRunAPI { return d.call("DELETE", url) }
-
-func (d *DryRunAPI) PATCH(url string) *DryRunAPI { return d.call("PATCH", url) }
+func (d *DryRunAPI) PATCH(url string) *DryRunAPI {
+	d.calls = append(d.calls, DryRunAPICall{Method: "PATCH", URL: url})
+	return d
+}

 // Body sets the request body on the last added call.
 func (d *DryRunAPI) Body(body interface{}) *DryRunAPI {
@@ -113,26 +98,12 @@ func (d *DryRunAPI) Set(key string, value interface{}) *DryRunAPI {
 	return d
 }

-// Context records the calling app/user under data.context; empty values are
-// omitted, and a fully empty context is not emitted at all.
-func (d *DryRunAPI) Context(appID, userOpenID string) *DryRunAPI {
-	if appID == "" && userOpenID == "" {
-		return d
-	}
-	d.context = &DryRunContext{AppID: appID, UserOpenID: userOpenID}
-	return d
-}
-
 // resolveURL replaces :key placeholders in url with path-escaped values from extra.
 func (d *DryRunAPI) resolveURL(rawURL string) string {
-	return dryRunURLPlaceholderRE.ReplaceAllStringFunc(rawURL, func(token string) string {
-		name := token[1:]
-		value, ok := d.extra[name]
-		if !ok {
-			return token
-		}
-		return url.PathEscape(fmt.Sprintf("%v", value))
-	})
+	for k, v := range d.extra {
+		rawURL = strings.ReplaceAll(rawURL, ":"+k, url.PathEscape(fmt.Sprintf("%v", v)))
+	}
+	return rawURL
 }

 // MarshalJSON serializes as {"description": "...", "api": [...calls with resolved URLs], ...extra}.
@@ -147,17 +118,13 @@ func (d *DryRunAPI) MarshalJSON() ([]byte, error) {
 			Body:   c.Body,
 		}
 	}
-	m := make(map[string]interface{}, len(d.extra)+3)
-	for k, v := range d.extra {
-		m[k] = v
-	}
-	// Typed fields win over same-named extra keys.
+	m := make(map[string]interface{}, len(d.extra)+2)
 	if d.desc != "" {
 		m["description"] = d.desc
 	}
 	m["api"] = resolved
-	if d.context != nil {
-		m["context"] = d.context
+	for k, v := range d.extra {
+		m[k] = v
 	}
 	return json.Marshal(m)
 }
@@ -187,7 +154,11 @@ func (d *DryRunAPI) Format() string {
 			u += "?" + encodeParams(c.Params)
 		}

-		b.WriteString(c.Method)
+		method := c.Method
+		if method == "" {
+			method = "GET"
+		}
+		b.WriteString(method)
 		b.WriteByte(' ')
 		b.WriteString(u)
 		b.WriteByte('\n')
@@ -244,74 +215,83 @@ func encodeParams(params map[string]interface{}) string {
 	return vals.Encode()
 }

-// buildDryRunPreview assembles the shared preview skeleton: HTTP method, URL,
-// query params, and the app/user context common to every dry-run.
-func buildDryRunPreview(request client.RawApiRequest, config *core.CliConfig) *DryRunAPI {
-	dr := NewDryRunAPI().call(request.Method, request.URL)
+// PrintDryRunWithFile outputs a dry-run summary for file upload requests.
+// Instead of serializing the Formdata body, it shows file metadata.
+func PrintDryRunWithFile(w io.Writer, request client.RawApiRequest, config *core.CliConfig, format, fileField, filePath string, formFields any) error {
+	dr := NewDryRunAPI()
+	switch request.Method {
+	case "POST":
+		dr.POST(request.URL)
+	case "PUT":
+		dr.PUT(request.URL)
+	case "PATCH":
+		dr.PATCH(request.URL)
+	case "DELETE":
+		dr.DELETE(request.URL)
+	default:
+		dr.GET(request.URL)
+	}
 	if len(request.Params) > 0 {
 		dr.Params(request.Params)
 	}
-	// Identity is reported at the envelope top level, not duplicated here.
-	dr.Context(config.AppID, config.UserOpenId)
-	return dr
-}
-
-// PrintDryRunWithFile outputs a dry-run summary for file upload requests.
-// Instead of serializing the Formdata body, it shows file metadata.
-func PrintDryRunWithFile(request client.RawApiRequest, config *core.CliConfig, opts DryRunOutputOptions, file FileUploadMeta) error {
-	dr := buildDryRunPreview(request, config)
-	filePathDisplay := file.FilePath
+	filePathDisplay := filePath
 	if filePathDisplay == "" {
 		filePathDisplay = "<stdin>"
 	}
 	fileInfo := map[string]any{
-		"file": map[string]string{"field": file.FieldName, "path": filePathDisplay},
+		"file": map[string]string{"field": fileField, "path": filePathDisplay},
 	}
-	if file.FormFields != nil {
-		fileInfo["form_fields"] = file.FormFields
+	if formFields != nil {
+		fileInfo["form_fields"] = formFields
 	}
 	fileInfo["options"] = []string{"WithFileUpload"}
 	dr.Body(fileInfo)
-	return WriteDryRun(dr, opts)
+	dr.Set("as", string(request.As))
+	dr.Set("appId", config.AppID)
+	if config.UserOpenId != "" {
+		dr.Set("userOpenId", config.UserOpenId)
+	}
+	fmt.Fprintln(w, "=== Dry Run ===")
+	if format == "pretty" {
+		fmt.Fprint(w, dr.Format())
+	} else {
+		output.PrintJson(w, dr)
+	}
+	return nil
 }

 // PrintDryRun outputs a standardised dry-run summary using DryRunAPI.
 // When format is "pretty", outputs human-readable text; otherwise JSON.
-func PrintDryRun(request client.RawApiRequest, config *core.CliConfig, opts DryRunOutputOptions) error {
-	dr := buildDryRunPreview(request, config)
+func PrintDryRun(w io.Writer, request client.RawApiRequest, config *core.CliConfig, format string) error {
+	dr := NewDryRunAPI()
+	switch request.Method {
+	case "POST":
+		dr.POST(request.URL)
+	case "PUT":
+		dr.PUT(request.URL)
+	case "PATCH":
+		dr.PATCH(request.URL)
+	case "DELETE":
+		dr.DELETE(request.URL)
+	default:
+		dr.GET(request.URL)
+	}
+	if len(request.Params) > 0 {
+		dr.Params(request.Params)
+	}
 	if !util.IsNil(request.Data) {
 		dr.Body(request.Data)
 	}
-	return WriteDryRun(dr, opts)
-}
-
-// WriteDryRun emits a DryRunAPI using the shared dry-run output contract.
-// Identity may be empty; the envelope omits it rather than guessing.
-func WriteDryRun(dr *DryRunAPI, opts DryRunOutputOptions) error {
-	if dr == nil {
-		return errs.NewInternalError(errs.SubtypeUnknown, "dry-run produced no request preview")
+	dr.Set("as", string(request.As))
+	dr.Set("appId", config.AppID)
+	if config.UserOpenId != "" {
+		dr.Set("userOpenId", config.UserOpenId)
 	}
-	// The JqExpr guard is defensive: every entry point already rejects --jq
-	// combined with --format pretty via output.ValidateJqFlags.
-	if opts.Format == "pretty" && opts.JqExpr == "" {
-		// A nil ErrOut only skips the banner decoration (mirroring
-		// WriteSuccessEnvelope's warning path); the payload write to Out
-		// must fail loudly rather than be silently discarded.
-		if opts.ErrOut != nil {
-			fmt.Fprintln(opts.ErrOut, "=== Dry Run ===")
-		}
-		// stdout carries its own marker so logs that drop stderr still show
-		// this was a preview, not an executed request.
-		fmt.Fprintln(opts.Out, "# dry-run: request not sent")
-		fmt.Fprint(opts.Out, dr.Format())
-		return nil
+	fmt.Fprintln(w, "=== Dry Run ===")
+	if format == "pretty" {
+		fmt.Fprint(w, dr.Format())
+	} else {
+		output.PrintJson(w, dr)
 	}
-	return output.WriteSuccessEnvelope(dr, output.SuccessEnvelopeOptions{
-		CommandPath: opts.CommandPath,
-		Identity:    string(opts.Identity),
-		DryRun:      true,
-		JqExpr:      opts.JqExpr,
-		Out:         opts.Out,
-		ErrOut:      opts.ErrOut,
-	})
+	return nil
 }
--- a/internal/cmdutil/dryrun_test.go
+++ b/internal/cmdutil/dryrun_test.go
@@ -6,12 +6,9 @@ package cmdutil
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
-	"io"
 	"strings"
 	"testing"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/client"
 	"github.com/larksuite/cli/internal/core"
 )
@@ -69,31 +66,11 @@ func TestDryRunAPI_ResolveURL(t *testing.T) {
 	}
 }

-func TestDryRunAPI_ResolveURLMatchesFullPlaceholderOnly(t *testing.T) {
-	dr := NewDryRunAPI().
-		GET("/open-apis/task/v2/tasks/:assignee_id").
-		Set("assignee", "ou_bot")
-
-	text := dr.Format()
-	if strings.Contains(text, "ou_bot_id") {
-		t.Fatalf("prefix placeholder key corrupted longer token: %s", text)
-	}
-	if !strings.Contains(text, ":assignee_id") {
-		t.Fatalf("missing unresolved placeholder, got: %s", text)
-	}
-
-	dr.Set("assignee_id", "ou_abc/123")
-	text = dr.Format()
-	if !strings.Contains(text, "/open-apis/task/v2/tasks/ou_abc%2F123") {
-		t.Fatalf("expected full placeholder replacement with path escaping, got: %s", text)
-	}
-}
-
 func TestDryRunAPI_MarshalJSON(t *testing.T) {
 	dr := NewDryRunAPI().
 		Desc("test api").
 		GET("/open-apis/test").
-		Set("note", "audit")
+		Set("as", "user")

 	data, err := json.Marshal(dr)
 	if err != nil {
@@ -106,8 +83,8 @@ func TestDryRunAPI_MarshalJSON(t *testing.T) {
 	if m["description"] != "test api" {
 		t.Errorf("expected description, got: %v", m["description"])
 	}
-	if m["note"] != "audit" {
-		t.Errorf("expected note=audit, got: %v", m["note"])
+	if m["as"] != "user" {
+		t.Errorf("expected as=user, got: %v", m["as"])
 	}
 	api, ok := m["api"].([]interface{})
 	if !ok || len(api) != 1 {
@@ -146,67 +123,31 @@ func TestDryRunAPI_ExtraFieldsOnly(t *testing.T) {

 func TestPrintDryRun_JSON(t *testing.T) {
 	var buf bytes.Buffer
-	var errBuf bytes.Buffer
-	err := PrintDryRun(client.RawApiRequest{
+	err := PrintDryRun(&buf, client.RawApiRequest{
 		Method: "GET",
 		URL:    "/open-apis/test",
 		As:     "user",
-	}, &core.CliConfig{AppID: "app123"}, DryRunOutputOptions{
-		Format:      "json",
-		CommandPath: "lark-cli api",
-		Identity:    core.AsUser,
-		Out:         &buf,
-		ErrOut:      &errBuf,
-	})
+	}, &core.CliConfig{AppID: "app123"}, "json")
 	if err != nil {
 		t.Fatalf("PrintDryRun failed: %v", err)
 	}
 	out := buf.String()
-	if strings.Contains(out, "=== Dry Run ===") {
-		t.Fatalf("JSON stdout must not contain banner, got: %s", out)
+	if !strings.Contains(out, "=== Dry Run ===") {
+		t.Errorf("expected header, got: %s", out)
 	}
-	var env map[string]interface{}
-	if err := json.Unmarshal(buf.Bytes(), &env); err != nil {
-		t.Fatalf("dry-run stdout is not JSON: %v\n%s", err, out)
-	}
-	if env["ok"] != true || env["identity"] != "user" || env["dry_run"] != true {
-		t.Fatalf("unexpected envelope: %#v", env)
-	}
-	data, ok := env["data"].(map[string]interface{})
-	if !ok {
-		t.Fatalf("unexpected data: %#v", env["data"])
-	}
-	dctx, ok := data["context"].(map[string]interface{})
-	if !ok || dctx["app_id"] != "app123" {
-		t.Fatalf("unexpected data.context: %#v", data["context"])
-	}
-	if _, exists := data["as"]; exists {
-		t.Fatalf("data.as must not appear; identity lives at the envelope top level: %#v", data)
-	}
-	api, ok := data["api"].([]interface{})
-	if !ok || len(api) != 1 {
-		t.Fatalf("api = %#v, want one call", data["api"])
-	}
-	call, ok := api[0].(map[string]interface{})
-	if !ok || call["url"] != "/open-apis/test" {
-		t.Fatalf("api[0] = %#v", api[0])
+	if !strings.Contains(out, "app123") {
+		t.Errorf("expected appId in output, got: %s", out)
 	}
 }

 func TestPrintDryRun_Pretty(t *testing.T) {
 	var buf bytes.Buffer
-	var errBuf bytes.Buffer
-	err := PrintDryRun(client.RawApiRequest{
+	err := PrintDryRun(&buf, client.RawApiRequest{
 		Method: "POST",
 		URL:    "/open-apis/test",
 		Data:   map[string]interface{}{"key": "val"},
 		As:     "bot",
-	}, &core.CliConfig{AppID: "app456"}, DryRunOutputOptions{
-		Format:   "pretty",
-		Identity: core.AsBot,
-		Out:      &buf,
-		ErrOut:   &errBuf,
-	})
+	}, &core.CliConfig{AppID: "app456"}, "pretty")
 	if err != nil {
 		t.Fatalf("PrintDryRun failed: %v", err)
 	}
@@ -214,136 +155,6 @@ func TestPrintDryRun_Pretty(t *testing.T) {
 	if !strings.Contains(out, "POST /open-apis/test") {
 		t.Errorf("expected POST line in pretty output, got: %s", out)
 	}
-	if !strings.HasPrefix(out, "# dry-run: request not sent\n") {
-		t.Fatalf("pretty stdout should start with the dry-run marker, got: %s", out)
-	}
-	if strings.Contains(out, "=== Dry Run ===") {
-		t.Fatalf("pretty stdout must not contain banner, got: %s", out)
-	}
-	if !strings.Contains(errBuf.String(), "=== Dry Run ===") {
-		t.Fatalf("pretty stderr should contain banner, got: %s", errBuf.String())
-	}
-}
-
-func TestPrintDryRun_WithJqUsesEnvelope(t *testing.T) {
-	var buf bytes.Buffer
-	err := PrintDryRun(client.RawApiRequest{
-		Method: "GET",
-		URL:    "/open-apis/test",
-		As:     "bot",
-	}, &core.CliConfig{AppID: "app123"}, DryRunOutputOptions{
-		Format:   "json",
-		JqExpr:   ".data.api[0].url",
-		Identity: core.AsBot,
-		Out:      &buf,
-		ErrOut:   io.Discard,
-	})
-	if err != nil {
-		t.Fatalf("PrintDryRun failed: %v", err)
-	}
-	if got := strings.TrimSpace(buf.String()); got != "/open-apis/test" {
-		t.Fatalf("jq output = %q, want /open-apis/test", got)
-	}
-}
-
-func TestPrintDryRunWithFile_JSONEnvelope(t *testing.T) {
-	var buf bytes.Buffer
-	err := PrintDryRunWithFile(client.RawApiRequest{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/upload_all",
-		As:     "bot",
-	}, &core.CliConfig{AppID: "app123", UserOpenId: "ou_tester"}, DryRunOutputOptions{
-		Format:   "json",
-		Identity: core.AsBot,
-		Out:      &buf,
-		ErrOut:   io.Discard,
-	}, FileUploadMeta{FieldName: "file", FilePath: "report.txt", FormFields: map[string]any{"parent": "fld"}})
-	if err != nil {
-		t.Fatalf("PrintDryRunWithFile failed: %v", err)
-	}
-	var env map[string]interface{}
-	if err := json.Unmarshal(buf.Bytes(), &env); err != nil {
-		t.Fatalf("dry-run stdout is not JSON: %v\n%s", err, buf.String())
-	}
-	if env["dry_run"] != true {
-		t.Fatalf("dry_run = %#v, want true", env["dry_run"])
-	}
-	data := env["data"].(map[string]interface{})
-	api := data["api"].([]interface{})
-	call := api[0].(map[string]interface{})
-	body := call["body"].(map[string]interface{})
-	file := body["file"].(map[string]interface{})
-	if file["path"] != "report.txt" {
-		t.Fatalf("file body = %#v", body)
-	}
-	dctx, ok := data["context"].(map[string]interface{})
-	if !ok || dctx["app_id"] != "app123" || dctx["user_open_id"] != "ou_tester" {
-		t.Fatalf("unexpected data.context: %#v", data["context"])
-	}
-	for _, legacy := range []string{"as", "appId", "userOpenId"} {
-		if _, exists := data[legacy]; exists {
-			t.Fatalf("legacy key %q must not appear in data: %#v", legacy, data)
-		}
-	}
-}
-
-func TestPrintDryRun_MethodTranscribedVerbatim(t *testing.T) {
-	var buf bytes.Buffer
-	err := PrintDryRun(client.RawApiRequest{
-		Method: "OPTIONS",
-		URL:    "/open-apis/test",
-		As:     "bot",
-	}, &core.CliConfig{AppID: "app123"}, DryRunOutputOptions{
-		Format:   "json",
-		Identity: core.AsBot,
-		Out:      &buf,
-		ErrOut:   io.Discard,
-	})
-	if err != nil {
-		t.Fatalf("PrintDryRun failed: %v", err)
-	}
-	var env map[string]interface{}
-	if err := json.Unmarshal(buf.Bytes(), &env); err != nil {
-		t.Fatalf("dry-run stdout is not JSON: %v\n%s", err, buf.String())
-	}
-	call := env["data"].(map[string]interface{})["api"].([]interface{})[0].(map[string]interface{})
-	if call["method"] != "OPTIONS" {
-		t.Fatalf("method = %#v, want OPTIONS transcribed verbatim (not coerced to GET)", call["method"])
-	}
-}
-
-func TestPrintDryRun_EmptyConfigOmitsContext(t *testing.T) {
-	var buf bytes.Buffer
-	err := PrintDryRun(client.RawApiRequest{
-		Method: "GET",
-		URL:    "/open-apis/test",
-	}, &core.CliConfig{}, DryRunOutputOptions{
-		Format: "json",
-		Out:    &buf,
-		ErrOut: io.Discard,
-	})
-	if err != nil {
-		t.Fatalf("PrintDryRun failed: %v", err)
-	}
-	var env map[string]interface{}
-	if err := json.Unmarshal(buf.Bytes(), &env); err != nil {
-		t.Fatalf("dry-run stdout is not JSON: %v\n%s", err, buf.String())
-	}
-	data := env["data"].(map[string]interface{})
-	if _, exists := data["context"]; exists {
-		t.Fatalf("empty app/user context must be omitted entirely, got: %#v", data["context"])
-	}
-}
-
-func TestWriteDryRun_NilPreviewIsInternalError(t *testing.T) {
-	err := WriteDryRun(nil, DryRunOutputOptions{Format: "json", Out: io.Discard})
-	if err == nil {
-		t.Fatal("WriteDryRun(nil) should fail instead of emitting an empty preview")
-	}
-	var internal *errs.InternalError
-	if !errors.As(err, &internal) {
-		t.Fatalf("expected *errs.InternalError, got %T: %v", err, err)
-	}
 }

 func TestDryRunFormatValue(t *testing.T) {
--- a/internal/core/config.go
+++ b/internal/core/config.go
@@ -268,7 +268,7 @@ func ResolveConfigFromMulti(raw *MultiAppConfig, kc keychain.KeychainAccess, pro
 		ProfileName: app.ProfileName(),
 		AppID:       app.AppId,
 		AppSecret:   secret,
-		Brand:       ParseBrand(string(app.Brand)),
+		Brand:       app.Brand,
 		Lang:        app.Lang,
 		DefaultAs:   app.DefaultAs,
 	}
--- a/internal/core/config_test.go
+++ b/internal/core/config_test.go
@@ -230,20 +230,3 @@ func TestCliConfig_CanBot(t *testing.T) {
 		})
 	}
 }
-
-// Runtime configs must never carry raw brand casing: the config ingress
-// normalizes it, so downstream equality checks see canonical values.
-func TestResolveConfigFromMulti_NormalizesBrand(t *testing.T) {
-	multi := &MultiAppConfig{Apps: []AppConfig{{
-		AppId:     "cli_x",
-		AppSecret: PlainSecret("test-secret"),
-		Brand:     LarkBrand(" LARK "),
-	}}}
-	cfg, err := ResolveConfigFromMulti(multi, nil, "")
-	if err != nil {
-		t.Fatalf("ResolveConfigFromMulti error = %v", err)
-	}
-	if cfg.Brand != BrandLark {
-		t.Errorf("Brand = %q, want %q (normalized at ingress)", cfg.Brand, BrandLark)
-	}
-}
--- a/internal/core/types.go
+++ b/internal/core/types.go
@@ -3,11 +3,9 @@

 package core

-import "strings"
-
 // LarkBrand represents the Lark platform brand.
 // "feishu" targets China-mainland, "lark" targets international.
-// ParseBrand and ResolveEndpoints map unrecognized values to BrandFeishu.
+// Any other string is treated as a custom base URL.
 type LarkBrand string

 const (
@@ -15,10 +13,10 @@ const (
 	BrandLark   LarkBrand = "lark"
 )

-// ParseBrand normalizes a brand string (case-insensitive, whitespace-tolerant);
-// anything other than "lark" normalizes to BrandFeishu.
+// ParseBrand normalizes a brand string to a LarkBrand constant.
+// Unrecognized values default to BrandFeishu.
 func ParseBrand(value string) LarkBrand {
-	if strings.ToLower(strings.TrimSpace(value)) == "lark" {
+	if value == "lark" {
 		return BrandLark
 	}
 	return BrandFeishu
@@ -38,10 +36,9 @@ type Endpoints struct {
 	AppLink  string // e.g. "https://applink.feishu.cn"
 }

-// ResolveEndpoints resolves endpoint URLs for the brand, normalizing its
-// input so stored values with unusual casing still resolve correctly.
+// ResolveEndpoints resolves endpoint URLs based on brand.
 func ResolveEndpoints(brand LarkBrand) Endpoints {
-	switch ParseBrand(string(brand)) {
+	switch brand {
 	case BrandLark:
 		return Endpoints{
 			Open:     "https://open.larksuite.com",
--- a/internal/core/types_test.go
+++ b/internal/core/types_test.go
@@ -57,37 +57,3 @@ func TestResolveOpenBaseURL(t *testing.T) {
 		t.Errorf("ResolveOpenBaseURL(lark) = %q", got)
 	}
 }
-
-func TestParseBrand(t *testing.T) {
-	cases := []struct {
-		in   string
-		want LarkBrand
-	}{
-		{"", BrandFeishu},
-		{"feishu", BrandFeishu},
-		{"lark", BrandLark},
-		{"LARK", BrandLark},
-		{" lark ", BrandLark},
-		{"Lark", BrandLark},
-		{"xyz", BrandFeishu},
-	}
-	for _, c := range cases {
-		if got := ParseBrand(c.in); got != c.want {
-			t.Errorf("ParseBrand(%q) = %q, want %q", c.in, got, c.want)
-		}
-	}
-}
-
-// TestResolveEndpoints_NormalizesBrand locks the boundary invariant: the
-// resolver normalizes its brand input, so historical config values with
-// unusual casing or whitespace still resolve to their intended endpoints.
-func TestResolveEndpoints_NormalizesBrand(t *testing.T) {
-	for _, raw := range []string{"LARK", " lark ", "Lark"} {
-		if got := ResolveEndpoints(LarkBrand(raw)).Open; got != "https://open.larksuite.com" {
-			t.Errorf("ResolveEndpoints(%q).Open = %q, want the lark endpoint", raw, got)
-		}
-	}
-	if got := ResolveEndpoints(LarkBrand("unexpected")).Open; got != "https://open.feishu.cn" {
-		t.Errorf("ResolveEndpoints(unexpected).Open = %q, want the feishu default", got)
-	}
-}
--- a/internal/credential/types.go
+++ b/internal/credential/types.go
@@ -72,8 +72,7 @@ func AccountFromCliConfig(cfg *core.CliConfig) *Account {
 	}
 }

-// ToCliConfig copies the credential-layer account into the downstream config
-// shape, normalizing the brand so runtime consumers never see raw casing.
+// ToCliConfig copies the credential-layer account into the downstream config shape.
 func (a *Account) ToCliConfig() *core.CliConfig {
 	if a == nil {
 		return nil
@@ -82,7 +81,7 @@ func (a *Account) ToCliConfig() *core.CliConfig {
 		ProfileName:         a.ProfileName,
 		AppID:               a.AppID,
 		AppSecret:           normalizeAccountAppSecret(a.AppSecret),
-		Brand:               core.ParseBrand(string(a.Brand)),
+		Brand:               a.Brand,
 		DefaultAs:           a.DefaultAs,
 		UserOpenId:          a.UserOpenId,
 		UserName:            a.UserName,
--- a/internal/credential/types_test.go
+++ b/internal/credential/types_test.go
@@ -130,11 +130,3 @@ func TestRuntimeAppSecret_TokenOnlyUsesPlaceholder(t *testing.T) {
 		t.Fatalf("RuntimeAppSecret(real) = %q, want %q", got, "secret-1")
 	}
 }
-
-// The credential-layer ingress normalizes brand casing for all runtime consumers.
-func TestToCliConfig_NormalizesBrand(t *testing.T) {
-	acct := &Account{AppID: "cli_x", Brand: " LARK "}
-	if got := acct.ToCliConfig().Brand; got != core.BrandLark {
-		t.Errorf("Brand = %q, want %q", got, core.BrandLark)
-	}
-}
--- a/internal/errclass/classify_test.go
+++ b/internal/errclass/classify_test.go
@@ -113,7 +113,6 @@ func TestBuildAPIError_ExitCodeMatrix(t *testing.T) {
 		{"230027 user_not_authorized", 230027, errs.CategoryAuthorization, errs.SubtypeUserUnauthorized, 3, "PermissionError"},
 		{"1470403 task_permission_denied", 1470403, errs.CategoryAuthorization, errs.SubtypePermissionDenied, 3, "PermissionError"},
 		{"1470400 task_invalid_params", 1470400, errs.CategoryAPI, errs.SubtypeInvalidParameters, 1, "APIError"},
-		{"1062507 drive_parent_sibling_limit", 1062507, errs.CategoryAPI, errs.SubtypeQuotaExceeded, 1, "APIError"},
 		{"99991400 rate_limit", 99991400, errs.CategoryAPI, errs.SubtypeRateLimit, 1, "APIError"},
 		{"99991661 token_missing", 99991661, errs.CategoryAuthentication, errs.SubtypeTokenMissing, 3, "AuthenticationError"},
 		{"21000 challenge_required", 21000, errs.CategoryPolicy, errs.Subtype("challenge_required"), 6, "SecurityPolicyError"},
--- a/internal/errclass/codemeta_drive.go
+++ b/internal/errclass/codemeta_drive.go
@@ -17,7 +17,6 @@ var driveCodeMeta = map[int]CodeMeta{
 	1061043:   {Category: errs.CategoryAPI, Subtype: errs.SubtypeQuotaExceeded},                // file size beyond limit
 	1061044:   {Category: errs.CategoryAPI, Subtype: errs.SubtypeNotFound},                     // parent folder does not exist (upload)
 	1061101:   {Category: errs.CategoryAPI, Subtype: errs.SubtypeQuotaExceeded},                // file quota exceeded
-	1062507:   {Category: errs.CategoryAPI, Subtype: errs.SubtypeQuotaExceeded},                // parent folder child count limit exceeded
 	1062009:   {Category: errs.CategoryAPI, Subtype: errs.SubtypeInvalidParameters},            // actual size inconsistent with declared size
 	1063001:   {Category: errs.CategoryAPI, Subtype: errs.SubtypeInvalidParameters},            // secure label invalid parameter
 	1063002:   {Category: errs.CategoryAuthorization, Subtype: errs.SubtypePermissionDenied},   // secure label permission denied
--- a/internal/errclass/codemeta_spark.go
+++ b/internal/errclass/codemeta_spark.go
@@ -1,28 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package errclass
-
-import "github.com/larksuite/cli/errs"
-
-// sparkCodeMeta holds stable Spark app-role business-code classifications.
-// Command-specific recovery guidance belongs in the Apps shortcut layer; the
-// numeric code remains the source-specific discriminator on the error envelope.
-var sparkCodeMeta = map[int]CodeMeta{
-	3340001: {Category: errs.CategoryAPI, Subtype: errs.SubtypeInvalidParameters},          // request parameters are invalid
-	3344027: {Category: errs.CategoryAPI, Subtype: errs.SubtypeQuotaExceeded},              // role user count exceeds the service limit
-	3344028: {Category: errs.CategoryAPI, Subtype: errs.SubtypeQuotaExceeded},              // role department count exceeds the service limit
-	3344029: {Category: errs.CategoryAPI, Subtype: errs.SubtypeQuotaExceeded},              // role chat count exceeds the service limit
-	3344030: {Category: errs.CategoryAuthorization, Subtype: errs.SubtypePermissionDenied}, // app administrator required
-	3344031: {Category: errs.CategoryAuthorization, Subtype: errs.SubtypePermissionDenied}, // app administrator or developer required
-	3344034: {Category: errs.CategoryAPI, Subtype: errs.SubtypeInvalidParameters},          // invalid role ID
-	3344035: {Category: errs.CategoryAPI, Subtype: errs.SubtypeNotFound},                   // role does not exist
-	3344036: {Category: errs.CategoryAPI, Subtype: errs.SubtypeAlreadyExists},              // role ID already exists
-	3344037: {Category: errs.CategoryAPI, Subtype: errs.SubtypeQuotaExceeded},              // app role count exceeds the service limit
-	3344038: {Category: errs.CategoryAPI, Subtype: errs.SubtypeInvalidParameters},          // invalid role name
-	3344039: {Category: errs.CategoryAPI, Subtype: errs.SubtypeInvalidParameters},          // invalid role description
-	3344040: {Category: errs.CategoryAPI, Subtype: errs.SubtypeInvalidParameters},          // unsupported member type
-	3344041: {Category: errs.CategoryAPI, Subtype: errs.SubtypeInvalidParameters},          // invalid member ID
-}
-
-func init() { mergeCodeMeta(sparkCodeMeta, "spark") }
--- a/internal/errclass/codemeta_spark_test.go
+++ b/internal/errclass/codemeta_spark_test.go
@@ -1,59 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package errclass
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-)
-
-func TestLookupCodeMetaSparkRoleCodes(t *testing.T) {
-	tests := []struct {
-		code     int
-		category errs.Category
-		subtype  errs.Subtype
-	}{
-		{3340001, errs.CategoryAPI, errs.SubtypeInvalidParameters},
-		{3344027, errs.CategoryAPI, errs.SubtypeQuotaExceeded},
-		{3344028, errs.CategoryAPI, errs.SubtypeQuotaExceeded},
-		{3344029, errs.CategoryAPI, errs.SubtypeQuotaExceeded},
-		{3344030, errs.CategoryAuthorization, errs.SubtypePermissionDenied},
-		{3344031, errs.CategoryAuthorization, errs.SubtypePermissionDenied},
-		{3344034, errs.CategoryAPI, errs.SubtypeInvalidParameters},
-		{3344035, errs.CategoryAPI, errs.SubtypeNotFound},
-		{3344036, errs.CategoryAPI, errs.SubtypeAlreadyExists},
-		{3344037, errs.CategoryAPI, errs.SubtypeQuotaExceeded},
-		{3344038, errs.CategoryAPI, errs.SubtypeInvalidParameters},
-		{3344039, errs.CategoryAPI, errs.SubtypeInvalidParameters},
-		{3344040, errs.CategoryAPI, errs.SubtypeInvalidParameters},
-		{3344041, errs.CategoryAPI, errs.SubtypeInvalidParameters},
-	}
-
-	for _, tt := range tests {
-		t.Run(fmt.Sprintf("%d", tt.code), func(t *testing.T) {
-			meta, ok := LookupCodeMeta(tt.code)
-			if !ok {
-				t.Fatalf("code %d is not registered", tt.code)
-			}
-			if meta.Category != tt.category || meta.Subtype != tt.subtype || meta.Retryable {
-				t.Fatalf("code %d metadata = %+v, want category=%s subtype=%s retryable=false", tt.code, meta, tt.category, tt.subtype)
-			}
-
-			err := BuildAPIError(map[string]any{
-				"code":   tt.code,
-				"msg":    "spark role error",
-				"log_id": "log-spark-role",
-			}, ClassifyContext{Identity: "user"})
-			problem, ok := errs.ProblemOf(err)
-			if !ok {
-				t.Fatalf("BuildAPIError(%d) = %#v, want typed problem", tt.code, err)
-			}
-			if problem.Category != tt.category || problem.Subtype != tt.subtype || problem.Code != tt.code || problem.LogID != "log-spark-role" || problem.Retryable {
-				t.Fatalf("BuildAPIError(%d) problem = %+v", tt.code, problem)
-			}
-		})
-	}
-}
--- a/internal/output/envelope.go
+++ b/internal/output/envelope.go
@@ -7,7 +7,6 @@ package output
 type Envelope struct {
 	OK                 bool                   `json:"ok"`
 	Identity           string                 `json:"identity,omitempty"`
-	DryRun             bool                   `json:"dry_run,omitempty"`
 	Data               interface{}            `json:"data,omitempty"`
 	Meta               *Meta                  `json:"meta,omitempty"`
 	ContentSafetyAlert interface{}            `json:"_content_safety_alert,omitempty"`
--- a/internal/output/envelope_success.go
+++ b/internal/output/envelope_success.go
@@ -9,7 +9,6 @@ import "io"
 type SuccessEnvelopeOptions struct {
 	CommandPath string
 	Identity    string
-	DryRun      bool
 	JqExpr      string
 	Out         io.Writer
 	ErrOut      io.Writer
@@ -42,7 +41,6 @@ func WriteSuccessEnvelope(data interface{}, opts SuccessEnvelopeOptions) error {
 	env := Envelope{
 		OK:       true,
 		Identity: opts.Identity,
-		DryRun:   opts.DryRun,
 		Data:     data,
 		Notice:   GetNotice(),
 	}
--- a/internal/output/envelope_success_test.go
+++ b/internal/output/envelope_success_test.go
@@ -104,47 +104,6 @@ func TestWriteSuccessEnvelope_JqUsesEnvelope(t *testing.T) {
 	}
 }

-func TestWriteSuccessEnvelope_DryRunMarker(t *testing.T) {
-	var out strings.Builder
-
-	err := WriteSuccessEnvelope(map[string]interface{}{"api": []interface{}{}}, SuccessEnvelopeOptions{
-		Identity: "bot",
-		DryRun:   true,
-		Out:      &out,
-	})
-	if err != nil {
-		t.Fatalf("WriteSuccessEnvelope() error = %v", err)
-	}
-
-	var env map[string]interface{}
-	if err := json.Unmarshal([]byte(out.String()), &env); err != nil {
-		t.Fatalf("invalid JSON output: %v\n%s", err, out.String())
-	}
-	if env["ok"] != true || env["identity"] != "bot" || env["dry_run"] != true {
-		t.Fatalf("unexpected dry-run envelope: %#v", env)
-	}
-	if _, ok := env["data"].(map[string]interface{}); !ok {
-		t.Fatalf("data = %#v, want object", env["data"])
-	}
-}
-
-func TestWriteSuccessEnvelope_DryRunJqUsesEnvelope(t *testing.T) {
-	var out strings.Builder
-
-	err := WriteSuccessEnvelope(map[string]interface{}{"api": []interface{}{}}, SuccessEnvelopeOptions{
-		Identity: "bot",
-		DryRun:   true,
-		JqExpr:   ".dry_run",
-		Out:      &out,
-	})
-	if err != nil {
-		t.Fatalf("WriteSuccessEnvelope() error = %v", err)
-	}
-	if strings.TrimSpace(out.String()) != "true" {
-		t.Fatalf("jq output = %q, want true", out.String())
-	}
-}
-
 func TestWriteSuccessEnvelope_JqWarnsWhenSafetyAlertFiltered(t *testing.T) {
 	t.Setenv("LARKSUITE_CLI_CONTENT_SAFETY_MODE", "warn")
 	extcs.Register(&mockProvider{
--- a/internal/qualitygate/cmd/comment-audit/main.go
+++ b/internal/qualitygate/cmd/comment-audit/main.go
@@ -19,18 +19,12 @@ import (
 type eventPayload struct {
 	Comment *struct {
 		Body string `json:"body"`
-		Path string `json:"path"`
 	} `json:"comment"`
 	Review *struct {
 		Body string `json:"body"`
 	} `json:"review"`
 }

-type commentContent struct {
-	Body string
-	Path string
-}
-
 func main() {
 	eventPath := flag.String("event", os.Getenv("GITHUB_EVENT_PATH"), "GitHub event payload path")
 	kind := flag.String("kind", os.Getenv("GITHUB_EVENT_NAME"), "GitHub event kind")
@@ -40,11 +34,12 @@ func main() {
 		fmt.Fprintln(os.Stderr, "comment-audit: --event or GITHUB_EVENT_PATH is required")
 		os.Exit(2)
 	}
-	diags, err := auditEvent(*eventPath, *kind)
+	body, err := commentBody(*eventPath)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "comment-audit: %v\n", err)
 		os.Exit(2)
 	}
+	diags := diagnostics(publiccontent.ScanComment(*kind, body))
 	if len(diags) > 0 {
 		fmt.Fprintln(os.Stderr, auditFailureSummary(len(diags)))
 	}
@@ -52,44 +47,32 @@ func main() {
 	os.Exit(report.ExitCode(diags))
 }

-func auditEvent(eventPath, kind string) ([]report.Diagnostic, error) {
-	content, err := commentBody(eventPath)
-	if err != nil {
-		return nil, err
-	}
-	return scanCommentContent(kind, content), nil
-}
-
-func scanCommentContent(kind string, content commentContent) []report.Diagnostic {
-	return diagnostics(publiccontent.ScanCommentAtPath(kind, content.Path, content.Body))
-}
-
 func auditFailureSummary(count int) string {
 	return fmt.Sprintf("post-publication audit found public content findings: %d", count)
 }

-func commentBody(path string) (commentContent, error) {
+func commentBody(path string) (string, error) {
 	safePath, err := validate.SafeInputPath(path)
 	if err != nil {
-		return commentContent{}, errs.NewValidationError(errs.SubtypeInvalidArgument, "invalid --event: %v", err).
+		return "", errs.NewValidationError(errs.SubtypeInvalidArgument, "invalid --event: %v", err).
 			WithParam("--event").
 			WithCause(err)
 	}
 	data, err := vfs.ReadFile(safePath)
 	if err != nil {
-		return commentContent{}, err
+		return "", err
 	}
 	var payload eventPayload
 	if err := json.Unmarshal(data, &payload); err != nil {
-		return commentContent{}, err
+		return "", err
 	}
 	switch {
 	case payload.Comment != nil:
-		return commentContent{Body: payload.Comment.Body, Path: payload.Comment.Path}, nil
+		return payload.Comment.Body, nil
 	case payload.Review != nil:
-		return commentContent{Body: payload.Review.Body}, nil
+		return payload.Review.Body, nil
 	default:
-		return commentContent{}, nil
+		return "", nil
 	}
 }

--- a/internal/qualitygate/cmd/comment-audit/main_test.go
+++ b/internal/qualitygate/cmd/comment-audit/main_test.go
@@ -7,11 +7,9 @@ import (
 	"errors"
 	"os"
 	"path/filepath"
-	"strconv"
 	"testing"

 	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/qualitygate/publiccontent"
 )

 func TestCommentBodyReadsSafeRelativeEventPath(t *testing.T) {
@@ -34,92 +32,11 @@ func TestCommentBodyReadsSafeRelativeEventPath(t *testing.T) {
 	if err != nil {
 		t.Fatalf("commentBody() error = %v", err)
 	}
-	if got.Body != "clean comment" || got.Path != "" {
-		t.Fatalf("comment content = %#v", got)
+	if got != "clean comment" {
+		t.Fatalf("comment body = %q", got)
 	}
 }

-func TestCommentBodyReadsReviewCommentPath(t *testing.T) {
-	dir := t.TempDir()
-	if err := writeTestFile(filepath.Join(dir, "event.json"), `{"comment":{"body":"test suggestion","path":"cmd/agent/list_test.go"}}`); err != nil {
-		t.Fatal(err)
-	}
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Chdir(dir); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		_ = os.Chdir(origDir)
-	})
-
-	got, err := commentBody("event.json")
-	if err != nil {
-		t.Fatalf("commentBody() error = %v", err)
-	}
-	if got.Body != "test suggestion" || got.Path != "cmd/agent/list_test.go" {
-		t.Fatalf("comment content = %#v", got)
-	}
-}
-
-func TestCommentAuditUsesReviewCommentPathForFixtureClassification(t *testing.T) {
-	dir := t.TempDir()
-	body := `CLIENT_SECRET=$(security find-generic-password -w)`
-	event := `{"comment":{"body":` + strconv.Quote(body) + `,"path":"scripts/config_test.sh"}}`
-	if err := writeTestFile(filepath.Join(dir, "event.json"), event); err != nil {
-		t.Fatal(err)
-	}
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Chdir(dir); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		_ = os.Chdir(origDir)
-	})
-
-	diags, err := auditEvent("event.json", "pull_request_review_comment")
-	if err != nil {
-		t.Fatalf("auditEvent() error = %v", err)
-	}
-	for _, diag := range diags {
-		if diag.Rule == "public_content_generic_credential" {
-			t.Fatalf("review comment fixture should not be a credential diagnostic: %#v", diags)
-		}
-	}
-	pathless := publiccontent.ScanComment("pull_request_review_comment", body)
-	for _, finding := range pathless {
-		if finding.Rule == "public_content_generic_credential" {
-			return
-		}
-	}
-	t.Fatalf("test precondition failed: pathless comment should be classified as a credential: %#v", pathless)
-}
-
-func TestScanCommentContentPreservesReviewCommentPath(t *testing.T) {
-	providerValue := "gh" + "p_" + "1234567890abcdef" + "1234567890abcdef" + "1234"
-	content := commentContent{
-		Body: `cfg := &Config{AccessToken: "` + providerValue + `"}`,
-		Path: "cmd/agent/list_test.go",
-	}
-
-	diags := scanCommentContent("pull_request_review_comment", content)
-	for _, diag := range diags {
-		if diag.Rule != "public_content_generic_credential" {
-			continue
-		}
-		if diag.File != content.Path {
-			t.Fatalf("credential diagnostic file = %q, want %q", diag.File, content.Path)
-		}
-		return
-	}
-	t.Fatalf("missing provider credential diagnostic: %#v", diags)
-}
-
 func TestCommentBodyRejectsUnsafeEventPath(t *testing.T) {
 	path := filepath.Join(t.TempDir(), "event.json")
 	if err := writeTestFile(path, `{"comment":{"body":"clean"}}`); err != nil {
--- a/internal/qualitygate/cmd/semantic-review/main_test.go
+++ b/internal/qualitygate/cmd/semantic-review/main_test.go
@@ -9,15 +9,12 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"

 	"github.com/larksuite/cli/internal/qualitygate/facts"
 	"github.com/larksuite/cli/internal/qualitygate/semantic"
 )

 func TestRunLoadsPolicyAndWaivers(t *testing.T) {
-	freezeNow(t, time.Date(2026, 6, 12, 0, 0, 0, 0, time.UTC))
-
 	repo := t.TempDir()
 	writeSemanticConfig(t, repo, `{
 	  "schema_version": 1,
@@ -68,8 +65,6 @@ func TestRunLoadsPolicyAndWaivers(t *testing.T) {
 }

 func TestRunLoadsWaiversFromOverrideFile(t *testing.T) {
-	freezeNow(t, time.Date(2026, 6, 12, 0, 0, 0, 0, time.UTC))
-
 	repo := t.TempDir()
 	writeSemanticConfig(t, repo, `{
 	  "schema_version": 1,
@@ -375,13 +370,6 @@ func writeSemanticConfig(t *testing.T, repo, policy, models, waivers string) {
 	}
 }

-func freezeNow(t *testing.T, fixed time.Time) {
-	t.Helper()
-	original := now
-	now = func() time.Time { return fixed }
-	t.Cleanup(func() { now = original })
-}
-
 func readDecision(t *testing.T, path string) semantic.Decision {
 	t.Helper()
 	data, err := os.ReadFile(path)
--- a/internal/qualitygate/publiccontent/collect_test.go
+++ b/internal/qualitygate/publiccontent/collect_test.go
@@ -23,10 +23,9 @@ func TestCollectScansOnlyCurrentContributionAndMetadata(t *testing.T) {
 	runGit(t, repo, "add", "baseline.md")
 	runGit(t, repo, "commit", "-m", "base")

-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
 	writeFile(t, filepath.Join(repo, "docs", "public.md"), `# Public change

-api_`+`key = "`+providerValue+`"
+api_`+`key = "example-public-key"
 `)
 	runGit(t, repo, "add", "docs/public.md")
 	runGit(t, repo, "commit", "-m", "add public doc", "-m", "Change"+"-Id: I0123456789abcdef0123456789abcdef01234567")
@@ -200,14 +199,13 @@ func TestCollectDetectsQuotedJSONCredentialAssignments(t *testing.T) {
 	runGit(t, repo, "add", "docs/public.json")
 	runGit(t, repo, "commit", "-m", "base")

-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
 	writeFile(t, filepath.Join(repo, "docs", "public.json"), strings.Join([]string{
-		`{"access_` + `token":"` + providerValue + `"}`,
-		`{"client_` + `secret": "` + providerValue + `"}`,
-		`{"tenantAccess` + `Token":"` + providerValue + `"}`,
-		`{"github` + `Token":"` + providerValue + `"}`,
-		`{"vendorApi` + `Key":"` + providerValue + `"}`,
-		`{"slackBot` + `Token":"xoxb_` + `1234567890abcdef"}`,
+		`{"access_` + `token":"real-json-token"}`,
+		`{"client_` + `secret": "real ` + `secret value"}`,
+		`{"tenantAccess` + `Token":"real-tenant-camel-token"}`,
+		`{"github` + `Token":"real-github-token"}`,
+		`{"vendorApi` + `Key":"real-vendor-key"}`,
+		`{"slackBot` + `Token":"xoxb-real-token"}`,
 	}, "\n")+"\n")
 	runGit(t, repo, "add", "docs/public.json")
 	runGit(t, repo, "commit", "-m", "add json config")
@@ -217,7 +215,14 @@ func TestCollectDetectsQuotedJSONCredentialAssignments(t *testing.T) {
 	for _, item := range got {
 		if item.File == "docs/public.json" && item.Rule == "public_content_generic_credential" {
 			count++
-			for _, forbidden := range []string{providerValue, "xoxb_" + "1234567890abcdef"} {
+			for _, forbidden := range []string{
+				"real-json-token",
+				"real secret value",
+				"real-tenant-camel-token",
+				"real-github-token",
+				"real-vendor-key",
+				"xoxb-real-token",
+			} {
 				if strings.Contains(item.Excerpt, forbidden) {
 					t.Fatalf("JSON credential finding leaked value %q in excerpt %q", forbidden, item.Excerpt)
 				}
@@ -301,8 +306,8 @@ func TestCollectDetectsAngleWrappedRealisticCredentialValues(t *testing.T) {
 			count++
 		}
 	}
-	if count != 2 {
-		t.Fatalf("angle-wrapped provider credential findings = %d, want 2: %#v", count, got)
+	if count != 3 {
+		t.Fatalf("angle-wrapped realistic credential findings = %d, want 3: %#v", count, got)
 	}
 }

@@ -333,12 +338,12 @@ func TestCollectDetectsCredentialShapedValuesUnderBenignKeys(t *testing.T) {
 			count++
 		}
 	}
-	if count != 4 {
-		t.Fatalf("provider-shaped benign-key findings = %d, want 4: %#v", count, got)
+	if count != 7 {
+		t.Fatalf("credential-shaped benign-key findings = %d, want 7: %#v", count, got)
 	}
 }

-func TestCollectAllowsBareIdentifierCredentialsWithMetadataSuffixes(t *testing.T) {
+func TestCollectDetectsBareIdentifierCredentialsWithMetadataSuffixes(t *testing.T) {
 	repo := newGitRepo(t)
 	writeFile(t, filepath.Join(repo, "docs", "config.yaml"), "base: true\n")
 	runGit(t, repo, "add", "docs/config.yaml")
@@ -353,11 +358,15 @@ func TestCollectAllowsBareIdentifierCredentialsWithMetadataSuffixes(t *testing.T
 	runGit(t, repo, "commit", "-m", "add credential config")

 	got := collectFromPreviousCommit(t, repo)
+	var count int
 	for _, item := range got {
 		if item.File == "docs/config.yaml" && item.Rule == "public_content_generic_credential" {
-			t.Fatalf("readable metadata values should not be credential findings: %#v", got)
+			count++
 		}
 	}
+	if count != 3 {
+		t.Fatalf("metadata-suffixed bare credential findings = %d, want 3: %#v", count, got)
+	}
 }

 func TestCollectDetectsAccessKeyCredentials(t *testing.T) {
@@ -365,7 +374,7 @@ func TestCollectDetectsAccessKeyCredentials(t *testing.T) {
 	writeFile(t, filepath.Join(repo, "docs", "config.yaml"), "base: true\n")
 	runGit(t, repo, "add", "docs/config.yaml")
 	runGit(t, repo, "commit", "-m", "base")
-	accessKey := "AK" + "IAIOSFODNN7EXAMPXX"
+	accessKey := "AK" + "IAIOSFODNN7EXAMPX"

 	writeFile(t, filepath.Join(repo, "docs", "config.yaml"), strings.Join([]string{
 		"AWS_ACCESS_KEY_ID: " + accessKey,
@@ -382,7 +391,7 @@ func TestCollectDetectsAccessKeyCredentials(t *testing.T) {
 			continue
 		}
 		count++
-		if strings.Contains(item.Excerpt, accessKey) {
+		if strings.Contains(item.Excerpt, "AKIAIOSFODNN7EXAMPX") {
 			t.Fatalf("access key finding leaked value in excerpt %q", item.Excerpt)
 		}
 	}
@@ -423,7 +432,7 @@ func TestCollectDetectsPrivateKeyAssignments(t *testing.T) {
 	}
 }

-func TestCollectAllowsCredentialValuesThatLookLikeBareIdentifiers(t *testing.T) {
+func TestCollectDetectsCredentialValuesThatLookLikeBareIdentifiers(t *testing.T) {
 	repo := newGitRepo(t)
 	writeFile(t, filepath.Join(repo, "docs", "config.yaml"), "base: true\n")
 	runGit(t, repo, "add", "docs/config.yaml")
@@ -439,11 +448,15 @@ func TestCollectAllowsCredentialValuesThatLookLikeBareIdentifiers(t *testing.T)
 	runGit(t, repo, "commit", "-m", "add credential config")

 	got := collectFromPreviousCommit(t, repo)
+	var count int
 	for _, item := range got {
 		if item.File == "docs/config.yaml" && item.Rule == "public_content_generic_credential" {
-			t.Fatalf("readable identifiers should not be credential findings: %#v", got)
+			count++
 		}
 	}
+	if count != 4 {
+		t.Fatalf("bare identifier credential findings = %d, want 4: %#v", count, got)
+	}
 }

 func TestCollectAllowsBenignUnquotedTokenFields(t *testing.T) {
@@ -476,13 +489,12 @@ func TestCollectDetectsCredentialPhraseBeforeEnvironmentSuffix(t *testing.T) {
 	runGit(t, repo, "add", "docs/config.yaml")
 	runGit(t, repo, "commit", "-m", "base")

-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
 	writeFile(t, filepath.Join(repo, "docs", "config.yaml"), strings.Join([]string{
-		"API_KEY_OPENAI: " + providerValue,
-		"TOKEN_GITHUB: " + providerValue,
-		"CLIENT_SECRET_GOOGLE: " + providerValue,
-		"SECRET_KEY_BASE: " + providerValue,
-		"APP_PASSWORD_PROD: " + providerValue,
+		"API_KEY_OPENAI: real-openai-key",
+		"TOKEN_GITHUB: real-github-token",
+		"CLIENT_SECRET_GOOGLE: real-google-secret",
+		"SECRET_KEY_BASE: real-secret-key-base",
+		"APP_PASSWORD_PROD: real-prod-password",
 	}, "\n")+"\n")
 	runGit(t, repo, "add", "docs/config.yaml")
 	runGit(t, repo, "commit", "-m", "add credential config")
@@ -494,7 +506,13 @@ func TestCollectDetectsCredentialPhraseBeforeEnvironmentSuffix(t *testing.T) {
 			continue
 		}
 		count++
-		for _, forbidden := range []string{providerValue} {
+		for _, forbidden := range []string{
+			"real-openai-key",
+			"real-github-token",
+			"real-google-secret",
+			"real-secret-key-base",
+			"real-prod-password",
+		} {
 			if strings.Contains(item.Excerpt, forbidden) {
 				t.Fatalf("credential finding leaked value %q in excerpt %q", forbidden, item.Excerpt)
 			}
@@ -603,8 +621,7 @@ func TestCollectSkipsOnlyKnownQualityGateFixtureFiles(t *testing.T) {
 	writeFile(t, filepath.Join(repo, "internal", "qualitygate", "publiccontent", "scan_test.go"), "SECRET_TOKEN=fixture\n")
 	writeFile(t, filepath.Join(repo, "internal", "qualitygate", "publiccontent", "scan.go"), "const privateKeyFixture = \""+privateKeyBeginPrefix+privateKeyMarker+"\"\n")
 	writeFile(t, filepath.Join(repo, "internal", "qualitygate", "publiccontent", "rules.go"), "markers := []string{\"generated with automation\"}\n")
-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
-	writeFile(t, filepath.Join(repo, "tests", "e2e", "new-public-workflow.test.sh"), "SECRET_TOKEN="+providerValue+"\n")
+	writeFile(t, filepath.Join(repo, "tests", "e2e", "new-public-workflow.test.sh"), "SECRET_TOKEN=real-leak\n")
 	runGit(t, repo, "add", ".")
 	runGit(t, repo, "commit", "-m", "add scanner fixtures")

@@ -668,11 +685,10 @@ func TestCollectScansAddedLinesInSpecialPathNames(t *testing.T) {
 	runGit(t, repo, "add", ".")
 	runGit(t, repo, "commit", "-m", "base")

-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
-	writeFile(t, filepath.Join(repo, "docs", "has space.md"), "SECRET_TOKEN="+providerValue+"\n")
-	writeFile(t, filepath.Join(repo, `weird"quote.md`), "SECRET_TOKEN="+providerValue+"\n")
+	writeFile(t, filepath.Join(repo, "docs", "has space.md"), "SECRET_TOKEN=space-value\n")
+	writeFile(t, filepath.Join(repo, `weird"quote.md`), "SECRET_TOKEN=quote-value\n")
 	runGit(t, repo, "mv", "docs/old.md", "docs/new name.md")
-	writeFile(t, filepath.Join(repo, "docs", "new name.md"), "base\nSECRET_TOKEN="+providerValue+"\n")
+	writeFile(t, filepath.Join(repo, "docs", "new name.md"), "base\nSECRET_TOKEN=rename-value\n")
 	runGit(t, repo, "add", ".")
 	runGit(t, repo, "commit", "-m", "add special paths")

--- a/internal/qualitygate/publiccontent/comment_audit.go
+++ b/internal/qualitygate/publiccontent/comment_audit.go
@@ -4,15 +4,8 @@
 package publiccontent

 func ScanComment(kind, body string) []Finding {
-	return ScanCommentAtPath(kind, "", body)
-}
-
-func ScanCommentAtPath(kind, path, body string) []Finding {
 	if kind == "" {
 		kind = "comment"
 	}
-	if path == "" {
-		path = kind
-	}
-	return scanText(path, "comment", body, isDetectorRuleFile(path))
+	return scanText(kind, "comment", body, false)
 }
--- a/internal/qualitygate/publiccontent/comment_audit_test.go
+++ b/internal/qualitygate/publiccontent/comment_audit_test.go
@@ -3,10 +3,7 @@

 package publiccontent

-import (
-	"strings"
-	"testing"
-)
+import "testing"

 func TestScanCommentAuditsPublishedCommentBodies(t *testing.T) {
 	got := ScanComment("issue_comment", `The published comment included /tmp/harness`+`-agent/run and CCM`+`-Harness: stage-4`)
@@ -20,60 +17,3 @@ func TestScanCommentAuditsPublishedCommentBodies(t *testing.T) {
 		}
 	}
 }
-
-func TestScanCommentAllowsMermaidCredentialTerminology(t *testing.T) {
-	body := strings.Join([]string{
-		"```mermaid",
-		"sequenceDiagram",
-		"  participant Client",
-		"  participant AccessTokenHashTransport",
-		"  participant SecurityPolicyTransport",
-		"  Client->>AccessTokenHashTransport: Send request with bearer token",
-		"  AccessTokenHashTransport->>AccessTokenHashTransport: Clone request and inject token hash",
-		"  Client -> ClientSecret: Resolve configured credential",
-		"  AccessTokenHashTransport->>SecurityPolicyTransport: Forward enriched request",
-		"```",
-	}, "\n")
-
-	got := ScanComment("issue_comment", body)
-	for _, item := range got {
-		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("mermaid credential terminology should not be a credential finding: %#v", got)
-		}
-	}
-}
-
-func TestScanCommentDetectsCredentialAssignmentInsideMermaidMessage(t *testing.T) {
-	providerValue := strings.Join([]string{"gh", "p_", "1234567890abcdef", "1234567890abcdef", "1234"}, "")
-	credentialAssignment := "password=" + providerValue
-	body := strings.Join([]string{
-		"```mermaid",
-		"sequenceDiagram",
-		"  Client->>Server: Send " + credentialAssignment,
-		"```",
-	}, "\n")
-
-	got := ScanComment("issue_comment", body)
-	if !findingRules(got)["public_content_generic_credential"] {
-		t.Fatalf("credential assignment inside mermaid message should be reported: %#v", got)
-	}
-}
-
-func TestScanCommentAtPathAllowsTestFixtureCredentialPlaceholder(t *testing.T) {
-	body := `cfg := &core.CliConfig{AppID: "cli_x", AppSecret: "fake-secret"}`
-	got := ScanCommentAtPath("pull_request_review_comment", "cmd/agent/list_test.go", body)
-	for _, item := range got {
-		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("review comment test fixture should not be a credential finding: %#v", got)
-		}
-	}
-}
-
-func TestScanCommentAtPathDetectsProviderCredentialInTestFile(t *testing.T) {
-	providerValue := strings.Join([]string{"gh", "p_", "1234567890abcdef", "1234567890abcdef", "1234"}, "")
-	body := `cfg := &Config{AccessToken: "` + providerValue + `"}`
-	got := ScanCommentAtPath("pull_request_review_comment", "cmd/agent/list_test.go", body)
-	if !findingRules(got)["public_content_generic_credential"] {
-		t.Fatalf("provider credential in review comment should be reported: %#v", got)
-	}
-}
--- a/internal/qualitygate/publiccontent/credential.go
+++ b/internal/qualitygate/publiccontent/credential.go
@@ -1,88 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package publiccontent
-
-import (
-	"encoding/base64"
-	"net/url"
-	"strings"
-)
-
-func credentialValueHasStrongEvidence(key, value string) bool {
-	normalized := strings.TrimRight(strings.TrimSpace(value), ",;")
-	normalized = strings.TrimSpace(strings.Trim(normalized, `"'<>`))
-	candidates := credentialEvidenceCandidates(unwrapCredentialValue(normalized))
-	for _, candidate := range candidates {
-		if providerCredentialIdentifier(candidate) {
-			return true
-		}
-	}
-	if isCredentialMetadataField(key) {
-		return false
-	}
-	for _, candidate := range candidates {
-		if highEntropyCredentialValue(strings.ToLower(candidate)) || base64PaddedCredentialValue(candidate) {
-			return true
-		}
-	}
-	return percentEncodedCredentialValue(strings.ToLower(candidates[0])) ||
-		commandSubstitutionLooksCredentialLike(strings.ToLower(normalized))
-}
-
-func credentialEvidenceCandidates(value string) []string {
-	candidates := []string{value}
-	for range 3 {
-		decoded, err := url.PathUnescape(value)
-		if err != nil || decoded == value {
-			break
-		}
-		candidates = append(candidates, decoded)
-		value = decoded
-	}
-	return candidates
-}
-
-func isCredentialMetadataField(key string) bool {
-	if isBenignTokenField(key) {
-		return true
-	}
-	parts := credentialKeyParts(strings.ReplaceAll(strings.ToLower(key), "-", "_"))
-	if len(parts) < 2 {
-		return false
-	}
-	switch parts[len(parts)-1] {
-	case "hash", "id", "kind", "marker", "prefix", "transport":
-		return true
-	default:
-		return false
-	}
-}
-
-func base64PaddedCredentialValue(value string) bool {
-	if len(value) < 16 || !strings.HasSuffix(value, "=") {
-		return false
-	}
-	if _, err := base64.StdEncoding.DecodeString(value); err != nil {
-		return false
-	}
-	return shannonEntropy(strings.TrimRight(value, "=")) >= 3.5
-}
-
-func percentEncodedCredentialValue(value string) bool {
-	if len(value) < 16 {
-		return false
-	}
-	var escapes int
-	for i := 0; i+2 < len(value); i++ {
-		if value[i] == '%' && isHexByte(value[i+1]) && isHexByte(value[i+2]) {
-			escapes++
-			i += 2
-		}
-	}
-	return escapes >= 2
-}
-
-func isHexByte(value byte) bool {
-	return (value >= '0' && value <= '9') || (value >= 'a' && value <= 'f')
-}
--- a/internal/qualitygate/publiccontent/rules.go
+++ b/internal/qualitygate/publiccontent/rules.go
@@ -13,7 +13,7 @@ import (
 )

 var (
-	credentialAssignmentRE = regexp.MustCompile(`(?i)["']?\b[A-Za-z0-9_-]*(?:api[_-]?key|access[_-]?key|private[_-]?key|secret|password|passwd|token|webhook|access[_-]?token|client[_-]?secret)[A-Za-z0-9_-]*\b["']?\s*(?::=|[:=])\s*(?:!!str\s+)?(?:"((?:\\.|[^"\\])*)"|'((?:\\.|[^'\\])*)'|(\x60[^\x60]*\x60)|(\$\([^)]*\))|(\$\{\{[^}]+\}\})|([^"'\x60\s,}\]]+))`)
+	credentialAssignmentRE = regexp.MustCompile(`(?i)["']?\b[A-Za-z0-9_-]*(?:api[_-]?key|access[_-]?key|private[_-]?key|secret|password|passwd|token|webhook|access[_-]?token|client[_-]?secret)[A-Za-z0-9_-]*\b["']?\s*[:=]\s*(?:"((?:\\.|[^"\\])*)"|'((?:\\.|[^'\\])*)'|(\$\([^)]*\))|(\$\{\{[^}]+\}\})|([^"'\s,}\]]+))`)
 	jwtLikeRE              = regexp.MustCompile(`\b[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\b`)
 	credentialURLRE        = regexp.MustCompile(`(?i)\b[a-z][a-z0-9+.-]*://[^/\s:@]*:[^@\s/]+@[^)\s]+`)
 	bearerHeaderRE         = regexp.MustCompile(`(?i)(?:\bAuthorization\s*:\s*Bearer\s+|["']Authorization["']\s*:\s*["']Bearer\s+)[A-Za-z0-9._+/=-]{12,}`)
@@ -383,63 +383,33 @@ func anglePlaceholderIdentifier(value string) bool {
 }

 func credentialShapedValue(value string) bool {
-	normalized := strings.TrimSpace(strings.Trim(strings.TrimSpace(value), `"'<>`))
+	normalized := strings.ToLower(strings.Trim(value, `"'<>`))
 	return credentialShapedIdentifier(normalized)
 }

 func credentialShapedIdentifier(value string) bool {
-	return providerCredentialIdentifier(value)
-}
-
-func providerCredentialIdentifier(value string) bool {
-	value = strings.TrimSpace(value)
 	switch {
-	case providerTokenWithBody(value, "sk_live_", 16, ""),
-		providerTokenWithBody(value, "sk_test_", 16, ""),
-		providerTokenWithBody(value, "ghp_", 16, ""),
-		providerTokenWithBody(value, "gho_", 16, ""),
-		providerTokenWithBody(value, "ghu_", 16, ""),
-		providerTokenWithBody(value, "github_pat_", 16, "_"),
-		providerTokenWithBody(value, "xoxb_", 16, "-"),
-		providerTokenWithBody(value, "xoxp_", 16, "-"),
-		providerTokenWithBody(value, "xoxa_", 16, "-"),
-		providerTokenWithBody(value, "xoxb-", 16, "-"),
-		providerTokenWithBody(value, "xoxp-", 16, "-"),
-		providerTokenWithBody(value, "xoxa-", 16, "-"),
-		awsAccessKeyIdentifier(value):
+	case strings.HasPrefix(value, "sk_live_"),
+		strings.HasPrefix(value, "sk_test_"),
+		strings.HasPrefix(value, "ghp_"),
+		strings.HasPrefix(value, "gho_"),
+		strings.HasPrefix(value, "ghu_"),
+		strings.HasPrefix(value, "github_pat_"),
+		strings.HasPrefix(value, "xoxb_"),
+		strings.HasPrefix(value, "xoxp_"),
+		strings.HasPrefix(value, "xoxa_"):
+		return true
+	case strings.HasPrefix(value, "real-") &&
+		(strings.Contains(value, "secret") ||
+			strings.Contains(value, "token") ||
+			strings.Contains(value, "key") ||
+			strings.Contains(value, "password")):
 		return true
 	default:
 		return false
 	}
 }

-func providerTokenWithBody(value, prefix string, minBodyLength int, separators string) bool {
-	body, ok := strings.CutPrefix(value, prefix)
-	if !ok || len(body) < minBodyLength {
-		return false
-	}
-	for _, r := range body {
-		if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') || strings.ContainsRune(separators, r) {
-			continue
-		}
-		return false
-	}
-	return true
-}
-
-func awsAccessKeyIdentifier(value string) bool {
-	if len(value) != 20 || (!strings.HasPrefix(value, "AKIA") && !strings.HasPrefix(value, "ASIA")) {
-		return false
-	}
-	for _, r := range value[4:] {
-		if (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') {
-			continue
-		}
-		return false
-	}
-	return true
-}
-
 func resourceTokenPlaceholderValue(value string) bool {
 	normalized := strings.ToLower(strings.Trim(value, `"'`))
 	switch normalized {
--- a/internal/qualitygate/publiccontent/scan.go
+++ b/internal/qualitygate/publiccontent/scan.go
@@ -47,30 +47,15 @@ func scanText(file, source, text string, detectorFile bool) []Finding {
 			out = append(out, newFinding("public_content_private_key_block", file, privateKeyLine, source, "private key block"))
 			inPrivateKey = false
 		}
-		for _, location := range credentialAssignmentRE.FindAllStringIndex(line, -1) {
-			rawMatch := line[location[0]:location[1]]
-			if !validCredentialAssignmentStart(line, location[0], rawMatch) {
-				continue
-			}
-			match := credentialAssignmentRE.FindStringSubmatch(rawMatch)
-			if !isCredentialAssignmentMatch(rawMatch) {
+		for _, match := range credentialAssignmentRE.FindAllStringSubmatch(line, -1) {
+			if !isCredentialAssignmentMatch(match[0]) {
 				continue
 			}
 			value := credentialAssignmentValue(match)
-			keyName, _ := normalizedCredentialAssignmentKey(rawMatch)
-			evidenceValue := value
-			if sourceCodeFile(file) {
-				if rhs, ok := sourceCodeTypedCredentialRHS(line, location[0], rawMatch); ok {
-					evidenceValue = rhs
-				}
-			}
-			if !(isWebhookCredentialKey(keyName) && webhookAssignmentValueLooksCredentialLike(value)) &&
-				!credentialValueHasStrongEvidence(keyName, evidenceValue) {
-				continue
-			}
+			keyName, _ := normalizedCredentialAssignmentKey(match[0])
 			if value == "" ||
 				isNonSecretLiteralValue(value) ||
-				isBenignCodeCredentialExpression(file, line, location[0], rawMatch, value) ||
+				isBenignCodeCredentialExpression(file, line, match[0], value) ||
 				isPlaceholderValue(value) ||
 				isPermissionScopeIdentifierAssignment(keyName, value) ||
 				isResourceTokenPlaceholderAssignment(keyName, value) {
@@ -79,7 +64,7 @@ func scanText(file, source, text string, detectorFile bool) []Finding {
 			if looksLikeEqualityComparison(value) {
 				continue
 			}
-			out = append(out, newFinding("public_content_generic_credential", file, lineNo, source, redactAssignment(rawMatch)))
+			out = append(out, newFinding("public_content_generic_credential", file, lineNo, source, redactAssignment(match[0])))
 		}
 		for _, match := range jwtLikeRE.FindAllString(line, -1) {
 			if !isJWTToken(match) {
@@ -138,43 +123,21 @@ func scanText(file, source, text string, detectorFile bool) []Finding {
 	return out
 }

-func validCredentialAssignmentStart(line string, start int, match string) bool {
-	if start <= 0 || credentialAssignmentOperator(match) != ":" {
-		return true
-	}
-	prefix := strings.TrimSpace(line[:start])
-	for _, arrow := range []string{"-->>", "->>", "-->", "->"} {
-		if strings.HasSuffix(prefix, arrow) {
-			return false
-		}
-	}
-	return true
-}
-
-func credentialAssignmentOperator(match string) string {
-	key, ok := credentialAssignmentKey(match)
-	if !ok {
-		return ""
-	}
-	rest := strings.TrimSpace(match[len(key):])
-	if strings.HasPrefix(rest, ":=") {
-		return ":="
-	}
-	if strings.HasPrefix(rest, ":") {
-		return ":"
-	}
-	if strings.HasPrefix(rest, "=") {
-		return "="
-	}
-	return ""
-}
-
 func isCredentialAssignmentMatch(match string) bool {
-	name, _, ok := normalizedCredentialAssignment(match)
+	name, value, ok := normalizedCredentialAssignment(match)
 	if !ok {
 		return false
 	}
-	return isExplicitCredentialKey(name) || isWebhookCredentialKey(name)
+	if isWebhookCredentialKey(name) && webhookAssignmentValueLooksCredentialLike(value) {
+		return true
+	}
+	if isBenignTokenField(name) && !credentialShapedValue(value) {
+		return false
+	}
+	if isWeakTokenCredentialKey(name) && !weakTokenValueLooksCredentialLike(value) {
+		return false
+	}
+	return isExplicitCredentialKey(name)
 }

 func normalizedCredentialAssignmentKey(match string) (string, bool) {
@@ -325,7 +288,7 @@ func tokenLikePlaceholderKey(key string) bool {

 func tokenLikePlaceholderValue(key, value string) bool {
 	normalized := strings.ToLower(strings.Trim(value, `"'`))
-	if normalized == "" || credentialShapedIdentifier(strings.Trim(value, `"'`)) {
+	if normalized == "" || credentialShapedIdentifier(normalized) {
 		return false
 	}
 	if authCredentialTokenKey(key) {
@@ -360,8 +323,52 @@ func maskedTokenFixturePlaceholderValue(key, value string) bool {
 	return stars >= 6 && alnum > 0
 }

+func isWeakTokenCredentialKey(key string) bool {
+	if authCredentialTokenKey(key) || isStrongTokenCredentialKey(key) {
+		return false
+	}
+	return key == "token" ||
+		strings.HasSuffix(key, "_token") ||
+		strings.HasSuffix(key, "-token")
+}
+
+func isStrongTokenCredentialKey(key string) bool {
+	parts := credentialKeyParts(strings.ReplaceAll(strings.ToLower(key), "-", "_"))
+	for _, phrase := range [][2]string{
+		{"access", "token"},
+		{"refresh", "token"},
+		{"auth", "token"},
+		{"bearer", "token"},
+		{"session", "token"},
+		{"service", "token"},
+		{"bot", "token"},
+		{"api", "token"},
+		{"secret", "token"},
+	} {
+		if hasAdjacentCredentialParts(parts, phrase[0], phrase[1]) {
+			return true
+		}
+	}
+	return false
+}
+
+func weakTokenValueLooksCredentialLike(value string) bool {
+	normalized := strings.ToLower(strings.Trim(value, `"'<>`))
+	if normalized == "" ||
+		isNonSecretLiteralValue(value) ||
+		isPlaceholderValue(value) {
+		return false
+	}
+	candidate := unwrapCredentialValue(normalized)
+	return credentialShapedIdentifier(candidate) ||
+		highEntropyCredentialValue(candidate) ||
+		commandSubstitutionLooksCredentialLike(normalized) ||
+		(strings.Contains(normalized, "://") &&
+			urlRemainderLooksCredentialLike(removeAnglePlaceholders(normalized)))
+}
+
 func unwrapCredentialValue(value string) string {
-	value = strings.TrimSpace(strings.Trim(value, "\"'<>`"))
+	value = strings.TrimSpace(strings.Trim(value, `"'<>`))
 	if strings.HasPrefix(value, "${{") && strings.HasSuffix(value, "}}") {
 		value = strings.TrimSpace(strings.TrimSuffix(strings.TrimPrefix(value, "${{"), "}}"))
 	}
@@ -481,20 +488,17 @@ func numericStringPlaceholderValue(value string) bool {
 	return true
 }

-func isBenignCodeCredentialExpression(file, line string, matchStart int, match, value string) bool {
+func isBenignCodeCredentialExpression(file, line, match, value string) bool {
 	normalized := strings.TrimSpace(value)
 	if strings.HasPrefix(normalized, "regexp.MustCompile(") {
 		return true
 	}
-	if !sourceCodeFile(file) {
+	if !sourceCodeFile(file) || credentialShapedValue(value) {
 		return false
 	}
-	if rhs, ok := sourceCodeTypedCredentialRHS(line, matchStart, match); ok {
+	if rhs, ok := sourceCodeTypedCredentialRHS(line, match); ok {
 		return isBenignTypedCredentialRHS(rhs)
 	}
-	if credentialShapedValue(value) {
-		return false
-	}
 	rawValueQuoted := credentialAssignmentRawValueQuoted(match)
 	if sourceCodeLiteralLooksNonSecret(normalized, !rawValueQuoted) {
 		return true
@@ -514,16 +518,17 @@ func isBenignCodeCredentialExpression(file, line string, matchStart int, match,
 	return codeReferenceExpression(normalized)
 }

-func sourceCodeTypedCredentialRHS(line string, matchStart int, match string) (string, bool) {
-	if matchStart < 0 || matchStart+len(match) > len(line) || line[matchStart:matchStart+len(match)] != match {
+func sourceCodeTypedCredentialRHS(line, match string) (string, bool) {
+	idx := strings.Index(line, match)
+	if idx < 0 {
 		return "", false
 	}
 	key, ok := credentialAssignmentKey(match)
 	if !ok {
 		return "", false
 	}
-	rest := strings.TrimSpace(line[matchStart+len(key):])
-	if !strings.HasPrefix(rest, ":") || strings.HasPrefix(rest, ":=") {
+	rest := strings.TrimSpace(line[idx+len(key):])
+	if !strings.HasPrefix(rest, ":") {
 		return "", false
 	}
 	typeAndRHS := strings.TrimSpace(strings.TrimPrefix(rest, ":"))
@@ -531,12 +536,7 @@ func sourceCodeTypedCredentialRHS(line string, matchStart int, match string) (st
 	if assignmentIdx < 0 {
 		return "", false
 	}
-	rhs := strings.TrimSpace(typeAndRHS[assignmentIdx+1:])
-	parsed := credentialAssignmentRE.FindStringSubmatch("client_secret=" + rhs)
-	if parsed == nil {
-		return rhs, true
-	}
-	return credentialAssignmentValue(parsed), true
+	return strings.TrimSpace(typeAndRHS[assignmentIdx+1:]), true
 }

 func isBenignTypedCredentialRHS(value string) bool {
@@ -568,7 +568,7 @@ func credentialAssignmentRawValueQuoted(match string) bool {

 func sourceCodeFile(file string) bool {
 	switch filepath.Ext(file) {
-	case ".go", ".js", ".jsx", ".py", ".sh", ".ts", ".tsx":
+	case ".go", ".js", ".jsx", ".py", ".ts", ".tsx":
 		return true
 	default:
 		return false
@@ -593,7 +593,6 @@ func sourceCodeLiteralLooksNonSecret(value string, allowNumeric bool) bool {
 		sourceCodeFakeOrPlaceholderLiteral(literal) ||
 		sourceCodeCredentialTermLiteral(literal) ||
 		sourceCodeCredentialPrefixLiteral(literal) ||
-		sourceCodeStringExpressionLiteral(literal) ||
 		sourceCodeVocabularyLiteral(literal) ||
 		sourceCodeSchemaTypeLiteral(literal) ||
 		benignCredentialStatusLiteral(literal)
@@ -686,18 +685,6 @@ func sourceCodeCredentialPrefixLiteral(value string) bool {
 	}
 }

-func sourceCodeStringExpressionLiteral(value string) bool {
-	normalized := strings.TrimSpace(value)
-	if normalized == "" ||
-		credentialShapedIdentifier(normalized) ||
-		highEntropyCredentialValue(strings.ToLower(normalized)) {
-		return false
-	}
-	return strings.Contains(normalized, "${") ||
-		strings.Contains(normalized, "$(") ||
-		(strings.Contains(normalized, `\b`) && strings.ContainsAny(normalized, "|[]{}()+*?"))
-}
-
 func sourceCodeVocabularyLiteral(value string) bool {
 	switch strings.ToLower(value) {
 	case "bot", "tenant", "user":
@@ -766,7 +753,7 @@ func codeIdentifier(value string) bool {

 func isNonSecretLiteralValue(value string) bool {
 	switch strings.ToLower(strings.TrimSpace(strings.Trim(value, `"'`))) {
-	case "true", "false", "null", "nil", "{", "[", `\`:
+	case "true", "false", "null", "nil", "{", "[":
 		return true
 	default:
 		return false
@@ -993,7 +980,6 @@ func credentialURLPasswordFixture(password string) bool {
 	normalized := strings.ToLower(strings.Trim(password, `"'`))
 	switch normalized {
 	case "p",
-		"p%40ss",
 		"pass",
 		"password",
 		"pat_abc",
--- a/internal/qualitygate/publiccontent/scan_test.go
+++ b/internal/qualitygate/publiccontent/scan_test.go
@@ -251,22 +251,26 @@ func TestScanFileDoesNotTreatURLEncodedCredentialAsPlaceholder(t *testing.T) {
 	}
 }

-func TestScanFileAllowsReadablePlaceholderMarkerSubstrings(t *testing.T) {
+func TestScanFileDoesNotTreatPlaceholderMarkerSubstringsAsPlaceholders(t *testing.T) {
 	got := ScanFile("docs/config.md", []byte(strings.Join([]string{
 		"API_KEY=notredactedreal",
 		"API_KEY=notplaceholdersecret",
 		"API_KEY=abcxxxxreal",
 	}, "\n")+"\n"))
+	var count int
 	for _, item := range got {
 		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("readable credential words should not be findings: %#v", got)
+			count++
 		}
 	}
+	if count != 3 {
+		t.Fatalf("placeholder-marker substring findings = %d, want 3: %#v", count, got)
+	}
 }

 func TestScanFileDetectsBase64PaddedCredentialAssignments(t *testing.T) {
 	paddedSecretPrefix := "dGhpc2lz" + "YXNlY3JldA"
-	paddedTokenPrefix := "UTdrMm1O" + "OXBSNHZYOA"
+	paddedTokenPrefix := "YWJj" + "ZGVmZ2g"
 	paddedSecret := base64PaddedFixture(paddedSecretPrefix)
 	paddedToken := base64PaddedFixture(paddedTokenPrefix)
 	got := ScanFile("docs/config.md", []byte(strings.Join([]string{
@@ -290,25 +294,17 @@ func TestScanFileDetectsBase64PaddedCredentialAssignments(t *testing.T) {
 	}
 }

-func TestScanFileAllowsReadableBase64Lookalike(t *testing.T) {
-	got := ScanFile("docs/config.md", []byte("client_secret=placeholder=\n"))
-	if findingRules(got)["public_content_generic_credential"] {
-		t.Fatalf("readable base64 lookalike should not be a credential finding: %#v", got)
-	}
-}
-
 func TestScanFileDetectsQuotedJSONCredentialAssignments(t *testing.T) {
-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
-	jsonToken := providerValue
-	jsonSecret := providerValue
-	jsonKey := providerValue
-	jsonTenantToken := providerValue
-	jsonAppSecret := providerValue
-	jsonPrefixedKey := providerValue
-	jsonTenantCamelToken := providerValue
-	jsonGithubToken := providerValue
-	jsonVendorKey := providerValue
-	jsonSlackBotToken := "xoxb_" + "1234567890abcdef"
+	jsonToken := "real-json-token"
+	jsonSecret := "real " + "secret value"
+	jsonKey := "real-json-key"
+	jsonTenantToken := "real-tenant-json-token"
+	jsonAppSecret := "real-app-secret"
+	jsonPrefixedKey := "real-prefixed-key"
+	jsonTenantCamelToken := "real-tenant-camel-token"
+	jsonGithubToken := "real-github-token"
+	jsonVendorKey := "real-vendor-key"
+	jsonSlackBotToken := "xoxb-real-token"
 	got := ScanFile("docs/public.json", []byte(strings.Join([]string{
 		`{"access_` + `token":"` + jsonToken + `"}`,
 		`{"client_` + `secret": "` + jsonSecret + `"}`,
@@ -338,13 +334,12 @@ func TestScanFileDetectsQuotedJSONCredentialAssignments(t *testing.T) {
 }

 func TestScanFileDetectsCredentialPhraseBeforeEnvironmentSuffix(t *testing.T) {
-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
 	got := ScanFile("docs/config.yaml", []byte(strings.Join([]string{
-		"API_KEY_OPENAI: " + providerValue,
-		"TOKEN_GITHUB: " + providerValue,
-		"CLIENT_SECRET_GOOGLE: " + providerValue,
-		"SECRET_KEY_BASE: " + providerValue,
-		"APP_PASSWORD_PROD: " + providerValue,
+		"API_KEY_OPENAI: real-openai-key",
+		"TOKEN_GITHUB: real-github-token",
+		"CLIENT_SECRET_GOOGLE: real-google-secret",
+		"SECRET_KEY_BASE: real-secret-key-base",
+		"APP_PASSWORD_PROD: real-prod-password",
 	}, "\n")+"\n"))
 	var count int
 	for _, item := range got {
@@ -352,7 +347,13 @@ func TestScanFileDetectsCredentialPhraseBeforeEnvironmentSuffix(t *testing.T) {
 			continue
 		}
 		count++
-		for _, forbidden := range []string{providerValue} {
+		for _, forbidden := range []string{
+			"real-openai-key",
+			"real-github-token",
+			"real-google-secret",
+			"real-secret-key-base",
+			"real-prod-password",
+		} {
 			if strings.Contains(item.Excerpt, forbidden) {
 				t.Fatalf("credential finding leaked value %q in excerpt %q", forbidden, item.Excerpt)
 			}
@@ -363,77 +364,85 @@ func TestScanFileDetectsCredentialPhraseBeforeEnvironmentSuffix(t *testing.T) {
 	}
 }

-func TestScanFileAllowsCredentialValuesThatLookLikeBareIdentifiers(t *testing.T) {
+func TestScanFileDetectsCredentialValuesThatLookLikeBareIdentifiers(t *testing.T) {
 	got := ScanFile("docs/config.yaml", []byte(strings.Join([]string{
 		"API_KEY_OPENAI: prod_key",
 		"CLIENT_SECRET_GOOGLE: prod_secret",
 		"TOKEN_GITHUB: github_token",
 		"APP_PASSWORD_PROD: prod_password",
 	}, "\n")+"\n"))
+	var count int
 	for _, item := range got {
 		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("readable identifiers should not be credential findings: %#v", got)
+			count++
 		}
 	}
+	if count != 4 {
+		t.Fatalf("bare identifier credential findings = %d, want 4: %#v", count, got)
+	}
 }

 func TestScanFileDetectsAngleWrappedRealisticCredentialValues(t *testing.T) {
 	stripeLike := "sk_" + "live_1234567890abcdef"
 	patLike := "gh" + "p_1234567890abcdef1234567890abcdef1234"
-	cases := []struct {
-		name string
-		text string
-		want bool
-	}{
-		{name: "stripe", text: "API_KEY: <" + stripeLike + ">", want: true},
-		{name: "github", text: "SECRET_TOKEN: <" + patLike + ">", want: true},
-		{name: "readable", text: "CLIENT_SECRET: <real-client-secret-value>", want: false},
+	got := ScanFile("docs/config.yaml", []byte(strings.Join([]string{
+		"API_KEY: <" + stripeLike + ">",
+		"SECRET_TOKEN: <" + patLike + ">",
+		"CLIENT_SECRET: <real-client-secret-value>",
+	}, "\n")+"\n"))
+	var count int
+	for _, item := range got {
+		if item.Rule == "public_content_generic_credential" {
+			count++
+		}
 	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			assertGenericCredentialFinding(t, "docs/config.yaml", tc.text, tc.want)
-		})
+	if count != 3 {
+		t.Fatalf("angle-wrapped realistic credential findings = %d, want 3: %#v", count, got)
 	}
 }

 func TestScanFileDetectsCredentialShapedValuesUnderBenignKeys(t *testing.T) {
 	stripeLike := "sk_" + "live_1234567890abcdef"
 	patLike := "gh" + "p_1234567890abcdef1234567890abcdef1234"
-	cases := []struct {
-		name string
-		text string
-		want bool
-	}{
-		{name: "expiry provider token", text: `{"access_token_expires_in":"` + patLike + `"}`, want: true},
-		{name: "expiry provider secret", text: `{"refresh_token_expires_in":"` + stripeLike + `"}`, want: true},
-		{name: "status readable", text: `{"client_secret_status":"real-client-secret-value"}`, want: false},
-		{name: "name readable", text: `{"client_secret_name":"real-client-secret-value"}`, want: false},
-		{name: "app provider token", text: `{"app_token":"` + patLike + `"}`, want: true},
-		{name: "sync provider secret", text: `{"sync_token":"` + stripeLike + `"}`, want: true},
-		{name: "target readable", text: `{"target_token":"real-client-secret-value"}`, want: false},
+	got := ScanFile("docs/public.json", []byte(strings.Join([]string{
+		`{"access_token_expires_in":"` + patLike + `"}`,
+		`{"refresh_token_expires_in":"` + stripeLike + `"}`,
+		`{"client_secret_status":"real-client-secret-value"}`,
+		`{"client_secret_name":"real-client-secret-value"}`,
+		`{"app_token":"` + patLike + `"}`,
+		`{"sync_token":"` + stripeLike + `"}`,
+		`{"target_token":"real-client-secret-value"}`,
+	}, "\n")+"\n"))
+	var count int
+	for _, item := range got {
+		if item.Rule == "public_content_generic_credential" {
+			count++
+		}
 	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			assertGenericCredentialFinding(t, "docs/public.json", tc.text, tc.want)
-		})
+	if count != 7 {
+		t.Fatalf("credential-shaped benign-key findings = %d, want 7: %#v", count, got)
 	}
 }

-func TestScanFileAllowsBareIdentifierCredentialsWithMetadataSuffixes(t *testing.T) {
+func TestScanFileDetectsBareIdentifierCredentialsWithMetadataSuffixes(t *testing.T) {
 	got := ScanFile("docs/config.yaml", []byte(strings.Join([]string{
 		"API_KEY_NAME: prod_key",
 		"CLIENT_SECRET_NAME: prod_secret",
 		"SECRET_STATUS: prod_secret",
 	}, "\n")+"\n"))
+	var count int
 	for _, item := range got {
 		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("readable metadata values should not be credential findings: %#v", got)
+			count++
 		}
 	}
+	if count != 3 {
+		t.Fatalf("metadata-suffixed bare credential findings = %d, want 3: %#v", count, got)
+	}
 }

 func TestScanFileDetectsAccessKeyCredentials(t *testing.T) {
-	accessKey := "AK" + "IAIOSFODNN7EXAMPXX"
+	accessKey := "AK" + "IAIOSFODNN7EXAMPX"
 	got := ScanFile("docs/config.yaml", []byte(strings.Join([]string{
 		"AWS_ACCESS_KEY_ID: " + accessKey,
 		"ACCESS_KEY_ID: " + accessKey,
@@ -584,18 +593,18 @@ func TestScanFileAllowsCredentialReferenceValues(t *testing.T) {

 func TestScanFileDetectsMalformedGithubExpressionCredentialValues(t *testing.T) {
 	stripeLike := "sk_" + "live_1234567890abcdef"
-	cases := []struct {
-		name string
-		text string
-		want bool
-	}{
-		{name: "provider", text: "API_KEY=${{" + stripeLike + "}}", want: true},
-		{name: "readable", text: "TOKEN=${{real-secret-token-value}}", want: false},
+	got := ScanFile("docs/config.yaml", []byte(strings.Join([]string{
+		"API_KEY=${{" + stripeLike + "}}",
+		"TOKEN=${{real-secret-token-value}}",
+	}, "\n")+"\n"))
+	var count int
+	for _, item := range got {
+		if item.Rule == "public_content_generic_credential" {
+			count++
+		}
 	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			assertGenericCredentialFinding(t, "docs/config.yaml", tc.text, tc.want)
-		})
+	if count != 2 {
+		t.Fatalf("malformed GitHub expression credential findings = %d, want 2: %#v", count, got)
 	}
 }

@@ -639,7 +648,6 @@ func TestScanFileAllowsCredentialURLPlaceholders(t *testing.T) {
 func TestScanFileAllowsCredentialURLFixtures(t *testing.T) {
 	got := ScanFile("fixtures/network_test.go", []byte(strings.Join([]string{
 		`proxy := "http://user:pass@proxy:8080"`,
-		`proxy := "http://user:p%40ss@proxy:8080/path"`,
 		`repo := "https://u:t@h/r.git"`,
 		`target := "https://attacker:pw@open.feishu.cn"`,
 		`proxy := "http://admin:s3cret@127.0.0.1:3128"`,
@@ -813,151 +821,35 @@ func TestScanFileDetectsWeakTokenFieldsWithHighConfidenceCredentialValues(t *tes
 	}
 }

-func TestScanFileAllowsStrongAuthTokenKeysWithoutStrongValueEvidence(t *testing.T) {
+func TestScanFileDetectsStrongAuthTokenKeysWithFixtureLikeValues(t *testing.T) {
 	got := ScanFile("docs/config.md", []byte(strings.Join([]string{
 		`{"access_token":"img_abc123"}`,
 		`{"api_token":"img_live_secret"}`,
 		`{"service_token":"ab********cd"}`,
 		`{"bot_token":"board_v3_example"}`,
 	}, "\n")+"\n"))
-	for _, item := range got {
-		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("token field names alone should not produce findings: %#v", got)
-		}
-	}
-}
-
-func TestScanFileAllowsTestFixtureSecretValues(t *testing.T) {
-	got := ScanFile("fixtures/calendar_meeting_test.go", []byte(strings.Join([]string{
-		`AppID: "test-app", AppSecret: "test-secret", Brand: core.BrandFeishu,`,
-		`cfg := &core.CliConfig{AppID: "a", AppSecret: "s"}`,
-		`os.WriteFile(path, []byte("FEISHU_APP_ID=cli_abc\nFEISHU_APP_SECRET=secret\n"), 0600)`,
-		`rt := &stubRoundTripper{respBody: ` + "`" + `{"access_token":"t","token_type":"Bearer"}` + "`" + `}`,
-		`envContent := "FEISHU_APP_ID=cli_hermes_abc\nFEISHU_APP_SECRET=hermes_secret_123\nFEISHU_DOMAIN=lark\n"`,
-		`os.WriteFile(path, []byte("FEISHU_APP_ID=cli_auto\nFEISHU_APP_SECRET=auto_secret\n"), 0600)`,
-		`os.WriteFile(path, []byte("FEISHU_APP_ID=cli_new_app\nFEISHU_APP_SECRET=new_secret\n"), 0600)`,
-		`if got := out.String(); got != "username=x-access-token\npassword=valid-pat\n\n" {`,
-		`if got := out.String(); got != "username=x-access-token\npassword=restored-pat\n\n" {`,
-		`if got := stdout.String(); got != "username=x-access-token\npassword=pat-token\n\n" {`,
-		`return &core.CliConfig{AppID: "dummy", AppSecret: "dummy"}`,
-		`os.WriteFile(path, []byte("API_KEY=replace-me\n"), 0600)`,
-		`body := "APP_ID=\"cli_xxxxx\"\nAPP_SECRET=\"xxxxx\"\n"`,
-	}, "\n")+"\n"))
-	for _, item := range got {
-		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("test fixture secret should not be credential finding: %#v", got)
-		}
-	}
-}
-
-func TestScanFileAllowsCredentialIdentifierFields(t *testing.T) {
-	got := ScanFile("fixtures/openapi_key_test.go", []byte(strings.Join([]string{
-		`"api_key_id": "k1",`,
-		`"secret_id": "s1",`,
-		`"token_id": "t1",`,
-		`"private_key_id": "pk1",`,
-	}, "\n")+"\n"))
-	for _, item := range got {
-		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("credential identifier fields should not be credential findings: %#v", got)
-		}
-	}
-}
-
-func TestScanFileDetectsCredentialShapedIdentifierFieldValues(t *testing.T) {
-	stripeLike := "sk_" + "live_1234567890abcdef"
-	githubToken := "ghp_" + "1234567890abcdef1234567890abcdef1234"
-	got := ScanFile("fixtures/openapi_key_test.go", []byte(strings.Join([]string{
-		`"api_key_id": "` + stripeLike + `",`,
-		`"token_id": "` + githubToken + `",`,
-	}, "\n")+"\n"))
 	var count int
 	for _, item := range got {
 		if item.Rule == "public_content_generic_credential" {
 			count++
 		}
 	}
-	if count != 2 {
-		t.Fatalf("credential-shaped identifier field findings = %d, want 2: %#v", count, got)
+	if count != 4 {
+		t.Fatalf("strong auth token key findings = %d, want 4: %#v", count, got)
 	}
 }

-func TestCredentialShapedValueTrimsWhitespaceBeforeDelimiters(t *testing.T) {
-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
-	if !credentialShapedValue(` "` + providerValue + `" `) {
-		t.Fatal("space-padded quoted provider credential should be recognized")
-	}
-}
-
-func TestScanFileDetectsProviderCredentialsAcrossAssignmentSyntaxes(t *testing.T) {
-	providerValue := strings.Join([]string{"gh", "p_", "1234567890abcdef", "1234567890abcdef", "1234"}, "")
-	tests := []struct {
-		name string
-		path string
-		text string
-	}{
-		{name: "Go raw string", path: "pkg/config.go", text: "const clientSecret = `" + providerValue + "`"},
-		{name: "TypeScript template literal", path: "pkg/config.ts", text: "const clientSecret = `" + providerValue + "`;"},
-		{name: "shell backtick", path: "scripts/config.sh", text: "client_secret=`" + providerValue + "`"},
-		{name: "YAML string tag", path: "docs/config.yaml", text: "client_secret: !!str " + providerValue},
-		{name: "YAML string tag double quoted", path: "docs/config.yaml", text: `client_secret: !!str "` + providerValue + `"`},
-		{name: "YAML string tag single quoted", path: "docs/config.yaml", text: `client_secret: !!str '` + providerValue + `'`},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := ScanFile(tt.path, []byte(tt.text+"\n"))
-			if !findingRules(got)["public_content_generic_credential"] {
-				t.Fatalf("provider credential should be reported: %#v", got)
-			}
-		})
-	}
-}
-
-func TestScanFileDetectsPercentEncodedProviderCredential(t *testing.T) {
-	providerBody := strings.Join([]string{"1234567890abcdef", "1234567890abcdef", "1234"}, "")
-	tests := []string{
-		"access_token: ghp%" + "5F" + providerBody,
-		"access_token_hash: ghp%" + "255F" + providerBody,
-	}
-	for _, text := range tests {
-		got := ScanFile("docs/config.yaml", []byte(text+"\n"))
-		if !findingRules(got)["public_content_generic_credential"] {
-			t.Fatalf("percent-encoded provider credential should be reported: %#v", got)
-		}
-	}
-}
-
-func TestScanFileRequiresCompleteProviderCredentialFormats(t *testing.T) {
-	got := ScanFile("docs/config.yaml", []byte(strings.Join([]string{
-		"token_type: asian",
-		"token_prefix: ASIA",
-		"token_prefix: ghp_",
-		"api_key: sk_live_example",
-		"token_prefix: asianmarketsegment01",
-		"token_prefix: ghp_placeholder_value",
-	}, "\n")+"\n"))
+func TestScanFileAllowsTestFixtureSecretValues(t *testing.T) {
+	got := ScanFile("fixtures/calendar_meeting_test.go", []byte(`AppID: "test-app", AppSecret: "test-secret", Brand: core.BrandFeishu,`+"\n"))
 	for _, item := range got {
 		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("incomplete provider prefixes should not be credential findings: %#v", got)
-		}
-	}
-}
-
-func TestScanFileAllowsEncodedTokenMetadataURL(t *testing.T) {
-	got := ScanFile("docs/config.yaml", []byte("token_url: https%3A%2F%2Fexample.invalid/oauth/token\n"))
-	for _, item := range got {
-		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("encoded token metadata URL should not be credential finding: %#v", got)
+			t.Fatalf("test fixture secret should not be credential finding: %#v", got)
 		}
 	}
 }

 func TestScanFileAllowsRegexpTokenValidators(t *testing.T) {
-	got := ScanFile("fixtures/minutes_detail.go", []byte(strings.Join([]string{
-		"var validMinuteTokenDetail = regexp.MustCompile(`^[a-z0-9]+$`)",
-		"REALISTIC_TOKEN_RE=\"\\\"${TOKEN_BODY}\\\"|\\`${TOKEN_BODY}\\`|\\\\b${TOKEN_BODY}\\\\b\"",
-	}, "\n")+"\n"))
+	got := ScanFile("fixtures/minutes_detail.go", []byte("var validMinuteTokenDetail = regexp.MustCompile(`^[a-z0-9]+$`)\n"))
 	for _, item := range got {
 		if item.Rule == "public_content_generic_credential" {
 			t.Fatalf("regexp token validator should not be credential finding: %#v", got)
@@ -1035,22 +927,6 @@ func TestScanFileAllowsSourceCodeCredentialNonSecretLiterals(t *testing.T) {
 	}
 }

-func TestScanFileAllowsSourceCodeSyntheticCredentialIdentifiers(t *testing.T) {
-	got := ScanFile("fixtures/sheets_media.go", []byte(strings.Join([]string{
-		`const fakeOfficeTokenPrefix = "fake_office_"`,
-		`const localOfficeTokenPrefix = "local_office_"`,
-		`const imageLiveSecretMarker = "img_live_secret"`,
-		`const imageProdKeyMarker = "img_prod_key"`,
-		`if strings.HasPrefix(spreadsheetToken, fakeOfficeTokenPrefix) {`,
-		`if strings.HasPrefix(spreadsheetToken, localOfficeTokenPrefix) {`,
-	}, "\n")+"\n"))
-	for _, item := range got {
-		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("source code token prefix references should not be credential findings: %#v", got)
-		}
-	}
-}
-
 func TestScanFileAllowsCredentialLikePublicPlaceholders(t *testing.T) {
 	got := ScanFile("fixtures/placeholders.md", []byte(strings.Join([]string{
 		`app_secret=***`,
@@ -1065,18 +941,22 @@ func TestScanFileAllowsCredentialLikePublicPlaceholders(t *testing.T) {
 	}
 }

-func TestScanFileAllowsPartiallyMaskedCredentialValues(t *testing.T) {
+func TestScanFileDetectsPartiallyMaskedCredentialValues(t *testing.T) {
 	got := ScanFile("fixtures/config.md", []byte(strings.Join([]string{
 		"client_secret=realprefix***realsuffix",
 		"client_secret=ab********cd",
 		"access_token=ab********cd",
 		"refresh_token=realprefix********realsuffix",
 	}, "\n")+"\n"))
+	var count int
 	for _, item := range got {
 		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("partially masked values should not be credential findings: %#v", got)
+			count++
 		}
 	}
+	if count != 4 {
+		t.Fatalf("partially masked credential findings = %d, want 4: %#v", count, got)
+	}
 }

 func TestScanFileAllowsDryRunCredentialPlaceholders(t *testing.T) {
@@ -1092,7 +972,6 @@ func TestScanFileAllowsDryRunCredentialPlaceholders(t *testing.T) {
 }

 func TestScanFileDetectsTypedCredentialAssignmentsWithSecretRHS(t *testing.T) {
-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
 	cases := []struct {
 		name string
 		file string
@@ -1101,47 +980,32 @@ func TestScanFileDetectsTypedCredentialAssignmentsWithSecretRHS(t *testing.T) {
 		{
 			name: "typescript simple secret",
 			file: "fixtures/source_secret.ts",
-			text: `const clientSecret: string = "` + providerValue + `"`,
+			text: `const clientSecret: string = "real-client-secret-value"`,
 		},
 		{
-			name: "typescript terminated secret",
+			name: "typescript numeric password",
 			file: "fixtures/source_secret.ts",
-			text: `const clientSecret: string = "` + providerValue + `";`,
-		},
-		{
-			name: "typescript secret with trailing comment",
-			file: "fixtures/source_secret.ts",
-			text: `const clientSecret: string = "` + providerValue + `"; // production`,
-		},
-		{
-			name: "typescript asserted secret",
-			file: "fixtures/source_secret.ts",
-			text: `const clientSecret: string = "` + providerValue + `" as const;`,
-		},
-		{
-			name: "typescript provider password",
-			file: "fixtures/source_secret.ts",
-			text: `const password: string = "` + providerValue + `"`,
+			text: `const password: string = "12345678901234567890"`,
 		},
 		{
 			name: "typescript union secret",
 			file: "fixtures/source_secret.ts",
-			text: `const clientSecret: string | undefined = "` + providerValue + `"`,
+			text: `const clientSecret: string | undefined = "real-client-secret-value"`,
 		},
 		{
 			name: "python simple secret",
 			file: "fixtures/source_secret.py",
-			text: `self.client_secret: str = "` + providerValue + `"`,
+			text: `self.client_secret: str = "real-client-secret-value"`,
 		},
 		{
 			name: "python union secret",
 			file: "fixtures/source_secret.py",
-			text: `self.client_secret: str | None = "` + providerValue + `"`,
+			text: `self.client_secret: str | None = "real-client-secret-value"`,
 		},
 		{
 			name: "python optional secret",
 			file: "fixtures/source_secret.py",
-			text: `self.client_secret: Optional[str] = "` + providerValue + `"`,
+			text: `self.client_secret: Optional[str] = "real-client-secret-value"`,
 		},
 	}
 	for _, tc := range cases {
@@ -1154,154 +1018,24 @@ func TestScanFileDetectsTypedCredentialAssignmentsWithSecretRHS(t *testing.T) {
 	}
 }

-func TestScanFileDetectsRepeatedTypedCredentialAssignments(t *testing.T) {
-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
-	assertGenericCredentialFinding(t, "fixtures/source_secret.ts", `const clientSecret: string = "placeholder";`, false)
-	assertGenericCredentialFinding(t, "fixtures/source_secret.ts", `const clientSecret: string = "`+providerValue+`";`, true)
-
-	got := ScanFile("fixtures/source_secret.ts", []byte(
-		`const clientSecret: string = "placeholder"; const clientSecret: string = "`+providerValue+`";`+"\n",
-	))
-	var count int
-	for _, item := range got {
-		if item.Rule == "public_content_generic_credential" {
-			count++
-		}
-	}
-	if count != 1 {
-		t.Fatalf("repeated typed credential findings = %d, want 1: %#v", count, got)
-	}
-}
-
 func TestScanFileDetectsCredentialShapedSourceCodeLiterals(t *testing.T) {
-	stripeLike := "sk_" + "live_1234567890abcdef"
 	githubToken := "ghp_" + "1234567890abcdef1234567890abcdef1234"
-	cases := []struct {
-		name string
-		text string
-		want bool
-	}{
-		{name: "stripe", text: `const ClientSecret = "` + stripeLike + `"`, want: true},
-		{name: "github", text: `const GithubToken = "` + githubToken + `"`, want: true},
-		{name: "password number", text: `const Password = "12345678901234567890"`, want: false},
-		{name: "secret number", text: `const ClientSecretNumber = "12345678901234567890"`, want: false},
-		{name: "format literal", text: `const ClientSecretFormat = "abc%sdefreal"`, want: false},
-		{name: "inline format literal", text: `fmt.Println("done"); const ClientSecret = "abc%sdefreal"`, want: false},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			assertGenericCredentialFinding(t, "fixtures/source_secret.go", tc.text, tc.want)
-		})
-	}
-}
-
-func TestScanFileDetectsGoShortDeclarationCredentials(t *testing.T) {
-	providerSecret := "sk_" + "live_1234567890abcdef"
-	providerToken := "ghp_" + "1234567890abcdef1234567890abcdef1234"
 	got := ScanFile("fixtures/source_secret.go", []byte(strings.Join([]string{
-		`clientSecret := "` + providerSecret + `"`,
-		`accessToken := "` + providerToken + `"`,
+		`const ClientSecret = "real-client-secret-value"`,
+		`const GithubToken = "` + githubToken + `"`,
+		`const Password = "12345678901234567890"`,
+		`const ClientSecretNumber = "12345678901234567890"`,
+		`const ClientSecretFormat = "abc%sdefreal"`,
+		`fmt.Println("done"); const ClientSecret = "abc%sdefreal"`,
 	}, "\n")+"\n"))
-
 	var count int
 	for _, item := range got {
 		if item.Rule == "public_content_generic_credential" {
 			count++
 		}
 	}
-	if count != 2 {
-		t.Fatalf("Go short declaration credential findings = %d, want 2: %#v", count, got)
-	}
-}
-
-func TestGenericCredentialDecisionMatrix(t *testing.T) {
-	providerToken := "ghp_" + "1234567890abcdef1234567890abcdef1234"
-	highEntropyValue := "Q7k2mN9pR4vX8cL3" + "sT6yU1aD5fG0hJ2z"
-	tokenHash := "6f1ed002ab559585" + "9014ebf0951522d9" +
-		"a0e3c1f4206254d" + "28a13efbbc8d56a30"
-	tests := []struct {
-		name    string
-		path    string
-		text    string
-		comment bool
-		want    bool
-	}{
-		{name: "source synthetic token prefix", path: "pkg/sheets.go", text: `const localOfficeTokenPrefix = "local_office_"`, want: false},
-		{name: "source token kind state", path: "pkg/client.py", text: `self._token_kind: TokenKind | None = None`, want: false},
-		{name: "documentation token prefix", path: "docs/config.yaml", text: `token_prefix: local_office_`, want: false},
-		{name: "documentation token kind", path: "docs/config.yaml", text: `token_kind: bearer`, want: false},
-		{name: "documentation token hash", path: "docs/config.yaml", text: `access_token_hash: ` + tokenHash, want: false},
-		{name: "comment fixture placeholder", text: `AppSecret: "fake-secret"`, comment: true, want: false},
-		{name: "test fixture placeholder", path: "pkg/config_test.go", text: `AppSecret: "fake-secret"`, want: false},
-		{name: "test real-labeled token", path: "pkg/config_test.go", text: `token: "real-tenant-access-token"`, want: false},
-		{name: "test ambiguous concrete secret word", path: "pkg/config_test.go", text: `AppSecret: "supersecret"`, want: false},
-		{name: "resource token placeholder", path: "docs/images.md", text: `"token": "img_abc123"`, want: false},
-		{name: "partially masked token", path: "docs/auth.md", text: `token=ab********cd`, want: false},
-		{name: "source readable secret words", path: "pkg/config.go", text: `const AppSecret = "customer-prod-secret"`, want: false},
-		{name: "documentation readable secret words", path: "docs/config.yaml", text: `client_secret: customer-prod-secret`, want: false},
-		{name: "comment middle fixture marker", text: `API_KEY=prod-fake-key`, comment: true, want: false},
-		{name: "comment negated fixture marker", text: `AppSecret: "not-fake-secret"`, comment: true, want: false},
-		{name: "source with credential words", path: "pkg/config.go", text: `secretWithPassword := "hunter2"`, want: false},
-		{name: "production filename containing sample", path: "pkg/sampler.go", text: `clientSecret := "customer-prod-secret"`, want: false},
-		{name: "provider token under weak key", path: "docs/config.yaml", text: `token: ` + providerToken, want: true},
-		{name: "provider token under hash key", path: "docs/config.yaml", text: `access_token_hash: ` + providerToken, want: true},
-		{name: "high entropy strong secret", path: "docs/config.yaml", text: `client_secret: ` + highEntropyValue, want: true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var got []Finding
-			if tt.comment {
-				got = ScanComment("issue_comment", tt.text)
-			} else {
-				got = ScanFile(tt.path, []byte(tt.text+"\n"))
-			}
-			if actual := findingRules(got)["public_content_generic_credential"]; actual != tt.want {
-				t.Fatalf("generic credential finding = %v, want %v: %#v", actual, tt.want, got)
-			}
-		})
-	}
-}
-
-func TestScanFileClassifiesLowEvidenceTestFixtureCredentials(t *testing.T) {
-	providerToken := "ghp_" + "1234567890abcdef1234567890abcdef1234"
-	highEntropyValue := "Q7k2mN9pR4vX8cL3" + "sT6yU1aD5fG0hJ2z"
-	tests := []struct {
-		name  string
-		value string
-		want  bool
-	}{
-		{name: "human readable access token", value: "user-access-token", want: false},
-		{name: "delimited secret value", value: "secret-value", want: false},
-		{name: "underscored secret fixture", value: "plain_secret", want: false},
-		{name: "short delimited fixture", value: "t-abc", want: false},
-		{name: "embedded test marker", value: "perm-grant-test-secret-skip", want: false},
-		{name: "real labeled fixture", value: "real-token", want: false},
-		{name: "ambiguous concrete word", value: "supersecret", want: false},
-		{name: "provider token", value: providerToken, want: true},
-		{name: "high entropy secret", value: highEntropyValue, want: true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := ScanFile("pkg/config_test.go", []byte(`AppSecret: "`+tt.value+`"`+"\n"))
-			if actual := findingRules(got)["public_content_generic_credential"]; actual != tt.want {
-				t.Fatalf("generic credential finding = %v, want %v: %#v", actual, tt.want, got)
-			}
-		})
-	}
-}
-
-func TestScanFileAllowsLowEvidenceTestFixtureAssignmentSyntaxes(t *testing.T) {
-	got := ScanFile("pkg/config_test.go", []byte(strings.Join([]string{
-		`secret := "secret-value"`,
-		`samplePassword := "sample-password"`,
-		`bodyWithToken := "plain text body\\nDownload: https://example.com/file?token=tok_aaa\\n"`,
-	}, "\n")+"\n"))
-	for _, item := range got {
-		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("low-evidence test fixture assignment should not be reported: %#v", got)
-		}
+	if count != 6 {
+		t.Fatalf("source code credential-shaped literal findings = %d, want 6: %#v", count, got)
 	}
 }

@@ -1382,10 +1116,9 @@ func TestScanFileAllowsClientTokenIdempotencyExamples(t *testing.T) {

 func TestScanFileDetectsCredentialShapedClientTokenValues(t *testing.T) {
 	stripeLike := "sk_" + "live_1234567890abcdef"
-	githubToken := "ghp_" + "1234567890abcdef1234567890abcdef1234"
 	got := ScanFile("fixtures/idempotency.md", []byte(strings.Join([]string{
 		`{"client_token":"` + stripeLike + `"}`,
-		`{"client_token":"` + githubToken + `"}`,
+		`{"client_token":"real-client-secret-value"}`,
 	}, "\n")+"\n"))
 	var count int
 	for _, item := range got {
@@ -1419,10 +1152,9 @@ func TestScanFileAllowsTokenLikePlaceholderExamples(t *testing.T) {

 func TestScanFileDetectsCredentialShapedTokenLikePlaceholderValues(t *testing.T) {
 	stripeLike := "sk_" + "live_1234567890abcdef"
-	githubToken := "ghp_" + "1234567890abcdef1234567890abcdef1234"
 	got := ScanFile("fixtures/placeholders.md", []byte(strings.Join([]string{
 		`{ "resource_token": "` + stripeLike + `" }`,
-		`{ "block_token": "` + githubToken + `" }`,
+		`{ "block_token": "real-client-secret-value" }`,
 	}, "\n")+"\n"))
 	var count int
 	for _, item := range got {
@@ -1636,43 +1368,39 @@ func TestScanFileAllowsConventionalCredentialPlaceholders(t *testing.T) {
 	}
 }

-func TestScanFileAllowsInvalidProviderPlaceholderLookalikes(t *testing.T) {
+func TestScanFileDetectsCredentialShapedPlaceholderLookalikes(t *testing.T) {
 	stripeLike := "sk_" + "live_1234567890abcdef"
 	got := ScanFile("docs/config.md", []byte(strings.Join([]string{
 		"client_secret: " + stripeLike + "_HERE",
 		"api_key: YOUR_" + stripeLike,
 	}, "\n")+"\n"))
+	var count int
 	for _, item := range got {
 		if item.Rule == "public_content_generic_credential" {
-			t.Fatalf("invalid provider placeholder lookalike should not be blocked: %#v", got)
+			count++
 		}
 	}
+	if count != 2 {
+		t.Fatalf("credential-shaped placeholder lookalike findings = %d, want 2: %#v", count, got)
+	}
 }

 func TestScanFileDetectsPercentWrappedCredentialValues(t *testing.T) {
 	stripeLike := "sk_" + "live_1234567890abcdef"
 	patLike := "gh" + "p_1234567890abcdef1234567890abcdef1234"
-	cases := []struct {
-		name string
-		text string
-		want bool
-	}{
-		{name: "stripe", text: "CLIENT_SECRET=%" + stripeLike + "%", want: true},
-		{name: "github", text: "GITHUB_TOKEN=%" + patLike + "%", want: true},
-		{name: "readable", text: "TOKEN=%real-secret-token-value%", want: false},
+	got := ScanFile("docs/config.md", []byte(strings.Join([]string{
+		"CLIENT_SECRET=%" + stripeLike + "%",
+		"GITHUB_TOKEN=%" + patLike + "%",
+		"TOKEN=%real-secret-token-value%",
+	}, "\n")+"\n"))
+	var count int
+	for _, item := range got {
+		if item.Rule == "public_content_generic_credential" {
+			count++
+		}
 	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			assertGenericCredentialFinding(t, "docs/config.md", tc.text, tc.want)
-		})
-	}
-}
-
-func assertGenericCredentialFinding(t *testing.T, file, text string, want bool) {
-	t.Helper()
-	got := ScanFile(file, []byte(text+"\n"))
-	if actual := findingRules(got)["public_content_generic_credential"]; actual != want {
-		t.Fatalf("generic credential finding = %v, want %v: %#v", actual, want, got)
+	if count != 3 {
+		t.Fatalf("percent-wrapped credential findings = %d, want 3: %#v", count, got)
 	}
 }

--- a/internal/qualitygate/rules/dryrun.go
+++ b/internal/qualitygate/rules/dryrun.go
@@ -337,7 +337,7 @@ func fakeValueFromPlaceholderName(name string) (string, bool) {
 	case name == "open_id" || hasPlaceholderToken(tokens, "user", "owner", "participant", "approver", "speaker"):
 		return "ou_test123", true
 	case hasPlaceholderToken(tokens, "department", "dept"):
-		return "od-test123", true
+		return "od_test123", true
 	case hasPlaceholderToken(tokens, "message"):
 		return "om_test123", true
 	case name == "file_key":
@@ -878,23 +878,16 @@ func extractDryRunJSON(raw []byte) (facts.DryRunRequest, int, error) {
 	var firstErr error
 	for start >= 0 {
 		var preview struct {
-			API  []facts.DryRunRequest `json:"api"`
-			Data struct {
-				API []facts.DryRunRequest `json:"api"`
-			} `json:"data"`
+			API []facts.DryRunRequest `json:"api"`
 		}
 		dec := json.NewDecoder(bytes.NewReader(raw[start:]))
 		if err := dec.Decode(&preview); err == nil {
-			api := preview.API
-			if len(api) == 0 {
-				api = preview.Data.API
-			}
-			if len(api) == 0 {
+			if len(preview.API) == 0 {
 				if firstErr == nil {
 					firstErr = errNoDryRunAPI
 				}
 			} else {
-				return api[0], len(api), nil
+				return preview.API[0], len(preview.API), nil
 			}
 		} else if firstErr == nil {
 			firstErr = err
--- a/internal/qualitygate/rules/dryrun_test.go
+++ b/internal/qualitygate/rules/dryrun_test.go
@@ -33,17 +33,6 @@ func TestExtractDryRunJSONSkipsBanner(t *testing.T) {
 	}
 }

-func TestExtractDryRunJSONReadsSuccessEnvelope(t *testing.T) {
-	raw := `{"ok":true,"dry_run":true,"data":{"api":[{"method":"GET","url":"/open-apis/test"}]}}`
-	got, apiCallCount, err := extractDryRunJSON([]byte(raw))
-	if err != nil {
-		t.Fatalf("extractDryRunJSON() error = %v", err)
-	}
-	if got.Method != "GET" || got.URL != "/open-apis/test" || apiCallCount != 1 {
-		t.Fatalf("got request=%#v apiCallCount=%d, want enveloped GET and count 1", got, apiCallCount)
-	}
-}
-
 func TestExtractDryRunJSONSkipsBannerWithBraces(t *testing.T) {
 	raw := "banner {not json}\n{\"api\":[{\"method\":\"GET\",\"url\":\"/open-apis/test\"}]}\n"
 	got, apiCallCount, err := extractDryRunJSON([]byte(raw))
@@ -316,13 +305,6 @@ func TestRunDryRunsMaterializesInlinePlaceholderFlagValues(t *testing.T) {
 	}
 }

-func TestFakeValueFromPlaceholderNameUsesOpenDepartmentPrefix(t *testing.T) {
-	got, ok := fakeValueFromPlaceholderName("open_department_id")
-	if !ok || got != "od-test123" {
-		t.Fatalf("open_department_id placeholder = %q, %v; want od-test123, true", got, ok)
-	}
-}
-
 func TestRunDryRunsMaterializesNumericPlaceholderFlagValues(t *testing.T) {
 	cliBin, argsPath := fakeDryRunCLI(t, `{"api":[{"method":"GET","url":"/open-apis/vc/v1/bots/events","params":{"meeting_id":"400000000001","page_size":50}}]}`)
 	m := manifest.Manifest{Commands: []manifest.Command{{
--- a/internal/qualitygate/rules/run_test.go
+++ b/internal/qualitygate/rules/run_test.go
@@ -203,8 +203,7 @@ func TestRunCollectsPublicContentFindingsIntoDiagnosticsAndFacts(t *testing.T) {
 	if err := vfs.MkdirAll(filepath.Join(repo, "docs"), 0o755); err != nil {
 		t.Fatal(err)
 	}
-	providerValue := "ghp_" + "1234567890abcdef1234567890abcdef1234"
-	publicDoc := "api_" + "key = \"" + providerValue + "\"\n" +
+	publicDoc := "api_" + "key = \"example-public-key\"\n" +
 		"Public docs describe a pri" + "vate request header and trust classification detail.\n"
 	if err := vfs.WriteFile(filepath.Join(repo, "docs", "public.md"), []byte(publicDoc), 0o644); err != nil {
 		t.Fatal(err)
--- a/internal/registry/loader.go
+++ b/internal/registry/loader.go
@@ -69,12 +69,6 @@ func Init() {
 	InitWithBrand(core.BrandFeishu)
 }

-// ConfiguredBrand reports the brand the registry was initialized with
-// (empty before initialization). Diagnostics and startup-order tests use it.
-func ConfiguredBrand() core.LarkBrand {
-	return configuredBrand
-}
-
 // InitWithBrand initializes the registry by loading embedded data and optionally
 // overlaying cached remote data. The brand determines which remote API host to use.
 // It is safe to call multiple times (sync.Once).
--- a/internal/registry/registry_test.go
+++ b/internal/registry/registry_test.go
@@ -248,18 +248,10 @@ func TestLoadPlatformAutoApproveSet(t *testing.T) {

 func TestLoadOverrideAutoApproveAllow(t *testing.T) {
 	allowSet := LoadOverrideAutoApproveAllow()
-	// recommend.allow special-cases scopes absent from scope_priorities.json
-	// (application v7 is not in the platform catalog yet) so interactive
-	// login's "common scopes" tier still offers them. Only the read scope is
-	// admitted: write stays out of the recommended tier by design.
-	if !allowSet["application:app_slash_command:read"] {
-		t.Error("expected application:app_slash_command:read in override allow set")
-	}
-	if allowSet["application:app_slash_command:write"] {
-		t.Error("write scope must NOT be in the recommended tier")
-	}
-	if len(allowSet) != 1 {
-		t.Errorf("expected exactly 1 override allow entry, got %d", len(allowSet))
+	// recommend.allow in scope_overrides.json is intentionally empty:
+	// no scopes are special-cased into the auto-approve set anymore.
+	if len(allowSet) != 0 {
+		t.Errorf("expected empty override allow set, got %d entries", len(allowSet))
 	}
 }

--- a/internal/registry/remote.go
+++ b/internal/registry/remote.go
@@ -75,7 +75,13 @@ func remoteMetaURL(version string) string {
 	if testMetaURL != "" {
 		return testMetaURL
 	}
-	base := core.ResolveEndpoints(configuredBrand).Open + "/api/tools/open/api_definition"
+	var base string
+	switch configuredBrand {
+	case core.BrandLark:
+		base = "https://open.larksuite.com/api/tools/open/api_definition"
+	default:
+		base = "https://open.feishu.cn/api/tools/open/api_definition"
+	}
 	q := "protocol=meta&client_version=" + url.QueryEscape(build.Version)
 	if version != "" {
 		q += "&data_version=" + url.QueryEscape(version)
--- a/internal/registry/scope_overrides.json
+++ b/internal/registry/scope_overrides.json
@@ -12,9 +12,7 @@
    "vc:meeting.meetingevent:read": 75
  },
  "recommend": {
-    "allow": [
-      "application:app_slash_command:read"
-    ],
+    "allow": [],
    "deny": [
      "im:chat",
      "im:message.send_as_user"
--- a/internal/registry/service_descriptions.json
+++ b/internal/registry/service_descriptions.json
@@ -3,10 +3,6 @@
    "en": { "title": "Approval", "description": "Approval instance, and task management" },
    "zh": { "title": "审批", "description": "审批实例、审批任务管理" }
  },
-  "application": {
-    "en": { "title": "Application", "description": "Open Platform app self-management: slash commands for the currently bound app" },
-    "zh": { "title": "应用管理", "description": "开放平台应用自管理：当前绑定应用的斜杠指令管理" }
-  },
  "apps": {
    "en": { "title": "Apps", "description": "Develop, deploy HTML, web pages and applications" },
    "zh": { "title": "应用", "description": "开发、部署 HTML、Web 页面和应用" }
--- a/internal/selfupdate/updater.go
+++ b/internal/selfupdate/updater.go
@@ -16,7 +16,6 @@ import (
 	"strings"
 	"time"

-	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/transport"
 	"github.com/larksuite/cli/internal/vfs"
 )
@@ -50,9 +49,7 @@ const (

 var (
 	skillsIndexFetchTimeout = 10 * time.Second
-	// officialSkillsIndexURL overrides the brand-derived skills index URL in
-	// tests; empty in production.
-	officialSkillsIndexURL = ""
+	officialSkillsIndexURL  = "https://open.feishu.cn/.well-known/skills/index.json"
 )

 // DetectResult holds installation detection results.
@@ -104,9 +101,6 @@ func (r *NpmResult) CombinedOutput() string {
 // Override DetectOverride / NpmInstallOverride / SkillsCommandOverride / VerifyOverride
 // / RestoreAvailableOverride for testing.
 type Updater struct {
-	// Brand selects the skills index/source endpoints (zero value = feishu).
-	Brand core.LarkBrand
-
 	DetectOverride           func() DetectResult
 	NpmInstallOverride       func(version string) *NpmResult
 	PnpmInstallOverride      func(version string) *NpmResult
@@ -135,19 +129,6 @@ type Updater struct {
 // New creates an Updater with default (real) behavior.
 func New() *Updater { return &Updater{} }

-// skillsIndexURL returns the brand's well-known skills index URL.
-func (u *Updater) skillsIndexURL() string {
-	if officialSkillsIndexURL != "" {
-		return officialSkillsIndexURL
-	}
-	return core.ResolveEndpoints(u.Brand).Open + "/.well-known/skills/index.json"
-}
-
-// skillsSource returns the brand's skills source host for `npx skills add`.
-func (u *Updater) skillsSource() string {
-	return core.ResolveEndpoints(u.Brand).Open
-}
-
 // DetectInstallMethod determines how the CLI was installed and whether the
 // owning package manager is available for auto-update.
 func (u *Updater) DetectInstallMethod() DetectResult {
@@ -277,7 +258,7 @@ func (u *Updater) ListOfficialSkillsIndex() *NpmResult {
 	ctx, cancel := context.WithTimeout(context.Background(), skillsIndexFetchTimeout)
 	defer cancel()

-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.skillsIndexURL(), nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, officialSkillsIndexURL, nil)
 	if err != nil {
 		r.Err = err
 		return r
@@ -316,7 +297,7 @@ func (u *Updater) ListOfficialSkillsIndex() *NpmResult {
 }

 func (u *Updater) ListOfficialSkills() *NpmResult {
-	r := u.runSkillsListOfficial(u.skillsSource())
+	r := u.runSkillsListOfficial("https://open.feishu.cn")
 	if r.Err != nil {
 		r = u.runSkillsListOfficial("larksuite/cli")
 	}
@@ -332,7 +313,7 @@ func (u *Updater) ListGlobalSkillsJSON() *NpmResult {
 }

 func (u *Updater) InstallSkill(nameList []string) *NpmResult {
-	r := u.runSkillsInstall(u.skillsSource(), nameList)
+	r := u.runSkillsInstall("https://open.feishu.cn", nameList)
 	if r.Err != nil {
 		r = u.runSkillsInstall("larksuite/cli", nameList)
 	}
@@ -340,7 +321,7 @@ func (u *Updater) InstallSkill(nameList []string) *NpmResult {
 }

 func (u *Updater) InstallAllSkills() *NpmResult {
-	r := u.runSkillsAdd(u.skillsSource())
+	r := u.runSkillsAdd("https://open.feishu.cn")
 	if r.Err != nil {
 		r = u.runSkillsAdd("larksuite/cli")
 	}
--- a/internal/selfupdate/updater_test.go
+++ b/internal/selfupdate/updater_test.go
@@ -17,7 +17,6 @@ import (
 	"testing"
 	"time"

-	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/vfs"
 )

@@ -516,23 +515,3 @@ func TestDetectInstallMethod_Caches(t *testing.T) {
 		t.Errorf("expected cached pnpm result to be returned, got %+v", got)
 	}
 }
-
-func TestSkillsBrandHosts(t *testing.T) {
-	cases := []struct {
-		brand      core.LarkBrand
-		wantIndex  string
-		wantSource string
-	}{
-		{core.BrandFeishu, "https://open.feishu.cn/.well-known/skills/index.json", "https://open.feishu.cn"},
-		{core.BrandLark, "https://open.larksuite.com/.well-known/skills/index.json", "https://open.larksuite.com"},
-	}
-	for _, c := range cases {
-		u := &Updater{Brand: c.brand}
-		if got := u.skillsIndexURL(); got != c.wantIndex {
-			t.Errorf("brand %q: skillsIndexURL = %q, want %q", c.brand, got, c.wantIndex)
-		}
-		if got := u.skillsSource(); got != c.wantSource {
-			t.Errorf("brand %q: skillsSource = %q, want %q", c.brand, got, c.wantSource)
-		}
-	}
-}
--- a/internal/vfs/localfileio/path.go
+++ b/internal/vfs/localfileio/path.go
@@ -65,7 +65,7 @@ func safePath(raw, flagName string) (string, error) {
 	}

 	if isAbsolutePath(raw) {
-		return "", fmt.Errorf("%s must be a relative path within the current directory, got %q (hint: use a relative path like ./filename; flags that support stdin can read an out-of-tree file via '-' instead)", flagName, raw)
+		return "", fmt.Errorf("%s must be a relative path within the current directory, got %q (hint: cd to the target directory first, or use a relative path like ./filename)", flagName, raw)
 	}

 	path := filepath.Clean(raw)
--- a/lint/README.md
+++ b/lint/README.md
@@ -30,42 +30,8 @@ lint/
    ├── rule_subtype_classifier.go
    ├── rule_typed_error_completeness.go
    └── *_test.go
-└── domaincontract/     # endpoint domain contract: no hardcoded resolver hosts
-    ├── scan.go         # ScanRepo(root) ([]lintapi.Violation, error)  ← public entry
-    └── scan_test.go
 ```

-## Endpoint domain contract (`domaincontract`)
-
-`domaincontract` is a syntax-level regression guard for the resolver-owned
-Open, Accounts, MCP, and AppLink hosts used by the Go CLI. In production `.go`
-files it rejects:
-
- string literals containing a resolver-owned host FQDN
-  (`{open,accounts,mcp,applink}.{feishu.cn,larksuite.com}`), and
- direct references to the SDK base-URL globals (`FeishuBaseUrl` / `LarkBaseUrl`)
-  selected off an import of the SDK root package, which pick a host without
-  going through the resolver. Unrelated identifiers sharing the name are not
-  flagged.
-
-Host literals are permitted only inside the resolver's `ResolveEndpoints`
-function body (`internal/core/types.go`) and in this rule's own host list
-(`lint/domaincontract/scan.go`); a helper elsewhere in the resolver file
-returning a hardcoded host is still rejected. Comments and `_test.go` files
-are not scanned. Literals are unquoted before matching (escape sequences
-cannot hide a host) and match case-insensitively, and dot-imports of the SDK
-root package are rejected outright (they would hide the globals from this
-parse-level guard). The forbidden-host list is bound to the resolver source by
-`TestForbiddenHostsMatchResolver`, so adding a resolver domain without updating
-the guard fails the lint module's tests.
-
-This is not a general outbound-URL or data-flow analyzer. It does not inspect
-non-Go assets, hosts assembled from string fragments, SDK constructor option
-flow, or previously unknown Feishu/Lark hosts. The literal rule and code review
-remain the backstop for those cases.
-
-To add or change an outbound endpoint, edit the resolver — never hardcode a host.
-
 ## Running

 ```bash
@@ -76,7 +42,7 @@ go run -C lint . ..
 `-C lint` switches Go's working directory to `lint/`; the `..` argument
 is the repo root to scan (relative to `lint/`).

-CI: `.github/workflows/ci.yml` step `Run source-contract lint guards (lintcheck)`.
+CI: `.github/workflows/ci.yml` step `Run errs/ lint guards (lintcheck)`.

 Exit codes follow `lint/main.go`:

--- a/lint/domaincontract/enforce_test.go
+++ b/lint/domaincontract/enforce_test.go
@@ -1,45 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package domaincontract
-
-import (
-	"errors"
-	"os"
-	"os/exec"
-	"strings"
-	"testing"
-)
-
-// TestLintcheckExitCode proves the guard gates CI end to end: a violating
-// fixture must make the lintcheck binary exit 1, and a clean tree exit 0.
-func TestLintcheckExitCode(t *testing.T) {
-	if testing.Short() {
-		t.Skip("compiles the lintcheck binary")
-	}
-	dirty := t.TempDir()
-	writeFile(t, dirty, "internal/x/x.go", "package x\n\nvar h = \"https://open.feishu.cn\"\n")
-
-	run := func(dir string) (string, error) {
-		cmd := exec.Command("go", "run", "..", dir)
-		cmd.Dir = "." // lint/domaincontract — `..` is the lintcheck main package
-		cmd.Env = os.Environ()
-		out, err := cmd.CombinedOutput()
-		return string(out), err
-	}
-
-	out, err := run(dirty)
-	if err == nil || !strings.Contains(out, "no-hardcoded-endpoint") {
-		t.Fatalf("violating fixture: err=%v out=%s (want exit 1 with a no-hardcoded-endpoint REJECT)", err, out)
-	}
-	var exitErr *exec.ExitError
-	if !errors.As(err, &exitErr) || exitErr.ExitCode() != 1 {
-		t.Fatalf("violating fixture exit = %v, want 1", err)
-	}
-
-	clean := t.TempDir()
-	writeFile(t, clean, "internal/x/x.go", "package x\n\nvar ok = 1\n")
-	if out, err := run(clean); err != nil {
-		t.Fatalf("clean fixture: err=%v out=%s (want exit 0)", err, out)
-	}
-}
--- a/lint/domaincontract/scan.go
+++ b/lint/domaincontract/scan.go
@@ -1,190 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-// Package domaincontract guards the Go CLI against direct reuse of the current
-// resolver-owned host FQDNs outside core.ResolveEndpoints.
-package domaincontract
-
-import (
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"io/fs"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/larksuite/cli/lint/lintapi"
-)
-
-// forbiddenHosts are the resolver-owned FQDNs. They may only appear as string
-// literals in the allowlisted resolver source.
-var forbiddenHosts = []string{
-	"open.feishu.cn", "accounts.feishu.cn", "mcp.feishu.cn", "applink.feishu.cn",
-	"open.larksuite.com", "accounts.larksuite.com", "mcp.larksuite.com", "applink.larksuite.com",
-}
-
-// forbiddenIdents are the SDK root package's base-URL globals; referencing
-// them picks a host without the resolver. Matched as selectors on an SDK root
-// import, so unrelated same-name identifiers are not flagged.
-var forbiddenIdents = map[string]bool{
-	"FeishuBaseUrl": true,
-	"LarkBaseUrl":   true,
-}
-
-// sdkModulePrefix identifies imports of the Lark OAPI SDK.
-const sdkModulePrefix = "github.com/larksuite/oapi-sdk-go/"
-
-// sdkImportAliases returns the file's local names for the SDK root package
-// (subpackages do not export the base-URL globals).
-func sdkImportAliases(file *ast.File) map[string]bool {
-	aliases := map[string]bool{}
-	for _, imp := range file.Imports {
-		path, err := strconv.Unquote(imp.Path.Value)
-		if err != nil || !strings.HasPrefix(path, sdkModulePrefix) {
-			continue
-		}
-		if strings.Contains(strings.TrimPrefix(path, sdkModulePrefix), "/") {
-			continue // subpackage, not the root
-		}
-		name := "lark" // the SDK root package's package name
-		if imp.Name != nil {
-			name = imp.Name.Name
-		}
-		aliases[name] = true
-	}
-	return aliases
-}
-
-// allowlist holds the only file allowed to carry the literals wholesale:
-// this rule's own host list. The resolver file is scoped per-function instead
-// (see resolverPath).
-var allowlist = map[string]bool{
-	filepath.FromSlash("lint/domaincontract/scan.go"): true,
-}
-
-// resolverPath is the resolver source; host literals are permitted only
-// inside its ResolveEndpoints function body.
-var resolverPath = filepath.FromSlash("internal/core/types.go")
-
-func skipDir(name string) bool {
-	switch name {
-	case "vendor", "testdata", "node_modules", ".git", ".claude":
-		return true
-	}
-	return false
-}
-
-// ScanRepo walks production .go files under root and flags string literals
-// containing a forbidden resolver host outside the allowlist. Comments and
-// _test.go files are not scanned.
-func ScanRepo(root string) ([]lintapi.Violation, error) {
-	var out []lintapi.Violation
-	err := filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-		if d.IsDir() {
-			if skipDir(d.Name()) {
-				return filepath.SkipDir
-			}
-			return nil
-		}
-		if !strings.HasSuffix(path, ".go") || strings.HasSuffix(path, "_test.go") {
-			return nil
-		}
-		rel, relErr := filepath.Rel(root, path)
-		if relErr == nil && allowlist[rel] {
-			return nil
-		}
-		fset := token.NewFileSet()
-		file, perr := parser.ParseFile(fset, path, nil, 0)
-		if perr != nil {
-			return nil // unparseable file: not our concern
-		}
-		display := path
-		if relErr == nil {
-			display = rel
-		}
-		var allowedFrom, allowedTo token.Pos
-		if relErr == nil && rel == resolverPath {
-			for _, d := range file.Decls {
-				if fd, ok := d.(*ast.FuncDecl); ok && fd.Recv == nil && fd.Name.Name == "ResolveEndpoints" && fd.Body != nil {
-					allowedFrom, allowedTo = fd.Body.Pos(), fd.Body.End()
-					break
-				}
-			}
-		}
-		inResolverBody := func(p token.Pos) bool {
-			return allowedFrom != token.NoPos && p >= allowedFrom && p <= allowedTo
-		}
-		// Dot-imports of the SDK root would hide its globals from this
-		// parse-level guard, so the import form itself is rejected.
-		for _, imp := range file.Imports {
-			path, uerr := strconv.Unquote(imp.Path.Value)
-			if uerr != nil || imp.Name == nil || imp.Name.Name != "." {
-				continue
-			}
-			if strings.HasPrefix(path, sdkModulePrefix) &&
-				!strings.Contains(strings.TrimPrefix(path, sdkModulePrefix), "/") {
-				pos := fset.Position(imp.Pos())
-				out = append(out, lintapi.Violation{
-					Rule:       "no-hardcoded-endpoint",
-					Action:     lintapi.ActionReject,
-					File:       display,
-					Line:       pos.Line,
-					Message:    "dot-import of the SDK root package defeats the endpoint guard",
-					Suggestion: "import the SDK with a package name",
-				})
-			}
-		}
-		sdkAliases := sdkImportAliases(file)
-		ast.Inspect(file, func(n ast.Node) bool {
-			switch node := n.(type) {
-			case *ast.SelectorExpr:
-				pkg, ok := node.X.(*ast.Ident)
-				if ok && pkg.Obj == nil && forbiddenIdents[node.Sel.Name] && sdkAliases[pkg.Name] {
-					pos := fset.Position(node.Pos())
-					out = append(out, lintapi.Violation{
-						Rule:       "no-hardcoded-endpoint",
-						Action:     lintapi.ActionReject,
-						File:       display,
-						Line:       pos.Line,
-						Message:    "SDK base-URL global " + pkg.Name + "." + node.Sel.Name + " bypasses the resolver — use core.ResolveEndpoints",
-						Suggestion: "derive the host from core.ResolveEndpoints(brand) instead of the SDK global",
-					})
-				}
-			case *ast.BasicLit:
-				if node.Kind != token.STRING {
-					return true
-				}
-				if inResolverBody(node.Pos()) {
-					return true
-				}
-				// Unquote and lowercase so escapes or casing cannot hide a host.
-				value := node.Value
-				if v, err := strconv.Unquote(value); err == nil {
-					value = v
-				}
-				lower := strings.ToLower(value)
-				for _, host := range forbiddenHosts {
-					if strings.Contains(lower, host) {
-						pos := fset.Position(node.Pos())
-						out = append(out, lintapi.Violation{
-							Rule:       "no-hardcoded-endpoint",
-							Action:     lintapi.ActionReject,
-							File:       display,
-							Line:       pos.Line,
-							Message:    "hardcoded resolver host " + host + " — outbound domains must come from core.ResolveEndpoints",
-							Suggestion: "use core.ResolveEndpoints(brand) instead of a literal host",
-						})
-						return true
-					}
-				}
-			}
-			return true
-		})
-		return nil
-	})
-	return out, err
-}
--- a/lint/domaincontract/scan_test.go
+++ b/lint/domaincontract/scan_test.go
@@ -1,231 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package domaincontract
-
-import (
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/lint/lintapi"
-)
-
-// requireEnforced pins every violation to the rejecting rule: a regression
-// that downgrades the guard to an advisory action must fail here.
-func requireEnforced(t *testing.T, vs []lintapi.Violation) {
-	t.Helper()
-	for _, v := range vs {
-		if v.Rule != "no-hardcoded-endpoint" || v.Action != lintapi.ActionReject {
-			t.Fatalf("violation not CI-enforced: rule=%q action=%q (%s:%d)", v.Rule, v.Action, v.File, v.Line)
-		}
-	}
-}
-
-func writeFile(t *testing.T, root, rel, content string) {
-	t.Helper()
-	p := filepath.Join(root, rel)
-	if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(p, []byte(content), 0o644); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestScanRepo(t *testing.T) {
-	root := t.TempDir()
-	// Negative: the resolver may hold the literals inside ResolveEndpoints.
-	writeFile(t, root, "internal/core/types.go", "package core\n\nfunc ResolveEndpoints(b string) string {\n\treturn \"https://open.feishu.cn\"\n}\n")
-	// Negative: non-resolver hosts + a comment reference must not trip the guard.
-	writeFile(t, root, "shortcuts/x/display.go", "package x\n\n// see https://open.feishu.cn/document/foo\nvar h = \"https://www.feishu.cn\"\nvar e = \"https://example.feishu.cn\"\nvar r = \"https://registry.npmjs.org/pkg\"\n")
-	// Negative: _test.go files may assert literals.
-	writeFile(t, root, "internal/y/y_test.go", "package y\n\nvar w = \"https://open.larksuite.com\"\n")
-	// Positive: production literal outside the allowlist.
-	writeFile(t, root, "internal/z/z.go", "package z\n\nvar bad = \"https://accounts.larksuite.com/oauth\"\n")
-
-	vs, err := ScanRepo(root)
-	if err != nil {
-		t.Fatal(err)
-	}
-	requireEnforced(t, vs)
-	if len(vs) != 1 {
-		t.Fatalf("got %d violations, want 1: %+v", len(vs), vs)
-	}
-	if filepath.Base(vs[0].File) != "z.go" {
-		t.Errorf("violation in %q, want z.go", vs[0].File)
-	}
-}
-
-// SDK base-URL globals are rejected only when selected off an SDK root
-// import; same-name identifiers elsewhere pass.
-func TestScanRepoSDKConstants(t *testing.T) {
-	root := t.TempDir()
-	// Positive: default and renamed imports of the SDK root package.
-	writeFile(t, root, "shortcuts/x/ws.go",
-		"package x\n\nimport \"github.com/larksuite/oapi-sdk-go/v3\"\n\nvar d = lark.FeishuBaseUrl\n")
-	writeFile(t, root, "shortcuts/x/ws2.go",
-		"package x\n\nimport sdk \"github.com/larksuite/oapi-sdk-go/v3\"\n\nvar e = sdk.LarkBaseUrl\n")
-	// Negative: test file may reference the globals.
-	writeFile(t, root, "shortcuts/x/ws_test.go",
-		"package x\n\nimport lark \"github.com/larksuite/oapi-sdk-go/v3\"\n\nvar p = lark.LarkBaseUrl\n")
-	// Negative: same-name local identifier without the SDK import.
-	writeFile(t, root, "shortcuts/y/local.go",
-		"package y\n\nvar FeishuBaseUrl = \"local\"\nvar q = FeishuBaseUrl\n")
-	// Negative: same-name symbol from an unrelated package.
-	writeFile(t, root, "shortcuts/z/other.go",
-		"package z\n\nimport other \"example.com/other\"\n\nvar r = other.FeishuBaseUrl\n")
-	// Negative: SDK subpackage import does not export the globals.
-	writeFile(t, root, "shortcuts/w/sub.go",
-		"package w\n\nimport larkws \"github.com/larksuite/oapi-sdk-go/v3/ws\"\n\nvar s = larkws.FeishuBaseUrl\n")
-	// Negative: a local value shadowing the SDK import alias is not the package.
-	writeFile(t, root, "shortcuts/v/shadow.go",
-		"package v\n\nimport lark \"github.com/larksuite/oapi-sdk-go/v3\"\n\ntype endpoint struct { FeishuBaseUrl string }\nvar _ *lark.Client\nfunc local() string { lark := endpoint{}; return lark.FeishuBaseUrl }\n")
-
-	vs, err := ScanRepo(root)
-	if err != nil {
-		t.Fatal(err)
-	}
-	requireEnforced(t, vs)
-	if len(vs) != 2 {
-		t.Fatalf("got %d violations, want 2: %+v", len(vs), vs)
-	}
-	files := map[string]bool{}
-	for _, v := range vs {
-		files[filepath.Base(v.File)] = true
-	}
-	if !files["ws.go"] || !files["ws2.go"] {
-		t.Errorf("violations in %v, want ws.go and ws2.go", files)
-	}
-}
-
-// forbiddenHosts must equal the https hosts in the resolver source, both ways;
-// a resolver domain change without a guard update fails here.
-func TestForbiddenHostsMatchResolver(t *testing.T) {
-	src := filepath.Join("..", "..", "internal", "core", "types.go")
-	fset := token.NewFileSet()
-	file, err := parser.ParseFile(fset, src, nil, 0)
-	if err != nil {
-		t.Fatalf("parse resolver source: %v", err)
-	}
-	// Walk only the receiverless ResolveEndpoints body — the same scope the
-	// production scanner exempts — so unrelated URLs in the file cannot skew
-	// the parity check.
-	var resolverBody ast.Node
-	for _, d := range file.Decls {
-		if fd, ok := d.(*ast.FuncDecl); ok && fd.Recv == nil && fd.Name.Name == "ResolveEndpoints" && fd.Body != nil {
-			resolverBody = fd.Body
-			break
-		}
-	}
-	if resolverBody == nil {
-		t.Fatal("ResolveEndpoints function not found in resolver source")
-	}
-	resolverHosts := map[string]bool{}
-	ast.Inspect(resolverBody, func(n ast.Node) bool {
-		lit, ok := n.(*ast.BasicLit)
-		if !ok || lit.Kind != token.STRING {
-			return true
-		}
-		v, err := strconv.Unquote(lit.Value)
-		if err != nil || !strings.HasPrefix(v, "https://") {
-			return true
-		}
-		// Parse instead of prefix-stripping so a resolver URL that ever gains a
-		// path component still compares by bare host against forbiddenHosts.
-		u, err := url.Parse(v)
-		if err != nil || u.Host == "" {
-			return true
-		}
-		resolverHosts[u.Host] = true
-		return true
-	})
-
-	guardHosts := map[string]bool{}
-	for _, h := range forbiddenHosts {
-		guardHosts[h] = true
-	}
-	for h := range resolverHosts {
-		if !guardHosts[h] {
-			t.Errorf("resolver host %q is not in the guard's forbidden list", h)
-		}
-	}
-	for h := range guardHosts {
-		if !resolverHosts[h] {
-			t.Errorf("guard forbids %q which the resolver does not define", h)
-		}
-	}
-}
-
-// Dot-import rejection and case-insensitive literal matching.
-func TestScanRepoDotImportAndCase(t *testing.T) {
-	root := t.TempDir()
-	// Positive: dot-import of the SDK root package.
-	writeFile(t, root, "shortcuts/a/dot.go",
-		"package a\n\nimport . \"github.com/larksuite/oapi-sdk-go/v3\"\n\nvar d = FeishuBaseUrl\n")
-	// Positive: uppercase host literal.
-	writeFile(t, root, "shortcuts/b/upper.go",
-		"package b\n\nvar u = \"https://OPEN.FEISHU.CN/api\"\n")
-	// Negative: dot-import of an SDK subpackage is out of the globals' scope.
-	writeFile(t, root, "shortcuts/c/sub.go",
-		"package c\n\nimport . \"github.com/larksuite/oapi-sdk-go/v3/ws\"\n\nvar s = 1\n")
-
-	vs, err := ScanRepo(root)
-	if err != nil {
-		t.Fatal(err)
-	}
-	requireEnforced(t, vs)
-	if len(vs) != 2 {
-		t.Fatalf("got %d violations, want 2: %+v", len(vs), vs)
-	}
-	files := map[string]bool{}
-	for _, v := range vs {
-		files[filepath.Base(v.File)] = true
-	}
-	if !files["dot.go"] || !files["upper.go"] {
-		t.Errorf("violations in %v, want dot.go and upper.go", files)
-	}
-}
-
-// The resolver file is scoped per-function: a hardcoded host outside the
-// ResolveEndpoints body is rejected.
-func TestScanRepoResolverFunctionScope(t *testing.T) {
-	root := t.TempDir()
-	writeFile(t, root, "internal/core/types.go",
-		"package core\n\nfunc ResolveEndpoints(b string) string {\n\treturn \"https://open.feishu.cn\"\n}\n\nfunc bypass() string { return \"https://open.feishu.cn\" }\n\ntype localResolver struct{}\nfunc (localResolver) ResolveEndpoints() string { return \"https://open.feishu.cn\" }\n")
-
-	vs, err := ScanRepo(root)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(vs) != 2 {
-		t.Fatalf("got %d violations, want 2 (helper and receiver method): %+v", len(vs), vs)
-	}
-	for _, v := range vs {
-		if filepath.Base(v.File) != "types.go" {
-			t.Errorf("violation in %q, want types.go", v.File)
-		}
-	}
-}
-
-// Escape sequences cannot hide a host: literals are unquoted before matching.
-func TestScanRepoEscapedLiteral(t *testing.T) {
-	root := t.TempDir()
-	writeFile(t, root, "internal/e/e.go",
-		"package e\n\nvar h = \"https://open.feishu\\u002ecn\"\n")
-
-	vs, err := ScanRepo(root)
-	if err != nil {
-		t.Fatal(err)
-	}
-	requireEnforced(t, vs)
-	if len(vs) != 1 {
-		t.Fatalf("got %d violations, want 1: %+v", len(vs), vs)
-	}
-}
--- a/lint/main.go
+++ b/lint/main.go
@@ -1,9 +1,10 @@
 // Copyright (c) 2026 Lark Technologies Pte. Ltd.
 // SPDX-License-Identifier: MIT

-// Command lintcheck runs repository source-contract guards that golangci-lint
-// cannot express directly. It currently covers typed-error contracts and the
-// resolver-owned endpoint contract.
+// Command lintcheck runs the source-level errs/ contract guards (all four checks).
+// The fifth contract rule (business path must use typed errors) lives in
+// .golangci.yml as a forbidigo entry; the four checks here are AST-level
+// guards that golangci-lint cannot express.
 //
 // lintcheck lives in its own Go module under lint/ so its build-time
 // dependency on golang.org/x/tools/go/packages does not leak into the
@@ -29,7 +30,6 @@ import (
 	"fmt"
 	"os"

-	"github.com/larksuite/cli/lint/domaincontract"
 	"github.com/larksuite/cli/lint/errscontract"
 	"github.com/larksuite/cli/lint/lintapi"
 )
@@ -43,9 +43,6 @@ type scanner struct {

 var scanners = []scanner{
 	{name: "errscontract", fn: errscontract.ScanRepoWithOptions},
-	{name: "domaincontract", fn: func(root string, _ errscontract.ScanOptions) ([]lintapi.Violation, error) {
-		return domaincontract.ScanRepo(root)
-	}},
 }

 func main() {
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@larksuite/cli",
-  "version": "1.0.73-beta.2",
+  "version": "1.0.11",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@larksuite/cli",
-      "version": "1.0.73-beta.2",
+      "version": "1.0.11",
      "cpu": [
        "x64",
        "arm64"
--- a/package.json
+++ b/package.json
@@ -1,13 +1,12 @@
 {
  "name": "@larksuite/cli",
-  "version": "1.0.73-beta.2",
+  "version": "1.0.66",
  "description": "The official CLI for Lark/Feishu open platform",
  "bin": {
    "lark-cli": "scripts/run.js"
  },
  "scripts": {
-    "postinstall": "node scripts/install.js",
-    "release:check": "node scripts/release-preflight.js"
+    "postinstall": "node scripts/install.js"
  },
  "os": [
    "darwin",
--- a/scripts/ci-workflow.test.sh
+++ b/scripts/ci-workflow.test.sh
@@ -18,11 +18,6 @@ workflow_permissions="$(awk '
  in_permissions && /^[^[:space:]]/ { exit }
  in_permissions { print }
 ' "$workflow")"
-workflow_concurrency="$(awk '
-  /^concurrency:/ { in_concurrency = 1; print; next }
-  in_concurrency && /^[^[:space:]]/ { exit }
-  in_concurrency { print }
-' "$workflow")"
 fast_gate_section="$(job_section fast-gate)"
 unit_test_section="$(job_section unit-test)"
 lint_section="$(awk '
@@ -51,27 +46,6 @@ results_section="$(awk '
  in_job { print }
 ' "$workflow")"
 fork_safe_guard="github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork"
-live_job_condition="always() && ($fork_safe_guard) && needs.unit-test.result == 'success' && needs.lint.result == 'success' && needs.script-test.result == 'success' && needs.deterministic-gate.result == 'success' && needs.e2e-dry-run.result == 'success' && (needs.e2e-dry-run.outputs.mode == 'full' || needs.e2e-dry-run.outputs.mode == 'subset') && needs.e2e-dry-run.outputs.live_packages != ''"
-
-if ! grep -Fq "run-name: \${{ github.event_name == 'pull_request' && format('CI / {0}', github.event.pull_request.number) || '' }}" "$workflow"; then
-  echo "CI should expose a stable PR generation while preserving default push and manual run titles" >&2
-  exit 1
-fi
-
-if ! grep -Fq "RUN_GENERATION: \${{ github.event_name == 'pull_request' && format('CI / {0}', github.event.pull_request.number) || '' }}" <<<"$section"; then
-  echo "the supersession generation should match the PR-only run name" >&2
-  exit 1
-fi
-
-if ! grep -Fq 'group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}' <<<"$workflow_concurrency"; then
-  echo "CI should deduplicate runs for the same pull request without grouping push or manual runs" >&2
-  exit 1
-fi
-
-if ! grep -Fq "cancel-in-progress: \${{ github.event_name == 'pull_request' }}" <<<"$workflow_concurrency"; then
-  echo "CI should cancel superseded pull request runs but preserve push and manual runs" >&2
-  exit 1
-fi

 for denied_permission in "checks: write" "pull-requests: write" "issues: write"; do
  if grep -Eq "^[[:space:]]*${denied_permission}$" <<<"$workflow_permissions"; then
@@ -236,84 +210,8 @@ if ! grep -Fq "deterministic-gate" <<<"$results_section"; then
  exit 1
 fi

-if ! grep -Fq "if: \${{ $live_job_condition }}" <<<"$section"; then
-  echo "e2e-live should preserve active cleanup while requiring a successful non-skip dry run and excluding fork pull requests"
-  exit 1
-fi
-
-if ! grep -Fq "needs: [unit-test, lint, script-test, deterministic-gate, e2e-dry-run]" <<<"$section"; then
-  echo "e2e-live should wait outside the exclusive queue until e2e-dry-run finishes"
-  exit 1
-fi
-
-if ! grep -Fq "timeout-minutes: 20" <<<"$dry_run_section"; then
-  echo "e2e-dry-run should bound the planning gate before live E2E" >&2
-  exit 1
-fi
-
-if ! grep -Fq "timeout-minutes: 30" <<<"$section"; then
-  echo "e2e-live should release the repository-wide slot after 30 minutes" >&2
-  exit 1
-fi
-
-if ! grep -Fq "group: lark-cli-e2e-live" <<<"$section"; then
-  echo "e2e-live should use one repository-wide execution slot" >&2
-  exit 1
-fi
-
-if ! grep -Fq "cancel-in-progress: false" <<<"$section"; then
-  echo "e2e-live should queue waiting runs instead of cancelling an active live test" >&2
-  exit 1
-fi
-
-if ! grep -Fq "queue: max" <<<"$section"; then
-  echo "e2e-live should preserve queued runs instead of replacing an existing pending run" >&2
-  exit 1
-fi
-
-if ! grep -Fq "actions: read" <<<"$section"; then
-  echo "e2e-live should use read-only Actions access for the supersession check" >&2
-  exit 1
-fi
-
-live_test_step="$(awk '
-  /^      - name: Run CLI E2E tests/ { in_step = 1 }
-  in_step { print }
-  in_step && /^      - name: Publish CLI E2E test report/ { exit }
-' <<<"$section")"
-
-if ! grep -Fq "if: \${{ always() && steps.build_cli.outcome == 'success' && steps.live_e2e_tat.outcome == 'success' }}" <<<"$live_test_step"; then
-  echo "the active live test step should survive ordinary workflow supersession only after setup succeeds" >&2
-  exit 1
-fi
-
-for required in \
-  'gh api "repos/$REPOSITORY/actions/runs/$RUN_ID"' \
-  'gh api --paginate -X GET "repos/$REPOSITORY/actions/workflows/$workflow_id/runs"' \
-  '-f event=pull_request -f branch="$GITHUB_HEAD_REF" -f per_page=100' \
-  '.head_repository.full_name == $repository and .display_title == $generation and .run_number > $run_number' \
-  '::error::Superseded before live E2E started' \
-  'exit 1'; do
-  if ! grep -Fq -- "$required" <<<"$live_test_step"; then
-    echo "the live startup check should fail closed before a superseded run starts live E2E: missing $required" >&2
-    exit 1
-  fi
-done
-
-if ! awk '
-  /if \[ -n "\$newer_runs" \]; then/ { superseded_state = 1; next }
-  superseded_state == 1 && /::error::Superseded before live E2E started/ { superseded_state = 2; next }
-  superseded_state == 2 && /^[[:space:]]+exit 1[[:space:]]*$/ { superseded_state = 3; next }
-  superseded_state > 0 && /^[[:space:]]+fi[[:space:]]*$/ {
-    if (superseded_state != 3) exit 2
-    superseded_closed = 1
-    superseded_state = 0
-    next
-  }
-  /go run gotest.tools\/gotestsum@/ { test_started = 1; if (!superseded_closed) exit 3 }
-  END { exit superseded_closed && test_started ? 0 : 1 }
-' <<<"$live_test_step"; then
-  echo "a superseded live run must stop before gotestsum starts" >&2
+if ! grep -Fq "if: \${{ $fork_safe_guard }}" <<<"$section"; then
+  echo "e2e-live should run on push and same-repository pull_request, but skip fork pull_request"
  exit 1
 fi

@@ -324,39 +222,6 @@ if ! grep -Fq "name: Resolve CLI E2E domains" <<<"$dry_run_section" ||
  exit 1
 fi

-for output in \
-  'mode: ${{ steps.e2e_domains.outputs.mode }}' \
-  'reason: ${{ steps.e2e_domains.outputs.reason }}' \
-  'live_packages: ${{ steps.e2e_domains.outputs.live_packages }}'; do
-  if ! grep -Fq "$output" <<<"$dry_run_section"; then
-    echo "e2e-dry-run should publish $output for the live job" >&2
-    exit 1
-  fi
-done
-
-for validation_contract in \
-  'case "$E2E_MODE" in' \
-  'skip)' \
-  '[ -z "$E2E_LIVE_PACKAGES" ]' \
-  'full|subset)' \
-  '[ -n "$E2E_LIVE_PACKAGES" ]' \
-  'Invalid CLI E2E mode' \
-  'exit 1'; do
-  if ! grep -Fq "$validation_contract" <<<"$dry_run_section"; then
-    echo "e2e-dry-run should fail invalid domain output before live can be skipped: missing $validation_contract" >&2
-    exit 1
-  fi
-done
-
-if ! awk '
-  /- name: Validate CLI E2E domain outputs/ { validated = 1 }
-  /- name: Build lark-cli/ { exit validated ? 0 : 1 }
-  END { if (!validated) exit 1 }
-' <<<"$dry_run_section"; then
-  echo "e2e-dry-run should validate domain outputs before building" >&2
-  exit 1
-fi
-
 if ! grep -Fq "steps.e2e_domains.outputs.dry_packages" <<<"$dry_run_section"; then
  echo "e2e-dry-run should use resolved dry_packages instead of always running the full suite"
  exit 1
@@ -379,21 +244,21 @@ if ! grep -Fq "No dry-run CLI E2E needed" <<<"$dry_run_section"; then
  exit 1
 fi

-if grep -Fq "name: Resolve CLI E2E domains" <<<"$section" ||
-   grep -Fq "run: node scripts/e2e_domains.js" <<<"$section"; then
-  echo "e2e-live should reuse e2e-dry-run outputs instead of resolving domains again"
+if ! grep -Fq "name: Resolve CLI E2E domains" <<<"$section" ||
+   ! grep -Fq "id: e2e_domains" <<<"$section" ||
+   ! grep -Fq "run: node scripts/e2e_domains.js" <<<"$section"; then
+  echo "e2e-live should resolve changed-file CLI E2E domains before credentials and tests"
  exit 1
 fi

-if ! grep -Fq "E2E_LIVE_PACKAGES: \${{ needs.e2e-dry-run.outputs.live_packages }}" <<<"$section"; then
-  echo "e2e-live should reuse live_packages resolved by e2e-dry-run"
+if ! grep -Fq "steps.e2e_domains.outputs.live_packages" <<<"$section"; then
+  echo "e2e-live should use resolved live_packages instead of always running the full suite"
  exit 1
 fi

-if ! grep -Fq "E2E_MODE: \${{ needs.e2e-dry-run.outputs.mode }}" <<<"$section" ||
-   ! grep -Fq "E2E_REASON: \${{ needs.e2e-dry-run.outputs.reason }}" <<<"$section" ||
+if ! grep -Fq "E2E_REASON: \${{ steps.e2e_domains.outputs.reason }}" <<<"$section" ||
   ! grep -Fq 'echo "Live CLI E2E domains: $E2E_MODE ($E2E_REASON)"' <<<"$section"; then
-  echo "e2e-live should consume the exact mode and reason produced by e2e-dry-run"
+  echo "e2e-live should pass dynamic domain output through env before shell use"
  exit 1
 fi

@@ -407,23 +272,16 @@ if ! awk '
  exit 1
 fi

-if grep -Fq "steps.e2e_domains.outputs" <<<"$section"; then
-  echo "e2e-live should not retain step-local domain outputs after adopting the dry-run job gate"
+if ! awk '
+  /^      - name: Build lark-cli/ { in_step = 1 }
+  in_step && /if: \$\{\{ steps\.e2e_domains\.outputs\.mode != '\''skip'\'' \}\}/ { found = 1 }
+  in_step && /^      - name:/ && !/Build lark-cli/ { in_step = 0 }
+  END { exit found ? 0 : 1 }
+' <<<"$section"; then
+  echo "e2e-live should skip building lark-cli when domain mode is skip"
  exit 1
 fi

-for step_name in "Build lark-cli" "Prepare shared live E2E tenant token"; do
-  live_setup_step="$(awk -v name="$step_name" '
-    $0 == "      - name: " name { in_step = 1 }
-    in_step { print }
-    in_step && /^      - name:/ && $0 != "      - name: " name { exit }
-  ' <<<"$section")"
-  if grep -Eq '^        if:' <<<"$live_setup_step"; then
-    echo "e2e-live $step_name should run unconditionally after the non-skip job gate" >&2
-    exit 1
-  fi
-done
-
 if ! grep -Fq "permissions:" <<<"$section" ||
   ! grep -Fq "contents: read" <<<"$section" ||
   ! grep -Fq "checks: write" <<<"$section"; then
@@ -441,88 +299,18 @@ if grep -Fq "live_e2e_credentials" <<<"$section" || grep -Fq "configured=false"
  exit 1
 fi

-if ! grep -Fq "node scripts/fetch_e2e_tat.js" <<<"$section"; then
-  echo "e2e-live should fetch the tenant token via the dedicated script"
-  exit 1
-fi
-
-if grep -Fq "config init" <<<"$section"; then
-  echo "e2e-live should use env credentials instead of config init"
-  exit 1
-fi
-
-if ! grep -Fq "TEST_BOT1_APP_ID: \${{ secrets.TEST_BOT1_APP_ID }}" <<<"$section"; then
-  echo "e2e-live should keep the bot app id under a test-only job env name"
-  exit 1
-fi
-
-if awk '
-  /^  e2e-live:/ { in_job = 1; next }
-  in_job && /^  [A-Za-z0-9_-]+:/ { in_job = 0 }
-  in_job && /^    env:/ { in_env = 1; next }
-  in_env && /^    steps:/ { in_env = 0 }
-  in_env && /LARKSUITE_CLI_APP_ID:/ { found_standard_app_id = 1 }
-  END { exit found_standard_app_id ? 0 : 1 }
-' "$workflow"; then
-  echo "e2e-live should not activate the env credential provider at job scope"
-  exit 1
-fi
-
-if ! grep -Fq "LARKSUITE_CLI_BRAND: feishu" <<<"$section"; then
-  echo "e2e-live should pin the env credential brand to feishu"
-  exit 1
-fi
-
-if awk '
-  /^  e2e-live:/ { in_job = 1; next }
-  in_job && /^  [A-Za-z0-9_-]+:/ { in_job = 0 }
-  in_job && /^    env:/ { in_env = 1; next }
-  in_env && /^    steps:/ { in_env = 0 }
-  in_env && /(SECRET|ACCESS_TOKEN):/ { found_sensitive = 1 }
-  END { exit found_sensitive ? 0 : 1 }
-' "$workflow"; then
-  echo "e2e-live should not expose live E2E credentials through job-level env"
+if ! grep -Fq "::error::Missing required secrets: TEST_BOT1_APP_ID / TEST_BOT1_APP_SECRET" <<<"$section"; then
+  echo "e2e-live should make missing bot credentials a visible configuration failure on eligible runs"
  exit 1
 fi

 if ! awk '
-  /^      - name: Prepare shared live E2E tenant token/ { in_step = 1 }
-  in_step && /id: live_e2e_tat/ { has_id = 1 }
-  in_step && /^        if:/ { has_if = 1 }
-  in_step && /LARKSUITE_CLI_APP_ID: \$\{\{ secrets\.TEST_BOT1_APP_ID \}\}/ { has_app_id = 1 }
-  in_step && /secrets\.TEST_BOT1_APP_SECRET/ { has_bot_credential = 1 }
-  in_step && /node scripts\/fetch_e2e_tat\.js/ { has_script = 1 }
-  in_step && /GITHUB_ENV/ { uses_github_env = 1 }
-  in_step && /^      - name:/ && !/Prepare shared live E2E tenant token/ { in_step = 0 }
-  END { exit has_id && !has_if && has_app_id && has_bot_credential && has_script && !uses_github_env ? 0 : 1 }
+  /^      - name: Configure bot credentials/ { in_step = 1 }
+  in_step && /if: \$\{\{ steps\.e2e_domains\.outputs\.mode != '\''skip'\'' \}\}/ { found = 1 }
+  in_step && /^      - name:/ && !/Configure bot credentials/ { in_step = 0 }
+  END { exit found ? 0 : 1 }
 ' <<<"$section"; then
-  echo "e2e-live should pass only a private tenant token file path through step output"
-  exit 1
-fi
-
-if ! awk '
-  /^      - name: Run CLI E2E tests/ { in_step = 1 }
-  in_step && /E2E_TENANT_AUTH_FILE: \$\{\{ steps\.live_e2e_tat\.outputs\.path \}\}/ { has_file = 1 }
-  in_step && /secrets\.TEST_USER_ACCESS_TOKEN/ { has_user_credential = 1 }
-  in_step && /Missing shared live E2E tenant token file/ { checks_file = 1 }
-  in_step && /^ *export / && /TEST_TENANT_ACCESS_TOKEN/ && /E2E_TENANT_AUTH_FILE/ { exports_test_tat = 1 }
-  in_step && /^ *export / && /LARKSUITE_CLI_TENANT_ACCESS_TOKEN/ { exports_standard_tat = 1 }
-  in_step && /LARKSUITE_CLI_APP_ID="\$TEST_BOT1_APP_ID"/ { scopes_preflight_app_id = 1 }
-  in_step && /LARKSUITE_CLI_TENANT_ACCESS_TOKEN="\$TEST_TENANT_ACCESS_TOKEN"/ { scopes_preflight_tat = 1 }
-  in_step && /lark-cli whoami --as bot/ { has_preflight = 1 }
-  in_step && /Tenant credential preflight failed/ { checks_preflight = 1 }
-  in_step && /TEST_USER_ACCESS_TOKEN/ && /secrets\.TEST_USER_ACCESS_TOKEN/ { has_user_env = 1 }
-  in_step && /LARKSUITE_CLI_USER_ACCESS_TOKEN/ && /secrets\.TEST_USER_ACCESS_TOKEN/ { has_global_user_env = 1 }
-  in_step && /trap / { has_trap = 1 }
-  in_step && /^      - name:/ && !/Run CLI E2E tests/ { in_step = 0 }
-  END { exit has_file && has_user_credential && checks_file && exports_test_tat && !exports_standard_tat && scopes_preflight_app_id && scopes_preflight_tat && has_preflight && checks_preflight && has_user_env && !has_global_user_env && !has_trap ? 0 : 1 }
-' <<<"$section"; then
-  echo "e2e-live should expose live E2E credentials only inside the test shell step"
-  exit 1
-fi
-
-if grep -Fq 'if [ "$E2E_MODE" = "skip" ]' <<<"$section"; then
-  echo "e2e-live should not retain an unreachable step-level skip branch"
+  echo "e2e-live should only configure bot credentials when domain mode is not skip"
  exit 1
 fi

@@ -531,8 +319,8 @@ if grep -Fq "steps.live_e2e_credentials.outputs.configured" <<<"$section"; then
  exit 1
 fi

-if ! grep -Fq "if: \${{ !cancelled() }}" <<<"$section"; then
-  echo "e2e-live report step should run after attempted live tests unless the workflow is cancelled"
+if ! grep -Fq "if: \${{ !cancelled() && steps.e2e_domains.outputs.mode != 'skip' }}" <<<"$section"; then
+  echo "e2e-live report step should run after attempted live tests unless the workflow is cancelled or domain mode is skip"
  exit 1
 fi

@@ -554,7 +342,7 @@ if grep -Fq '${{ secrets.CODECOV_TOKEN }}' <<<"$coverage_step" &&
 fi

 if grep -Fq '${{ secrets.' <<<"$section" &&
-   ! grep -Fq "$fork_safe_guard" <<<"$section"; then
+   ! grep -Fq "if: \${{ $fork_safe_guard }}" <<<"$section"; then
  echo "live E2E secrets should be available on push and same-repository pull_request, but not fork pull_request" >&2
  exit 1
 fi
--- a/scripts/fetch_e2e_tat.js
+++ b/scripts/fetch_e2e_tat.js
@@ -1,164 +0,0 @@
-#!/usr/bin/env node
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-// Fetches a live E2E tenant access token (TAT) for the shared bot identity.
-//
-// Invoked from the e2e-live CI job. Exchanges the bot app id/secret for a
-// tenant access token, writes the token to a private file under $RUNNER_TEMP,
-// and emits the file path as a step output so the test step can read it once
-// and then delete it.
-//
-// The secret arrives via environment variables; the OAuth parameter names are
-// literal because this is a source code file (.js), so the quality gate's
-// benign-code-credential exemption applies to the process.env references.
-
-const fs = require("node:fs");
-const http = require("node:http");
-const https = require("node:https");
-const path = require("node:path");
-const { URL } = require("node:url");
-
-const ENDPOINT = process.env.E2E_TAT_ENDPOINT || "https://accounts.feishu.cn/oauth/v3/token";
-const MAX_ATTEMPTS = 4;
-const RETRY_BASE_MS = parseInt(process.env.E2E_TAT_RETRY_BASE_MS || "1000", 10);
-
-function requireEnv(name) {
-  const value = process.env[name];
-  if (!value) {
-    console.error(`::error::Missing required environment variable: ${name}`);
-    process.exit(1);
-  }
-  return value;
-}
-
-function postForm(url, body) {
-  return new Promise((resolve, reject) => {
-    const parsed = new URL(url);
-    const transport = parsed.protocol === "http:" ? http : https;
-    const req = transport.request(
-      parsed,
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/x-www-form-urlencoded",
-          "Content-Length": Buffer.byteLength(body),
-        },
-        timeout: 20000,
-      },
-      (resp) => {
-        const chunks = [];
-        let settled = false;
-        const rejectOnce = (error) => {
-          if (!settled) {
-            settled = true;
-            reject(error);
-          }
-        };
-        resp.on("data", (chunk) => chunks.push(chunk));
-        resp.on("aborted", () => rejectOnce(new Error("response aborted before completion")));
-        resp.on("error", rejectOnce);
-        resp.on("close", () => {
-          if (!resp.complete) {
-            rejectOnce(new Error("response closed before completion"));
-          }
-        });
-        resp.on("end", () => {
-          if (!resp.complete) {
-            rejectOnce(new Error("response ended before completion"));
-            return;
-          }
-          settled = true;
-          resolve({
-            status: resp.statusCode,
-            body: Buffer.concat(chunks).toString("utf8"),
-            headers: resp.headers,
-          });
-        });
-      },
-    );
-    req.on("timeout", () => {
-      req.destroy();
-      reject(new Error("request timed out"));
-    });
-    req.on("error", reject);
-    req.write(body);
-    req.end();
-  });
-}
-
-function encodeForm(params) {
-  return Object.entries(params)
-    .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
-    .join("&");
-}
-
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-async function fetchTenantToken() {
-  const appId = requireEnv("LARKSUITE_CLI_APP_ID");
-  const appSecret = requireEnv("TEST_BOT1_APP_SECRET");
-
-  const body = encodeForm({
-    grant_type: "client_credentials",
-    client_id: appId,
-    client_secret: appSecret,
-  });
-
-  let lastError = "";
-  for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
-    try {
-      const { status, body: respBody, headers } = await postForm(ENDPOINT, body);
-      let payload;
-      try {
-        payload = JSON.parse(respBody);
-      } catch {
-        const logID = headers["x-tt-logid"] || headers["x-request-id"] || "unavailable";
-        lastError = `HTTP ${status}, log_id=${logID}, non-JSON response`;
-      }
-      if (payload) {
-        const token = payload.access_token;
-        if (status === 200 && payload.code === 0 && token) {
-          return token;
-        }
-        lastError = `HTTP ${status}, code=${payload.code}, error=${payload.error}, msg=${payload.msg || payload.error_description}`;
-      }
-    } catch (err) {
-      lastError = err.message;
-    }
-
-    if (attempt < MAX_ATTEMPTS) {
-      await sleep(2 ** (attempt - 1) * RETRY_BASE_MS);
-    }
-  }
-
-  console.error(`::error::Failed to fetch tenant access token: ${lastError}`);
-  process.exit(1);
-}
-
-async function main() {
-  const token = await fetchTenantToken();
-  console.log(`::add-mask::${token}`);
-
-  const tatPath = path.join(process.env.RUNNER_TEMP, "e2e-live-tat");
-  fs.writeFileSync(tatPath, token, { encoding: "utf8", mode: 0o600 });
-
-  if (process.env.GITHUB_OUTPUT) {
-    fs.appendFileSync(process.env.GITHUB_OUTPUT, `path=${tatPath}\n`);
-  }
-
-  console.log("Prepared shared live E2E tenant token");
-}
-
-if (require.main === module) {
-  main();
-}
-
-module.exports = {
-  encodeForm,
-  fetchTenantToken,
-  postForm,
-  requireEnv,
-};
--- a/scripts/fetch_e2e_tat.test.js
+++ b/scripts/fetch_e2e_tat.test.js
@@ -1,203 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-const assert = require("node:assert/strict");
-const fs = require("node:fs");
-const http = require("node:http");
-const os = require("node:os");
-const path = require("node:path");
-const { spawn } = require("node:child_process");
-const test = require("node:test");
-
-const scriptPath = path.join(__dirname, "fetch_e2e_tat.js");
-
-function startServer(handler) {
-  const server = http.createServer((req, res) => {
-    let body = "";
-    req.on("data", (chunk) => {
-      body += chunk;
-    });
-    req.on("end", () => {
-      handler(req, res, body);
-    });
-  });
-  return new Promise((resolve) => {
-    server.listen(0, "127.0.0.1", () => {
-      const port = server.address().port;
-      resolve({ server, port });
-    });
-  });
-}
-
-function abortResponse(res) {
-  res.writeHead(200, {
-    "Content-Type": "application/json",
-    "Content-Length": "100",
-  });
-  res.write('{"code":0');
-  setImmediate(() => res.destroy());
-}
-
-function runScript(envOverrides) {
-  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "fetch-e2e-tat-"));
-  const githubOutput = path.join(tmpDir, "github-output");
-  const env = {
-    ...process.env,
-    LARKSUITE_CLI_APP_ID: "test_app_id",
-    TEST_BOT1_APP_SECRET: "test-secret",
-    RUNNER_TEMP: tmpDir,
-    GITHUB_OUTPUT: githubOutput,
-    E2E_TAT_RETRY_BASE_MS: "10",
-    ...envOverrides,
-  };
-
-  return new Promise((resolve) => {
-    const child = spawn(process.execPath, [scriptPath], {
-      cwd: path.join(__dirname, ".."),
-      env,
-    });
-
-    let stdout = "";
-    let stderr = "";
-    child.stdout.on("data", (data) => {
-      stdout += data;
-    });
-    child.stderr.on("data", (data) => {
-      stderr += data;
-    });
-    child.on("close", (code) => {
-      const output = fs.existsSync(githubOutput)
-        ? fs.readFileSync(githubOutput, "utf8")
-        : "";
-      resolve({ tmpDir, stdout, stderr, output, exitCode: code });
-    });
-  });
-}
-
-test("encodeForm encodes form parameters", () => {
-  const { encodeForm } = require(scriptPath);
-  const result = encodeForm({
-    grant_type: "client_credentials",
-    client_id: "abc&def",
-    client_secret: "test-secret",
-    note: "x=y",
-  });
-  const params = new URLSearchParams(result);
-  assert.equal(params.get("grant_type"), "client_credentials");
-  assert.equal(params.get("client_id"), "abc&def");
-  assert.equal(params.get("client_secret"), "test-secret");
-  assert.equal(params.get("note"), "x=y");
-});
-
-test("exits with error when app id is missing", async () => {
-  const result = await runScript({ LARKSUITE_CLI_APP_ID: "" });
-  assert.notEqual(result.exitCode, 0);
-  assert.match(result.stderr, /Missing required environment variable: LARKSUITE_CLI_APP_ID/);
-});
-
-test("exits with error when app secret is missing", async () => {
-  const result = await runScript({ TEST_BOT1_APP_SECRET: "" });
-  assert.notEqual(result.exitCode, 0);
-  assert.match(result.stderr, /Missing required environment variable: TEST_BOT1_APP_SECRET/);
-});
-
-test("fetches token and writes it to a private file", async () => {
-  const { server, port } = await startServer((req, res, body) => {
-    assert.equal(req.method, "POST");
-    const params = new URLSearchParams(body);
-    assert.equal(params.get("grant_type"), "client_credentials");
-    assert.equal(params.get("client_id"), "test_app_id");
-    assert.equal(params.get("client_secret"), "test-secret");
-    res.writeHead(200, { "Content-Type": "application/json" });
-    res.end(JSON.stringify({ code: 0, access_token: "test-token" }));
-  });
-
-  try {
-    const result = await runScript({
-      E2E_TAT_ENDPOINT: `http://127.0.0.1:${port}/token`,
-    });
-
-    assert.equal(result.exitCode, 0, `stderr: ${result.stderr}`);
-    assert.ok(result.stdout.includes("::add-mask::test-token"));
-    assert.ok(result.stdout.includes("Prepared shared live E2E tenant token"));
-
-    const tatPath = path.join(result.tmpDir, "e2e-live-tat");
-    assert.ok(fs.existsSync(tatPath), "token file should exist");
-
-    const stat = fs.statSync(tatPath);
-    assert.equal(stat.mode & 0o777, 0o600, "token file should be owner-only");
-    assert.equal(fs.readFileSync(tatPath, "utf8"), "test-token");
-
-    assert.ok(
-      result.output.includes(`path=${tatPath}`),
-      "should write path to GITHUB_OUTPUT",
-    );
-  } finally {
-    server.close();
-  }
-});
-
-test("retries an interrupted response and then succeeds", async () => {
-  let requestCount = 0;
-  const { server, port } = await startServer((req, res) => {
-    requestCount++;
-    if (requestCount === 1) {
-      abortResponse(res);
-      return;
-    }
-    res.writeHead(200, { "Content-Type": "application/json" });
-    res.end(JSON.stringify({ code: 0, access_token: "test-token" }));
-  });
-
-  try {
-    const result = await runScript({
-      E2E_TAT_ENDPOINT: `http://127.0.0.1:${port}/token`,
-    });
-
-    assert.equal(result.exitCode, 0, `stderr: ${result.stderr}`);
-    assert.equal(requestCount, 2);
-  } finally {
-    server.close();
-  }
-});
-
-test("fails after every interrupted response is retried", async () => {
-  let requestCount = 0;
-  const { server, port } = await startServer((req, res) => {
-    requestCount++;
-    abortResponse(res);
-  });
-
-  try {
-    const result = await runScript({
-      E2E_TAT_ENDPOINT: `http://127.0.0.1:${port}/token`,
-    });
-
-    assert.notEqual(result.exitCode, 0);
-    assert.equal(requestCount, 4);
-    assert.match(result.stderr, /Failed to fetch tenant access token/);
-  } finally {
-    server.close();
-  }
-});
-
-test("exits with error after all retries fail", async () => {
-  let requestCount = 0;
-  const { server, port } = await startServer((req, res) => {
-    requestCount++;
-    res.writeHead(500, { "Content-Type": "application/json" });
-    res.end(JSON.stringify({ code: 500, error: "server error" }));
-  });
-
-  try {
-    const result = await runScript({
-      E2E_TAT_ENDPOINT: `http://127.0.0.1:${port}/token`,
-    });
-
-    assert.notEqual(result.exitCode, 0);
-    assert.equal(requestCount, 4);
-    assert.match(result.stderr, /Failed to fetch tenant access token/);
-  } finally {
-    server.close();
-  }
-});
--- a/scripts/install.js
+++ b/scripts/install.js
@@ -265,7 +265,10 @@ function getExpectedChecksum(archiveName, checksumsDir) {
  const checksumsPath = path.join(dir, "checksums.txt");

  if (!fs.existsSync(checksumsPath)) {
-    throw new Error(`[SECURITY] checksums.txt not found at ${checksumsPath}`);
+    console.error(
+      "[WARN] checksums.txt not found, skipping checksum verification"
+    );
+    return null;
  }

  const content = fs.readFileSync(checksumsPath, "utf8");
@@ -283,14 +286,7 @@ function getExpectedChecksum(archiveName, checksumsDir) {
 }

 function verifyChecksum(archivePath, expectedHash) {
-  if (typeof expectedHash !== "string" || expectedHash.length === 0) {
-    throw new Error("[SECURITY] Expected checksum is missing or invalid");
-  }
-  if (!/^[0-9a-f]{64}$/i.test(expectedHash)) {
-    throw new Error(
-      "[SECURITY] Expected checksum must be a 64-character hexadecimal SHA-256 digest"
-    );
-  }
+  if (expectedHash === null) return;

  // Stream the file to avoid loading the entire archive into memory.
  // Archives can be 10-100MB; streaming keeps RSS constant.
--- a/scripts/install.test.js
+++ b/scripts/install.test.js
@@ -52,12 +52,11 @@ describe("getExpectedChecksum", () => {
    );
  });

-  it("throws [SECURITY]-prefixed Error when checksums.txt does not exist", () => {
+  it("returns null when checksums.txt does not exist", () => {
    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "checksum-test-"));
-    assert.throws(
-      () => getExpectedChecksum("anything.tar.gz", dir),
-      { message: /^\[SECURITY\] checksums\.txt not found/ }
-    );
+    // No checksums.txt in dir
+    const result = getExpectedChecksum("anything.tar.gz", dir);
+    assert.equal(result, null);
  });

  it("skips malformed lines and still finds valid entry", () => {
@@ -107,7 +106,7 @@ describe("verifyChecksum", () => {
    verifyChecksum(filePath, hash);
  });

-  it("accepts a valid uppercase 64-character hex hash", () => {
+  it("matches case-insensitively", () => {
    const content = "case test";
    const filePath = makeTmpFile(content);
    const hash = sha256(content).toUpperCase();
@@ -115,40 +114,6 @@ describe("verifyChecksum", () => {
    verifyChecksum(filePath, hash);
  });

-  for (const [name, expectedHash] of [
-    ["null", null],
-    ["empty", ""],
-    ["non-string", 123],
-  ]) {
-    it(`throws [SECURITY]-prefixed Error for ${name} expected hash`, () => {
-      const filePath = makeTmpFile("real content");
-      assert.throws(
-        () => verifyChecksum(filePath, expectedHash),
-        (err) => {
-          assert.match(err.message, /^\[SECURITY\]/);
-          assert.match(err.message, /Expected checksum is missing or invalid/);
-          return true;
-        }
-      );
-    });
-  }
-
-  it("throws [SECURITY] format Error for an incorrectly sized hash", () => {
-    const filePath = makeTmpFile("real content");
-    assert.throws(
-      () => verifyChecksum(filePath, "abc123"),
-      { message: /^\[SECURITY\] Expected checksum must be a 64-character hexadecimal SHA-256 digest$/ }
-    );
-  });
-
-  it("throws [SECURITY] format Error for a non-hex hash", () => {
-    const filePath = makeTmpFile("real content");
-    assert.throws(
-      () => verifyChecksum(filePath, "g".repeat(64)),
-      { message: /^\[SECURITY\] Expected checksum must be a 64-character hexadecimal SHA-256 digest$/ }
-    );
-  });
-
  it("throws [SECURITY]-prefixed Error on mismatch", () => {
    const filePath = makeTmpFile("real content");
    assert.throws(
--- a/scripts/release-preflight.js
+++ b/scripts/release-preflight.js
@@ -1,110 +0,0 @@
-#!/usr/bin/env node
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-const fs = require("node:fs");
-const path = require("node:path");
-
-const STABLE_VERSION_PATTERN = /^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$/;
-const REHEARSAL_VERSION_PATTERN = /^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)-beta\.(0|[1-9][0-9]*)$/;
-
-function isReleaseVersion(value) {
-  return typeof value === "string" &&
-    (STABLE_VERSION_PATTERN.test(value) || REHEARSAL_VERSION_PATTERN.test(value));
-}
-
-function releaseError(message, observed, hint) {
-  return { ok: false, error: { type: "release_preflight", message, observed, hint } };
-}
-
-function validateReleasePreflight(packageJson, packageLockJson, tag) {
-  const packageVersion = packageJson?.version;
-  const lockVersion = packageLockJson?.version;
-  const lockRootVersion = packageLockJson?.packages?.[""]?.version;
-  const observed = {
-    packageVersion: packageVersion ?? null,
-    lockVersion: lockVersion ?? null,
-    lockRootVersion: lockRootVersion ?? null,
-    tagVersion: null,
-  };
-
-  for (const [field, value] of [
-    ["package.json.version", packageVersion],
-    ["package-lock.json.version", lockVersion],
-    ['package-lock.json.packages[""].version', lockRootVersion],
-  ]) {
-    if (!isReleaseVersion(value)) {
-      return releaseError(
-        `${field} must use X.Y.Z or the rehearsal form X.Y.Z-beta.N`,
-        observed,
-        "Use the same version in all package fields; only stable releases and the temporary beta rehearsal form are allowed.",
-      );
-    }
-  }
-
-  if (packageVersion !== lockVersion || packageVersion !== lockRootVersion) {
-    return releaseError(
-      "Package version fields do not match",
-      observed,
-      "Synchronize package.json.version and both package-lock.json version fields.",
-    );
-  }
-
-  if (tag === undefined) {
-    return { ok: true, data: observed };
-  }
-  if (typeof tag !== "string" || !tag.startsWith("v") || !isReleaseVersion(tag.slice(1))) {
-    return releaseError(
-      "--tag must use vX.Y.Z or the rehearsal form vX.Y.Z-beta.N",
-      { ...observed, tag },
-      `Use --tag v${packageVersion}.`,
-    );
-  }
-
-  const tagVersion = tag.slice(1);
-  if (tagVersion !== packageVersion) {
-    return releaseError(
-      "Tag version does not match the package version",
-      { ...observed, tagVersion, tag },
-      `Use --tag v${packageVersion}.`,
-    );
-  }
-  return { ok: true, data: { ...observed, tagVersion } };
-}
-
-function writeResult(result) {
-  (result.ok ? process.stdout : process.stderr).write(`${JSON.stringify(result)}\n`);
-  if (!result.ok) process.exitCode = 1;
-}
-
-function main() {
-  const args = process.argv.slice(2);
-  let tag;
-  if (args.length === 2 && args[0] === "--tag") {
-    tag = args[1];
-  } else if (args.length !== 0) {
-    writeResult(releaseError(
-      "Expected no arguments or --tag vX.Y.Z",
-      { arguments: args },
-      "Run release:check without arguments or pass exactly one --tag value.",
-    ));
-    return;
-  }
-
-  const repoRoot = path.resolve(__dirname, "..");
-  try {
-    const packageJson = JSON.parse(fs.readFileSync(path.join(repoRoot, "package.json"), "utf8"));
-    const packageLockJson = JSON.parse(fs.readFileSync(path.join(repoRoot, "package-lock.json"), "utf8"));
-    writeResult(validateReleasePreflight(packageJson, packageLockJson, tag));
-  } catch (error) {
-    writeResult(releaseError(
-      "Could not read release package metadata",
-      { reason: error.message },
-      "Ensure package.json and package-lock.json exist and contain valid JSON.",
-    ));
-  }
-}
-
-module.exports = { validateReleasePreflight };
-
-if (require.main === module) main();
--- a/scripts/release-preflight.test.js
+++ b/scripts/release-preflight.test.js
@@ -1,611 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-const assert = require("node:assert/strict");
-const { spawnSync } = require("node:child_process");
-const fs = require("node:fs");
-const os = require("node:os");
-const path = require("node:path");
-const { describe, it } = require("node:test");
-
-const {
-  validateReleasePreflight,
-} = require("./release-preflight");
-
-const repoRoot = path.resolve(__dirname, "..");
-
-function createReleaseFixture(t, env = {}) {
-  const root = fs.mkdtempSync(path.join(os.tmpdir(), "tag-release-test-"));
-  const scriptsDir = path.join(root, "scripts");
-  const binDir = path.join(root, "bin");
-  const stateDir = path.join(root, "state");
-  const logPath = path.join(root, "git-calls.jsonl");
-  const npmLogPath = path.join(root, "npm-calls.jsonl");
-  fs.mkdirSync(scriptsDir);
-  fs.mkdirSync(binDir);
-  fs.mkdirSync(stateDir);
-  fs.copyFileSync(
-    path.join(repoRoot, "scripts/release-preflight.js"),
-    path.join(scriptsDir, "release-preflight.js"),
-  );
-  fs.copyFileSync(
-    path.join(repoRoot, "scripts/tag-release.sh"),
-    path.join(scriptsDir, "tag-release.sh"),
-  );
-  fs.writeFileSync(path.join(root, "package.json"), '{"version":"1.2.3-beta.0"}\n');
-  fs.writeFileSync(
-    path.join(root, "package-lock.json"),
-    '{"version":"1.2.3-beta.0","packages":{"":{"version":"1.2.3-beta.0"}}}\n',
-  );
-
-  const fakeGitPath = path.join(binDir, "git");
-  fs.writeFileSync(fakeGitPath, String.raw`#!/usr/bin/env node
-const fs = require("node:fs");
-const path = require("node:path");
-
-const args = process.argv.slice(2);
-const stateDir = process.env.FAKE_GIT_STATE_DIR;
-const localTagPath = path.join(stateDir, "local-tag");
-if (process.cwd() !== process.env.FAKE_EXPECTED_GIT_CWD) {
-  process.stderr.write("git invoked outside repository root: " + process.cwd() + "\n");
-  process.exit(96);
-}
-fs.appendFileSync(process.env.FAKE_GIT_LOG, JSON.stringify(args) + "\n");
-
-function print(value) {
-  process.stdout.write(value + "\n");
-}
-
-switch (args[0]) {
-  case "branch":
-    print(process.env.FAKE_BRANCH || "test/npm-staged-publish-rehearsal");
-    break;
-  case "status":
-    if (process.env.FAKE_STATUS_OUTPUT) print(process.env.FAKE_STATUS_OUTPUT);
-    break;
-  case "fetch":
-    break;
-  case "rev-parse": {
-    const ref = args[args.length - 1];
-    if (ref === "HEAD") {
-      print(process.env.FAKE_HEAD_SHA);
-      break;
-    }
-    if (ref === "FETCH_HEAD^{commit}") {
-      print(process.env.FAKE_REHEARSAL_SHA);
-      break;
-    }
-    if (ref.startsWith("refs/tags/")) {
-      if (fs.existsSync(localTagPath)) {
-        print(fs.readFileSync(localTagPath, "utf8").trim());
-        break;
-      }
-      process.exit(1);
-    }
-    process.stderr.write("unexpected rev-parse ref: " + ref + "\n");
-    process.exit(97);
-    break;
-  }
-  case "ls-remote": {
-    const tagRef = args.find((arg) => arg.startsWith("refs/tags/") && !arg.endsWith("^{}"));
-    const kind = process.env.FAKE_REMOTE_TAG_KIND || "absent";
-    if (kind === "lightweight" || kind === "annotated") {
-      print(process.env.FAKE_REMOTE_TAG_SHA + "\t" + tagRef);
-    }
-    break;
-  }
-  case "show":
-    print(process.env.FAKE_WORKFLOW);
-    break;
-  case "tag":
-    fs.writeFileSync(localTagPath, args[2] || process.env.FAKE_HEAD_SHA);
-    break;
-  case "push": {
-    const failedMarker = path.join(stateDir, "push-failed");
-    if (process.env.FAKE_PUSH_FAIL_ONCE && !fs.existsSync(failedMarker)) {
-      fs.writeFileSync(failedMarker, "1");
-      process.exit(Number(process.env.FAKE_PUSH_FAIL_ONCE));
-    }
-    break;
-  }
-  default:
-    process.stderr.write("unexpected git command: " + args.join(" ") + "\n");
-    process.exit(97);
-}
-`);
-  fs.chmodSync(fakeGitPath, 0o755);
-
-  const fakeNpmPath = path.join(binDir, "npm");
-  fs.writeFileSync(fakeNpmPath, String.raw`#!/usr/bin/env node
-const fs = require("node:fs");
-const args = process.argv.slice(2);
-fs.appendFileSync(process.env.FAKE_NPM_LOG, JSON.stringify(args) + "\n");
-if (args[0] !== "view") {
-  process.stderr.write("unexpected npm command: " + args.join(" ") + "\n");
-  process.exit(97);
-}
-const output = process.env.FAKE_NPM_VIEW_OUTPUT || "npm error code E404\nnpm error 404 Not Found";
-(Number(process.env.FAKE_NPM_VIEW_STATUS || "1") === 0 ? process.stdout : process.stderr).write(output + "\n");
-process.exit(Number(process.env.FAKE_NPM_VIEW_STATUS || "1"));
-`);
-  fs.chmodSync(fakeNpmPath, 0o755);
-  t.after(() => fs.rmSync(root, { recursive: true, force: true }));
-
-  return {
-    root,
-    stateDir,
-    logPath,
-    env: {
-      ...process.env,
-      PATH: `${binDir}${path.delimiter}${process.env.PATH}`,
-      LANG: "C",
-      LC_ALL: "C",
-      FAKE_GIT_LOG: logPath,
-      FAKE_NPM_LOG: npmLogPath,
-      FAKE_GIT_STATE_DIR: stateDir,
-      FAKE_EXPECTED_GIT_CWD: fs.realpathSync(root),
-      FAKE_HEAD_SHA: "aaaaaaaa",
-      FAKE_REHEARSAL_SHA: "aaaaaaaa",
-      FAKE_WORKFLOW: "args: release --clean --skip=publish\nrun: npm stage publish package.tgz --access public --tag beta",
-      ...env,
-    },
-  };
-}
-
-function runTagRelease(fixture, options = {}) {
-  const { cwd = fixture.root, args = [], input = "" } = options;
-  return spawnSync("bash", [path.join(fixture.root, "scripts/tag-release.sh"), ...args], {
-    cwd,
-    env: fixture.env,
-    encoding: "utf8",
-    input,
-  });
-}
-
-function readGitCalls(fixture) {
-  if (!fs.existsSync(fixture.logPath)) {
-    return [];
-  }
-  return fs.readFileSync(fixture.logPath, "utf8")
-    .trim()
-    .split("\n")
-    .filter(Boolean)
-    .map((line) => JSON.parse(line));
-}
-
-function assertNoTagOperations(calls) {
-  const tagOperations = calls.filter((args) =>
-    args[0] === "ls-remote" ||
-    args[0] === "tag" ||
-    args[0] === "push" ||
-    (args[0] === "rev-parse" && args.some((arg) => arg.startsWith("refs/tags/"))),
-  );
-  assert.deepEqual(tagOperations, []);
-}
-
-function assertNoTagWrites(calls) {
-  assert.equal(calls.some((args) => args[0] === "tag" || args[0] === "push"), false);
-}
-
-function validInputs(version = "1.2.3") {
-  return {
-    packageJson: { version },
-    packageLockJson: {
-      version,
-      packages: { "": { version } },
-    },
-  };
-}
-
-function assertStructuredError(result) {
-  assert.equal(result.ok, false);
-  assert.equal(result.error.type, "release_preflight");
-  assert.equal(typeof result.error.message, "string");
-  assert.ok(result.error.message.length > 0);
-  assert.equal(typeof result.error.observed, "object");
-  assert.equal(typeof result.error.hint, "string");
-  assert.ok(result.error.hint.length > 0);
-}
-
-function assertInOrder(source, snippets) {
-  let previous = -1;
-  for (const snippet of snippets) {
-    const index = source.indexOf(snippet);
-    assert.ok(index >= 0, `missing fragment: ${snippet}`);
-    assert.ok(index > previous, `fragment is out of order: ${snippet}`);
-    previous = index;
-  }
-}
-
-describe("validateReleasePreflight", () => {
-  it("accepts matching stable and beta rehearsal versions", () => {
-    for (const version of ["1.2.3", "1.2.3-beta.0"]) {
-      const { packageJson, packageLockJson } = validInputs(version);
-
-      assert.deepEqual(validateReleasePreflight(packageJson, packageLockJson), {
-        ok: true,
-        data: {
-          packageVersion: version,
-          lockVersion: version,
-          lockRootVersion: version,
-          tagVersion: null,
-        },
-      });
-      assert.deepEqual(
-        validateReleasePreflight(packageJson, packageLockJson, `v${version}`),
-        {
-          ok: true,
-          data: {
-            packageVersion: version,
-            lockVersion: version,
-            lockRootVersion: version,
-            tagVersion: version,
-          },
-        },
-      );
-    }
-  });
-
-  it("rejects prerelease forms other than beta rehearsal versions", () => {
-    const { packageJson, packageLockJson } = validInputs("1.2.3-rc.1");
-
-    const result = validateReleasePreflight(packageJson, packageLockJson);
-
-    assertStructuredError(result);
-    assert.equal(
-      result.error.message,
-      "package.json.version must use X.Y.Z or the rehearsal form X.Y.Z-beta.N",
-    );
-    assert.equal(
-      result.error.hint,
-      "Use the same version in all package fields; only stable releases and the temporary beta rehearsal form are allowed.",
-    );
-  });
-
-  it("rejects build metadata package versions with the stable release contract", () => {
-    const { packageJson, packageLockJson } = validInputs("1.2.3+build.7");
-
-    const result = validateReleasePreflight(packageJson, packageLockJson);
-
-    assertStructuredError(result);
-    assert.equal(
-      result.error.message,
-      "package.json.version must use X.Y.Z or the rehearsal form X.Y.Z-beta.N",
-    );
-    assert.equal(
-      result.error.hint,
-      "Use the same version in all package fields; only stable releases and the temporary beta rehearsal form are allowed.",
-    );
-  });
-
-  it("rejects invalid and missing package or lock SemVer values", () => {
-    const invalid = validInputs();
-    invalid.packageJson.version = "01.2.3";
-    const missing = validInputs();
-    delete missing.packageLockJson.packages[""].version;
-
-    for (const result of [
-      validateReleasePreflight(invalid.packageJson, invalid.packageLockJson),
-      validateReleasePreflight(missing.packageJson, missing.packageLockJson),
-    ]) {
-      assertStructuredError(result);
-    }
-  });
-
-  it("rejects a top-level package-lock version mismatch", () => {
-    const { packageJson, packageLockJson } = validInputs();
-    packageLockJson.version = "1.2.4";
-
-    const result = validateReleasePreflight(packageJson, packageLockJson);
-
-    assertStructuredError(result);
-    assert.deepEqual(result.error.observed, {
-      packageVersion: "1.2.3",
-      lockVersion: "1.2.4",
-      lockRootVersion: "1.2.3",
-      tagVersion: null,
-    });
-  });
-
-  it("rejects a package-lock root package version mismatch", () => {
-    const { packageJson, packageLockJson } = validInputs();
-    packageLockJson.packages[""].version = "1.2.4";
-
-    const result = validateReleasePreflight(packageJson, packageLockJson);
-
-    assertStructuredError(result);
-    assert.deepEqual(result.error.observed, {
-      packageVersion: "1.2.3",
-      lockVersion: "1.2.3",
-      lockRootVersion: "1.2.4",
-      tagVersion: null,
-    });
-  });
-
-  it("rejects invalid and mismatched tags", () => {
-    const { packageJson, packageLockJson } = validInputs();
-
-    for (const tag of ["1.2.3", "v01.2.3", "v1.2.4"]) {
-      const result = validateReleasePreflight(packageJson, packageLockJson, tag);
-      assertStructuredError(result);
-      assert.equal(result.error.observed.tag, tag);
-    }
-  });
-});
-
-describe("release configuration", () => {
-  it("writes success to stdout and structured failures to stderr", () => {
-    const scriptPath = path.join(repoRoot, "scripts/release-preflight.js");
-    const packageVersion = require(path.join(repoRoot, "package.json")).version;
-    const success = spawnSync(process.execPath, [scriptPath, "--tag", `v${packageVersion}`], {
-      cwd: repoRoot,
-      encoding: "utf8",
-    });
-    const failure = spawnSync(process.execPath, [scriptPath, "--tag", "invalid"], {
-      cwd: repoRoot,
-      encoding: "utf8",
-    });
-
-    assert.equal(success.status, 0);
-    assert.equal(success.stderr, "");
-    assert.deepEqual(JSON.parse(success.stdout), {
-      ok: true,
-      data: {
-        packageVersion,
-        lockVersion: packageVersion,
-        lockRootVersion: packageVersion,
-        tagVersion: packageVersion,
-      },
-    });
-    assert.equal(failure.status, 1);
-    assert.equal(failure.stdout, "");
-    assertStructuredError(JSON.parse(failure.stderr));
-  });
-
-  it("keeps package metadata synchronized without changing the Node engine", () => {
-    const packageJson = require(path.join(repoRoot, "package.json"));
-    const packageLockJson = require(path.join(repoRoot, "package-lock.json"));
-
-    assert.equal(packageJson.scripts["release:check"], "node scripts/release-preflight.js");
-    assert.equal(packageJson.engines.node, ">=16");
-    assert.equal(packageLockJson.version, packageJson.version);
-    assert.equal(packageLockJson.packages[""].version, packageJson.version);
-  });
-
-  it("runs every release gate before any tag query, creation, or push", () => {
-    const script = fs.readFileSync(path.join(repoRoot, "scripts/tag-release.sh"), "utf8");
-    const preflight = script.indexOf('node "${SCRIPT_DIR}/release-preflight.js" --tag "${TAG}"');
-    const requiredGates = [
-      'CURRENT_BRANCH=$(git branch --show-current)',
-      'git status --porcelain',
-      'git fetch origin "${REHEARSAL_BRANCH}"',
-      'git rev-parse "FETCH_HEAD^{commit}"',
-      'git show "${HEAD_SHA}:.github/workflows/release.yml"',
-      'npm view "@larksuite/cli@${VERSION}" version',
-    ];
-    const tagOperations = [
-      'git rev-parse -q --verify "refs/tags/${TAG}"',
-      'git ls-remote --tags origin "refs/tags/${TAG}"',
-      'git tag "${TAG}" "${HEAD_SHA}"',
-      'git push origin "refs/tags/${TAG}:refs/tags/${TAG}"',
-    ];
-
-    assert.ok(preflight >= 0, "release preflight invocation is missing");
-    assertInOrder(script, [
-      'REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"',
-      'cd "${REPO_ROOT}"',
-      'node "${SCRIPT_DIR}/release-preflight.js"',
-    ]);
-    assert.equal(script.includes("require('${REPO_ROOT}/package.json')"), false);
-    for (const gate of requiredGates) {
-      const index = script.indexOf(gate);
-      assert.ok(index >= 0, `required release gate is missing: ${gate}`);
-      assert.ok(index < script.indexOf(tagOperations[0]), `${gate} must run before tag queries`);
-    }
-    for (const operation of tagOperations) {
-      const index = script.indexOf(operation);
-      assert.ok(index >= 0, `tag operation is missing: ${operation}`);
-      assert.ok(preflight < index, `preflight must run before: ${operation}`);
-    }
-    assertInOrder(script, [
-      'if [ "${PUSH_TAG}" != true ]',
-      'read -r CONFIRM_TAG',
-      'git tag "${TAG}" "${HEAD_SHA}"',
-      'git push origin "refs/tags/${TAG}:refs/tags/${TAG}"',
-    ]);
-  });
-});
-
-describe("tag-release.sh behavior", () => {
-  it("runs repository checks from the script repository when invoked elsewhere", (t) => {
-    const fixture = createReleaseFixture(t);
-    const outside = fs.mkdtempSync(path.join(os.tmpdir(), "tag-release-cwd-"));
-    t.after(() => fs.rmSync(outside, { recursive: true, force: true }));
-
-    const result = runTagRelease(fixture, { cwd: outside });
-
-    assert.equal(result.status, 0, result.stderr);
-  });
-
-  it("rejects a non-rehearsal branch before querying or modifying tags", (t) => {
-    const fixture = createReleaseFixture(t, { FAKE_BRANCH: "feature/release" });
-
-    const result = runTagRelease(fixture);
-    const calls = readGitCalls(fixture);
-
-    assert.equal(result.status, 1);
-    assert.match(result.stderr, /must be created from test\/npm-staged-publish-rehearsal/i);
-    assertNoTagOperations(calls);
-  });
-
-  it("rejects a dirty working tree before tag operations", (t) => {
-    const fixture = createReleaseFixture(t, { FAKE_STATUS_OUTPUT: " M README.md" });
-    const result = runTagRelease(fixture);
-    const calls = readGitCalls(fixture);
-
-    assert.equal(result.status, 1);
-    assert.match(result.stderr, /working tree must be clean/i);
-    assertNoTagOperations(calls);
-  });
-
-  it("rejects HEAD that differs from the fetched rehearsal branch", (t) => {
-    const fixture = createReleaseFixture(t, { FAKE_REHEARSAL_SHA: "bbbbbbbb" });
-
-    const result = runTagRelease(fixture);
-    const calls = readGitCalls(fixture);
-
-    assert.equal(result.status, 1);
-    assert.match(result.stderr, /HEAD must exactly match origin\/test\/npm-staged-publish-rehearsal/i);
-    assertNoTagOperations(calls);
-  });
-
-  it("compares HEAD with the exact fetched rehearsal commit", (t) => {
-    const fixture = createReleaseFixture(t);
-
-    const result = runTagRelease(fixture);
-    const calls = readGitCalls(fixture);
-
-    assert.equal(result.status, 0, result.stderr);
-    assert.ok(calls.some((args) => args.join(" ") === "fetch origin test/npm-staged-publish-rehearsal"));
-    assert.ok(calls.some((args) => args.join(" ") === "rev-parse FETCH_HEAD^{commit}"));
-    assert.equal(calls.some((args) => args.includes("origin/test/npm-staged-publish-rehearsal")), false);
-  });
-
-  it("fails when the local tag already exists", (t) => {
-    const fixture = createReleaseFixture(t);
-    fs.writeFileSync(path.join(fixture.stateDir, "local-tag"), "bbbbbbbb");
-
-    const result = runTagRelease(fixture);
-    const calls = readGitCalls(fixture);
-
-    assert.equal(result.status, 1);
-    assert.match(result.stderr, /local tag .* already exists/i);
-    assert.equal(calls.some((args) => args[0] === "ls-remote"), false);
-    assert.equal(calls.some((args) => args[0] === "push"), false);
-  });
-
-  it("fails when a lightweight or annotated remote tag already exists", (t) => {
-    for (const kind of ["lightweight", "annotated"]) {
-      const fixture = createReleaseFixture(t, {
-        FAKE_REMOTE_TAG_KIND: kind,
-        FAKE_REMOTE_TAG_SHA: "aaaaaaaa",
-      });
-
-      const result = runTagRelease(fixture);
-      const calls = readGitCalls(fixture);
-
-      assert.equal(result.status, 1, `${kind}: ${result.stderr}`);
-      assert.match(result.stderr, /remote tag .* already exists/i);
-      assert.equal(calls.some((args) => args[0] === "tag"), false);
-      assert.equal(calls.some((args) => args[0] === "push"), false);
-    }
-  });
-
-  it("check mode completes without creating or pushing a tag", (t) => {
-    const fixture = createReleaseFixture(t);
-
-    const result = runTagRelease(fixture);
-    const calls = readGitCalls(fixture);
-
-    assert.equal(result.status, 0, result.stderr);
-    assert.match(result.stdout, /No tag was created or pushed/);
-    assertNoTagWrites(calls);
-  });
-
-  it("rejects a production version before invoking git", (t) => {
-    const fixture = createReleaseFixture(t);
-    fs.writeFileSync(path.join(fixture.root, "package.json"), '{"version":"1.2.3"}\n');
-    fs.writeFileSync(
-      path.join(fixture.root, "package-lock.json"),
-      '{"version":"1.2.3","packages":{"":{"version":"1.2.3"}}}\n',
-    );
-
-    const result = runTagRelease(fixture);
-
-    assert.equal(result.status, 1);
-    assert.match(result.stderr, /require an X\.Y\.Z-beta\.N version/);
-    assert.deepEqual(readGitCalls(fixture), []);
-  });
-
-  it("rejects a workflow that can publish live", (t) => {
-    for (const workflow of [
-      "args: release --clean --skip=publish\nrun: npm publish --access public",
-      "args: release --clean --skip=publish\nrun: npm stage publish package.tgz --access public --tag beta\nrun: gh release create v1.2.3-beta.0",
-      "args: release --clean --skip=publish\npermissions:\n  contents: write\nrun: npm stage publish package.tgz --access public --tag beta",
-      "args: release --clean --skip=publish\nenv:\n  GITHUB_TOKEN: ${{ github.token }}\nrun: npm stage publish package.tgz --access public --tag beta",
-    ]) {
-      const fixture = createReleaseFixture(t, { FAKE_WORKFLOW: workflow });
-      const result = runTagRelease(fixture);
-
-      assert.equal(result.status, 1);
-      assert.match(result.stderr, /must be stage-only/i);
-      assertNoTagWrites(readGitCalls(fixture));
-    }
-  });
-
-  it("fails closed when npm cannot prove that the version is unused", (t) => {
-    const fixture = createReleaseFixture(t, {
-      FAKE_NPM_VIEW_OUTPUT: "npm error code ETIMEDOUT",
-    });
-
-    const result = runTagRelease(fixture);
-
-    assert.equal(result.status, 1);
-    assert.match(result.stderr, /npm version lookup failed/i);
-    assertNoTagWrites(readGitCalls(fixture));
-  });
-
-  it("rejects an existing npm version", (t) => {
-    const fixture = createReleaseFixture(t, {
-      FAKE_NPM_VIEW_STATUS: "0",
-      FAKE_NPM_VIEW_OUTPUT: "1.2.3-beta.0",
-    });
-
-    const result = runTagRelease(fixture);
-
-    assert.equal(result.status, 1);
-    assert.match(result.stderr, /already exists on npm/i);
-    assertNoTagWrites(readGitCalls(fixture));
-  });
-
-  it("requires the full tag confirmation in push mode", (t) => {
-    const fixture = createReleaseFixture(t);
-
-    const result = runTagRelease(fixture, { args: ["--push"], input: "no\n" });
-
-    assert.equal(result.status, 1);
-    assert.match(result.stderr, /confirmation did not exactly match/i);
-    assertNoTagWrites(readGitCalls(fixture));
-  });
-
-  it("pushes only the exact confirmed tag ref", (t) => {
-    const fixture = createReleaseFixture(t);
-
-    const result = runTagRelease(fixture, {
-      args: ["--push"],
-      input: "v1.2.3-beta.0\n",
-    });
-    const calls = readGitCalls(fixture);
-
-    assert.equal(result.status, 0, result.stderr);
-    assert.ok(calls.some((args) => args.join(" ") === "tag v1.2.3-beta.0 aaaaaaaa"));
-    assert.ok(calls.some((args) =>
-      args.join(" ") === "push origin refs/tags/v1.2.3-beta.0:refs/tags/v1.2.3-beta.0"));
-    assert.equal(
-      calls.some((args) => args[0] === "push" && args.includes("--tags")),
-      false,
-    );
-  });
-
-  it("reports an invalid package version before invoking git", (t) => {
-    const fixture = createReleaseFixture(t);
-    fs.writeFileSync(path.join(fixture.root, "package.json"), '{"version":"01.2.3"}\n');
-
-    const result = runTagRelease(fixture);
-
-    assert.equal(result.status, 1);
-    assert.equal(result.stdout, "");
-    assertStructuredError(JSON.parse(result.stderr));
-    assert.deepEqual(readGitCalls(fixture), []);
-  });
-});
--- a/scripts/release-workflow.test.js
+++ b/scripts/release-workflow.test.js
@@ -1,168 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-const assert = require("node:assert/strict");
-const fs = require("node:fs");
-const path = require("node:path");
-const { describe, it } = require("node:test");
-
-const repoRoot = path.resolve(__dirname, "..");
-const releaseWorkflow = fs.readFileSync(
-  path.join(repoRoot, ".github/workflows/release.yml"),
-  "utf8",
-);
-const previewWorkflow = fs.readFileSync(
-  path.join(repoRoot, ".github/workflows/pkg-pr-new.yml"),
-  "utf8",
-);
-function topLevelBlock(source, name) {
-  const match = source.match(
-    new RegExp(
-      `^${name}:\\n([\\s\\S]*?)(?=^[A-Za-z][A-Za-z0-9_-]*:|(?![\\s\\S]))`,
-      "m",
-    ),
-  );
-  assert.ok(match, `missing top-level ${name} block`);
-  return match[0];
-}
-
-function jobBlock(source, name) {
-  const jobs = topLevelBlock(source, "jobs");
-  const match = jobs.match(
-    new RegExp(
-      `^  ${name}:\\n([\\s\\S]*?)(?=^  [A-Za-z][A-Za-z0-9_-]*:|(?![\\s\\S]))`,
-      "m",
-    ),
-  );
-  assert.ok(match, `missing ${name} job`);
-  return match[0];
-}
-
-function assertInOrder(source, snippets) {
-  let previous = -1;
-  for (const snippet of snippets) {
-    const index = source.indexOf(snippet);
-    assert.ok(index >= 0, `missing workflow fragment: ${snippet}`);
-    assert.ok(index > previous, `workflow fragment is out of order: ${snippet}`);
-    previous = index;
-  }
-}
-
-function permissionLines(job) {
-  const match = job.match(/^    permissions:\n((?:      .+\n)+)/m);
-  assert.ok(match, "missing job permissions");
-  return match[1].trim().split("\n").map((line) => line.trim()).sort();
-}
-
-describe("release workflow contract", () => {
-  it("has only the version-tag production trigger", () => {
-    const trigger = topLevelBlock(releaseWorkflow, "on");
-
-    assert.match(trigger, /^on:\n  push:\n    tags:\n      - 'v\*'\n+$/);
-    for (const forbidden of [
-      "workflow_dispatch:",
-      "workflow_run:",
-      "pull_request:",
-      "pull_request_target:",
-    ]) {
-      assert.equal(releaseWorkflow.includes(forbidden), false, forbidden);
-    }
-  });
-
-  it("runs preflight before every release side effect", () => {
-    const preflight = jobBlock(releaseWorkflow, "preflight");
-
-    assert.deepEqual(permissionLines(preflight), ["contents: read"]);
-    assertInOrder(preflight, [
-      "actions/checkout@",
-      "fetch-depth: 0",
-      "actions/setup-node@",
-      "node-version: '22.14.0'",
-      "node scripts/release-preflight.js --tag \"$TAG\"",
-      "git rev-parse --verify 'HEAD^{commit}'",
-      "git rev-parse --verify \"refs/tags/${TAG}^{commit}\"",
-      'if [[ "$TAG" == *-beta.* ]]',
-      'git fetch origin "$REHEARSAL_BRANCH"',
-      "git rev-parse --verify 'FETCH_HEAD^{commit}'",
-      "git fetch origin main",
-      'git merge-base --is-ancestor "$HEAD_SHA" "$MAIN_SHA"',
-    ]);
-    assert.equal(preflight.includes("gh release"), false);
-    assert.equal(preflight.includes("npm publish"), false);
-  });
-
-  it("builds a verified staging asset before approval", () => {
-    const build = jobBlock(releaseWorkflow, "build-stage-assets");
-
-    assert.match(build, /needs: preflight/);
-    assert.deepEqual(permissionLines(build), ["contents: read"]);
-    assert.doesNotMatch(build, /^    environment:/m);
-    assert.match(build, /actions\/setup-go@[0-9a-f]{40}/);
-    assert.match(build, /actions\/setup-python@[0-9a-f]{40}/);
-    assert.match(
-      build,
-      /actions\/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6/,
-    );
-    assert.match(build, /node-version: '22.14.0'/);
-    assert.match(build, /registry-url: 'https:\/\/registry\.npmjs\.org'/);
-    assert.match(build, /package-manager-cache: false/);
-    assert.match(build, /npm install --global npm@11\.16\.0/);
-    assert.match(build, /goreleaser\/goreleaser-action@[0-9a-f]{40}/);
-    assert.match(build, /args: release --clean --skip=publish/);
-    assertInOrder(build, [
-      "actions/setup-go@",
-      "actions/setup-python@",
-      "actions/setup-node@",
-      "npm install --global npm@11.16.0",
-      "goreleaser/goreleaser-action@",
-      "sha256sum --check checksums.txt",
-      "cp dist/checksums.txt checksums.txt",
-      "npm pack --ignore-scripts --json",
-      "tar -tzf \"$PACK_FILE\" | grep -qx 'package/checksums.txt'",
-      "actions/upload-artifact@",
-    ]);
-    assert.equal(build.includes("npm stage publish"), false);
-  });
-
-  it("limits the protected job to verifying and staging the prepared npm asset", () => {
-    const publish = jobBlock(releaseWorkflow, "stage-publish");
-
-    assert.match(publish, /needs: build-stage-assets/);
-    assert.deepEqual(permissionLines(publish), ["id-token: write"]);
-    assert.match(publish, /^    environment: npm-production$/m);
-    assert.doesNotMatch(publish, /actions\/checkout@/);
-    assert.doesNotMatch(publish, /goreleaser\/goreleaser-action@/);
-    assert.doesNotMatch(publish, /GITHUB_TOKEN:/);
-    assertInOrder(publish, [
-      "actions/setup-node@",
-      "npm install --global npm@11.16.0",
-      "actions/download-artifact@",
-      "sha256sum --check checksums.txt",
-      "tar -tzf \"$PACK_FILE\" | grep -qx 'package/checksums.txt'",
-      'npm stage publish "${{ steps.asset.outputs.filename }}" --access public --tag beta',
-    ]);
-    for (const forbidden of [
-      "gh release download",
-      "npm view",
-      "LOCAL_INTEGRITY",
-      "REMOTE_INTEGRITY",
-      "secrets.NPM_TOKEN",
-      "NODE_AUTH_TOKEN",
-      "GITHUB_TOKEN:",
-      "gh release create",
-    ]) {
-      assert.equal(releaseWorkflow.includes(forbidden), false, forbidden);
-    }
-    assert.equal(/(^|\s)npm publish(?:\s|$)/m.test(publish), false);
-  });
-});
-
-describe("preview isolation", () => {
-  it("keeps preview publishing away from production credentials and registry", () => {
-    assert.equal(previewWorkflow.includes("id-token: write"), false);
-    assert.equal(previewWorkflow.includes("npm publish"), false);
-    assert.equal(previewWorkflow.includes("registry.npmjs.org"), false);
-    assert.equal(previewWorkflow.includes("secrets.NPM_TOKEN"), false);
-    assert.equal(previewWorkflow.includes("NODE_AUTH_TOKEN"), false);
-  });
-});
--- a/scripts/tag-release.sh
+++ b/scripts/tag-release.sh
@@ -3,102 +3,49 @@ set -euo pipefail

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
-cd "${REPO_ROOT}"

-VERSION=$(node -p "require('./package.json').version")
+# Read version from package.json
+VERSION=$(node -p "require('${REPO_ROOT}/package.json').version")
+
+if [ -z "$VERSION" ]; then
+  echo "Error: could not read version from package.json" >&2
+  exit 1
+fi
+
 TAG="v${VERSION}"
-REHEARSAL_BRANCH="test/npm-staged-publish-rehearsal"
-PUSH_TAG=false
-
-if [ "$#" -eq 1 ] && [ "$1" = "--push" ]; then
-  PUSH_TAG=true
-elif [ "$#" -ne 0 ]; then
-  echo "Usage: $0 [--push]" >&2
-  exit 1
-fi
-
-node "${SCRIPT_DIR}/release-preflight.js" --tag "${TAG}"
-
-if [[ ! "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-beta\.[0-9]+$ ]]; then
-  echo "Error: rehearsal releases require an X.Y.Z-beta.N version." >&2
-  exit 1
-fi

 echo "Version: ${VERSION}"
 echo "Tag: ${TAG}"

-CURRENT_BRANCH=$(git branch --show-current)
-if [ "${CURRENT_BRANCH}" != "${REHEARSAL_BRANCH}" ]; then
-  echo "Error: rehearsal tags must be created from ${REHEARSAL_BRANCH}; current branch is '${CURRENT_BRANCH}'." >&2
-  exit 1
-fi
-
-if [ -n "$(git status --porcelain)" ]; then
-  echo "Error: the working tree must be clean before tagging." >&2
-  exit 1
-fi
-
-git fetch origin "${REHEARSAL_BRANCH}"
-
-HEAD_SHA=$(git rev-parse HEAD)
-FETCHED_REHEARSAL_SHA=$(git rev-parse "FETCH_HEAD^{commit}")
-if [ "${HEAD_SHA}" != "${FETCHED_REHEARSAL_SHA}" ]; then
-  echo "Error: HEAD must exactly match origin/${REHEARSAL_BRANCH} before tagging." >&2
-  exit 1
-fi
-
-WORKFLOW=$(git show "${HEAD_SHA}:.github/workflows/release.yml")
-if ! grep -Fq 'args: release --clean --skip=publish' <<<"${WORKFLOW}" ||
-   ! grep -Eq 'npm stage publish .*--tag beta' <<<"${WORKFLOW}" ||
-   grep -Eq '(^|[[:space:]])npm publish([[:space:]]|$)' <<<"${WORKFLOW}" ||
-   grep -Eq 'gh[[:space:]]+release([[:space:]]|$)' <<<"${WORKFLOW}" ||
-   grep -Eq 'contents:[[:space:]]*write' <<<"${WORKFLOW}" ||
-   grep -Fq 'GITHUB_TOKEN:' <<<"${WORKFLOW}"; then
-  echo "Error: the tagged workflow must be stage-only, read-only for repository contents, and must not create a GitHub Release or publish npm live." >&2
-  exit 1
-fi
-
-set +e
-NPM_VIEW_OUTPUT=$(npm view "@larksuite/cli@${VERSION}" version --registry=https://registry.npmjs.org/ 2>&1)
-NPM_VIEW_STATUS=$?
-set -e
-if [ "${NPM_VIEW_STATUS}" -eq 0 ]; then
-  echo "Error: @larksuite/cli@${VERSION} already exists on npm." >&2
-  exit 1
-fi
-if ! grep -Eq 'E404|404 Not Found' <<<"${NPM_VIEW_OUTPUT}"; then
-  echo "Error: npm version lookup failed; refusing to assume the version is unused." >&2
-  echo "${NPM_VIEW_OUTPUT}" >&2
-  exit 1
-fi
-
-if git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
-  echo "Error: local tag ${TAG} already exists." >&2
-  exit 1
-fi
-
-REMOTE_TAG=$(git ls-remote --tags origin "refs/tags/${TAG}")
-if [ -n "${REMOTE_TAG}" ]; then
-  echo "Error: remote tag ${TAG} already exists." >&2
-  exit 1
-fi
-
-if [ "${PUSH_TAG}" != true ]; then
-  echo "Checks passed. No tag was created or pushed."
-  echo "Run '$0 --push' only after reviewing the commit and workflow."
+# Check if tag already exists locally
+if git rev-parse "$TAG" >/dev/null 2>&1; then
+  echo "Tag ${TAG} already exists locally, skipping."
  exit 0
 fi

-echo "Branch: ${CURRENT_BRANCH}"
-echo "Commit: ${HEAD_SHA}"
-printf 'Type %s to create and push this tag: ' "${TAG}"
-read -r CONFIRM_TAG
-if [ "${CONFIRM_TAG}" != "${TAG}" ]; then
-  echo "Error: confirmation did not exactly match ${TAG}." >&2
+# Check if tag already exists on remote
+if git ls-remote --tags origin "$TAG" | grep -q "$TAG"; then
+  echo "Tag ${TAG} already exists on remote, skipping."
+  exit 0
+fi
+
+# Ensure package.json changes are committed before tagging
+if git diff --name-only | grep -q 'package.json' || git diff --cached --name-only | grep -q 'package.json'; then
+  echo "Error: package.json has uncommitted changes. Please commit before tagging." >&2
  exit 1
 fi

-git tag "${TAG}" "${HEAD_SHA}"
-git push origin "refs/tags/${TAG}:refs/tags/${TAG}"
+# Ensure current branch is pushed to remote before tagging
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+LOCAL_SHA=$(git rev-parse HEAD)
+REMOTE_SHA=$(git rev-parse "origin/${CURRENT_BRANCH}" 2>/dev/null || echo "")
+if [ "$LOCAL_SHA" != "$REMOTE_SHA" ]; then
+  echo "Error: local branch '${CURRENT_BRANCH}' is not in sync with remote. Please push your commits first." >&2
+  exit 1
+fi

-echo "Successfully pushed tag ${TAG}"
+# Create and push tag
+git tag "$TAG"
+git push origin "$TAG"
+
+echo "Successfully created and pushed tag ${TAG}"
--- a/shortcuts/application/shortcuts.go
+++ b/shortcuts/application/shortcuts.go
@@ -1,18 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-// Package application provides shortcuts for Open Platform app
-// self-management (slash commands of the current bound app).
-package application
-
-import "github.com/larksuite/cli/shortcuts/common"
-
-// Shortcuts returns all shortcuts of the application domain.
-func Shortcuts() []common.Shortcut {
-	return []common.Shortcut{
-		SlashCommandList,
-		SlashCommandCreate,
-		SlashCommandUpdate,
-		SlashCommandDelete,
-	}
-}
--- a/shortcuts/application/slash_command_common.go
+++ b/shortcuts/application/slash_command_common.go
@@ -1,105 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"strings"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/validate"
-)
-
-// slashCommandBasePath is the raw v7 endpoint (not in meta_data.json / SDK).
-const slashCommandBasePath = "/open-apis/application/v7/app_slash_commands"
-
-// clientCacheHint is printed to stderr after every successful write.
-const clientCacheHint = "note: changes take ~5 minutes to appear in Feishu clients (client-side cache); the server state is already updated - list reflects it immediately."
-
-// parseDescriptionI18n parses repeated --description-i18n values ("<lang>=<text>",
-// split on the FIRST '='). Returns nil for empty input. Duplicate langs rejected.
-func parseDescriptionI18n(values []string) (map[string]string, error) {
-	if len(values) == 0 {
-		return nil, nil
-	}
-	m := make(map[string]string, len(values))
-	for _, v := range values {
-		idx := strings.Index(v, "=")
-		if idx <= 0 || idx == len(v)-1 {
-			return nil, errs.NewValidationError(errs.SubtypeInvalidArgument,
-				"invalid --description-i18n value %q: expected <lang>=<text> (e.g. zh_cn=你好)", v).
-				WithParam("--description-i18n")
-		}
-		lang := strings.TrimSpace(v[:idx])
-		text := v[idx+1:]
-		if lang == "" || strings.TrimSpace(text) == "" {
-			return nil, errs.NewValidationError(errs.SubtypeInvalidArgument,
-				"invalid --description-i18n value %q: language and text must be non-empty", v).
-				WithParam("--description-i18n")
-		}
-		if _, dup := m[lang]; dup {
-			return nil, errs.NewValidationError(errs.SubtypeInvalidArgument,
-				"duplicate language %q in --description-i18n", lang).
-				WithParam("--description-i18n")
-		}
-		m[lang] = text
-	}
-	return m, nil
-}
-
-// validateCommandName rejects empty and slash-prefixed command names.
-func validateCommandName(name, flagName string) error {
-	trimmed := strings.TrimSpace(name)
-	if trimmed == "" {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"%s must not be empty", flagName).WithParam(flagName)
-	}
-	if strings.HasPrefix(trimmed, "/") {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"%s must not start with \"/\" - the slash is implied (use %q)",
-			flagName, strings.TrimPrefix(trimmed, "/")).WithParam(flagName)
-	}
-	return nil
-}
-
-// encodeCommandIDPathSegment applies the same normalization and escaping to
-// command IDs in dry-run output and real requests.
-func encodeCommandIDPathSegment(id string) string {
-	return validate.EncodePathSegment(strings.TrimSpace(id))
-}
-
-// buildSlashCommandBody assembles a create/update request body. Only provided
-// fields are included: PATCH is field-level partial (absent top-level fields
-// are preserved server-side; a provided i18n map REPLACES the whole map).
-// icon sits at the top level, sibling of description (verified live; the
-// official create sample nesting icon inside description is a doc bug).
-func buildSlashCommandBody(command, description string, i18n map[string]string, iconKey string) map[string]interface{} {
-	body := map[string]interface{}{}
-	if command != "" {
-		body["command"] = command
-	}
-	if description != "" || len(i18n) > 0 {
-		desc := map[string]interface{}{}
-		if description != "" {
-			desc["default_value"] = description
-		}
-		if len(i18n) > 0 {
-			desc["i18n"] = i18n
-		}
-		body["description"] = desc
-	}
-	if iconKey != "" {
-		body["icon"] = map[string]interface{}{"icon_key": iconKey}
-	}
-	return body
-}
-
-// isCommandExists reports whether err is the server-side name-collision error
-// (code=40000000, message contains "command already exists"; verified live).
-func isCommandExists(err error) bool {
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		return false
-	}
-	return p.Code == 40000000 && strings.Contains(p.Message, "command already exists")
-}
--- a/shortcuts/application/slash_command_common_test.go
+++ b/shortcuts/application/slash_command_common_test.go
@@ -1,197 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-func TestParseDescriptionI18n_OK(t *testing.T) {
-	m, err := parseDescriptionI18n([]string{"zh_cn=你好", "en_us=Hello=World"})
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if m["zh_cn"] != "你好" {
-		t.Errorf("zh_cn = %q", m["zh_cn"])
-	}
-	// 只按首个 = 分割：值内可含 =
-	if m["en_us"] != "Hello=World" {
-		t.Errorf("en_us = %q", m["en_us"])
-	}
-}
-
-func TestParseDescriptionI18n_Empty(t *testing.T) {
-	m, err := parseDescriptionI18n(nil)
-	if err != nil || m != nil {
-		t.Fatalf("nil input: m=%v err=%v", m, err)
-	}
-}
-
-func TestParseDescriptionI18n_BadFormat(t *testing.T) {
-	for _, bad := range []string{"zh_cn", "=text", "zh_cn=", "  =x"} {
-		_, err := parseDescriptionI18n([]string{bad})
-		if err == nil {
-			t.Errorf("%q: expected error", bad)
-			continue
-		}
-		p, ok := errs.ProblemOf(err)
-		if !ok || p.Category != errs.CategoryValidation || p.Subtype != errs.SubtypeInvalidArgument {
-			t.Errorf("%q: expected validation problem, got %v", bad, err)
-		}
-	}
-}
-
-func TestParseDescriptionI18n_DuplicateLang(t *testing.T) {
-	_, err := parseDescriptionI18n([]string{"zh_cn=a", "zh_cn=b"})
-	if err == nil {
-		t.Fatal("expected duplicate language error")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok || p.Category != errs.CategoryValidation || p.Subtype != errs.SubtypeInvalidArgument {
-		t.Fatalf("expected validation/invalid_argument, got %v", err)
-	}
-	var validationErr *errs.ValidationError
-	if !errors.As(err, &validationErr) || validationErr.Param != "--description-i18n" {
-		t.Fatalf("expected param --description-i18n, got %#v", validationErr)
-	}
-}
-
-func TestValidateCommandName(t *testing.T) {
-	if err := validateCommandName("greet", "--command"); err != nil {
-		t.Fatalf("greet: %v", err)
-	}
-	for _, bad := range []string{"", "  ", "/greet"} {
-		if err := validateCommandName(bad, "--command"); err == nil {
-			t.Errorf("%q: expected error", bad)
-		}
-	}
-}
-
-func TestBuildSlashCommandBody(t *testing.T) {
-	body := buildSlashCommandBody("greet", "hi", map[string]string{"zh_cn": "你好"}, "skill_outlined")
-	if body["command"] != "greet" {
-		t.Errorf("command = %v", body["command"])
-	}
-	desc := body["description"].(map[string]interface{})
-	if desc["default_value"] != "hi" {
-		t.Errorf("default_value = %v", desc["default_value"])
-	}
-	if desc["i18n"].(map[string]string)["zh_cn"] != "你好" {
-		t.Errorf("i18n = %v", desc["i18n"])
-	}
-	// icon 与 description 顶层平级（实测钉死，文档 create 示例是笔误）
-	if body["icon"].(map[string]interface{})["icon_key"] != "skill_outlined" {
-		t.Errorf("icon = %v", body["icon"])
-	}
-	// partial：不提供的字段不出现（PATCH 语义依赖）
-	partial := buildSlashCommandBody("", "", nil, "skill_outlined")
-	if _, has := partial["command"]; has {
-		t.Error("empty command must be omitted")
-	}
-	if _, has := partial["description"]; has {
-		t.Error("empty description must be omitted")
-	}
-}
-
-func TestIsCommandExists(t *testing.T) {
-	tests := []struct {
-		name string
-		err  error
-		want bool
-	}{
-		{
-			name: "matching code and message",
-			err: errs.NewAPIError(errs.SubtypeUnknown,
-				"Invalid Param 'command'. command already exists.").WithCode(40000000),
-			want: true,
-		},
-		{
-			name: "same message with different code",
-			err: errs.NewAPIError(errs.SubtypeUnknown,
-				"Invalid Param 'command'. command already exists.").WithCode(40000031),
-		},
-		{
-			name: "same code with different message",
-			err: errs.NewAPIError(errs.SubtypeUnknown,
-				"Invalid Param 'icon_key'. icon_key is invalid.").WithCode(40000000),
-		},
-		{name: "nil error"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := isCommandExists(tt.err); got != tt.want {
-				t.Fatalf("isCommandExists() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-// TestSlashCommandShortcuts_SharedScopesAcrossIdentities locks in the
-// reversal of the OAuth-isolation design: all four slash-command shortcuts
-// declare identical scopes for the bot and user identities (plain Scopes /
-// ConditionalScopes, no per-identity overrides), so a user-identity
-// pre-flight sees the same scope set a bot identity would.
-func TestSlashCommandShortcuts_SharedScopesAcrossIdentities(t *testing.T) {
-	cases := []struct {
-		name            string
-		shortcut        common.Shortcut
-		wantScope       string
-		wantConditional string
-		hasConditional  bool
-	}{
-		{
-			name:      "list",
-			shortcut:  SlashCommandList,
-			wantScope: "application:app_slash_command:read",
-		},
-		{
-			name:            "create",
-			shortcut:        SlashCommandCreate,
-			wantScope:       "application:app_slash_command:write",
-			wantConditional: "application:app_slash_command:read",
-			hasConditional:  true,
-		},
-		{
-			name:            "update",
-			shortcut:        SlashCommandUpdate,
-			wantScope:       "application:app_slash_command:write",
-			wantConditional: "application:app_slash_command:read",
-			hasConditional:  true,
-		},
-		{
-			name:            "delete",
-			shortcut:        SlashCommandDelete,
-			wantScope:       "application:app_slash_command:write",
-			wantConditional: "application:app_slash_command:read",
-			hasConditional:  true,
-		},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			for _, identity := range []string{"user", "bot"} {
-				declared := tc.shortcut.DeclaredScopesForIdentity(identity)
-				if !containsStr(declared, tc.wantScope) {
-					t.Errorf("%s: DeclaredScopesForIdentity(%q) = %v, want to contain %q", tc.name, identity, declared, tc.wantScope)
-				}
-				if tc.hasConditional && !containsStr(declared, tc.wantConditional) {
-					t.Errorf("%s: DeclaredScopesForIdentity(%q) = %v, want to contain conditional %q", tc.name, identity, declared, tc.wantConditional)
-				}
-			}
-		})
-	}
-}
-
-func containsStr(list []string, want string) bool {
-	for _, v := range list {
-		if v == want {
-			return true
-		}
-	}
-	return false
-}
--- a/shortcuts/application/slash_command_create.go
+++ b/shortcuts/application/slash_command_create.go
@@ -1,118 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// SlashCommandCreate registers a new slash command on the current bound app.
-var SlashCommandCreate = common.Shortcut{
-	Service:     "application",
-	Command:     "+slash-command-create",
-	Description: "Register a slash command (/ command) on the current bound Open Platform app; --force converts a name collision into an update (idempotent re-run)",
-	Risk:        "write",
-	Scopes:      []string{"application:app_slash_command:write"},
-	ConditionalScopes: []string{
-		"application:app_slash_command:read", // only the --force collision path lists to resolve the id
-	},
-	AuthTypes: []string{"bot", "user"},
-	Flags: []common.Flag{
-		{Name: "command", Desc: "command name WITHOUT the leading slash (server enforces uniqueness per app; max 100 commands)", Required: true},
-		{Name: "description", Desc: "default description shown in the client command panel (description.default_value)", Required: true},
-		{Name: "description-i18n", Type: "string_array", Desc: "localized description, repeatable, format <lang>=<text> (e.g. zh_cn=发送问候); language codes are passed through to the server"},
-		{Name: "icon-key", Desc: "icon key (server default: skill_outlined; invalid keys are rejected server-side with code 40000031)"},
-		{Name: "force", Type: "bool", Desc: "on name collision, resolve the existing command by name and update it in place"},
-	},
-	Tips: []string{
-		`lark-cli application +slash-command-create --command greet --description "say hi" --description-i18n zh_cn=问候 --as bot`,
-		"changes take ~5 minutes to appear in clients (client-side cache); the server updates immediately",
-		"user identity needs explicit authorization first: lark-cli auth login --scope application:app_slash_command:write",
-	},
-	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		if err := validateCommandName(runtime.Str("command"), "--command"); err != nil {
-			return err
-		}
-		if len(strings.TrimSpace(runtime.Str("description"))) == 0 {
-			return errs.NewValidationError(errs.SubtypeInvalidArgument,
-				"--description must not be blank").WithParam("--description")
-		}
-		if _, err := parseDescriptionI18n(runtime.StrArray("description-i18n")); err != nil {
-			return err
-		}
-		return nil
-	},
-	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		i18n, err := parseDescriptionI18n(runtime.StrArray("description-i18n"))
-		if err != nil {
-			// The CLI validates first; keep this guard for direct DryRun callers.
-			return common.NewDryRunAPI().Set("error", err.Error())
-		}
-		name := strings.TrimSpace(runtime.Str("command"))
-		body := buildSlashCommandBody(name, runtime.Str("description"), i18n, runtime.Str("icon-key"))
-		d := common.NewDryRunAPI().
-			Desc("Create a slash command on the current bound app").
-			POST(slashCommandBasePath).
-			Body(body)
-		if runtime.Bool("force") {
-			d.Desc("--force: on 'command already exists' (code 40000000), GET list to resolve command_id then PATCH the same body")
-		}
-		return d
-	},
-	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		name := strings.TrimSpace(runtime.Str("command"))
-		i18n, err := parseDescriptionI18n(runtime.StrArray("description-i18n"))
-		if err != nil {
-			return err
-		}
-		body := buildSlashCommandBody(name, runtime.Str("description"), i18n, runtime.Str("icon-key"))
-
-		data, err := runtime.CallAPITyped("POST", slashCommandBasePath, nil, body)
-		action := "created"
-		if err != nil {
-			if !isCommandExists(err) {
-				return err
-			}
-			if !runtime.Bool("force") {
-				p, _ := errs.ProblemOf(err)
-				rewrapped := errs.NewAPIError(errs.SubtypeAlreadyExists, "slash command %q already exists", name).
-					WithHint("rerun with --force to update it, or use `lark-cli application +slash-command-update --command %q`", name).
-					WithCause(err)
-				if p.Code != 0 {
-					rewrapped = rewrapped.WithCode(p.Code)
-				}
-				if p.LogID != "" {
-					rewrapped = rewrapped.WithLogID(p.LogID)
-				}
-				return rewrapped
-			}
-			// --force: name collision -> resolve id -> PATCH (idempotent re-run).
-			id, rerr := resolveCommandID(runtime, name)
-			if rerr != nil {
-				return rerr
-			}
-			patchBody := buildSlashCommandBody("", runtime.Str("description"), i18n, runtime.Str("icon-key"))
-			data, err = runtime.CallAPITyped("PATCH", slashCommandBasePath+"/"+encodeCommandIDPathSegment(id), nil, patchBody)
-			if err != nil {
-				return err
-			}
-			action = "updated"
-		}
-		if data == nil {
-			data = map[string]interface{}{}
-		}
-		data["action"] = action
-		fmt.Fprintln(runtime.IO().ErrOut, clientCacheHint)
-		runtime.OutFormat(data, nil, func(w io.Writer) {
-			fmt.Fprintf(w, "%s /%v (command_id: %v)\n", action, data["command"], data["command_id"])
-		})
-		return nil
-	},
-}
--- a/shortcuts/application/slash_command_create_test.go
+++ b/shortcuts/application/slash_command_create_test.go
@@ -1,229 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"encoding/json"
-	"errors"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/httpmock"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-func createOKStub() *httpmock.Stub {
-	return &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/application/v7/app_slash_commands",
-		Body: map[string]interface{}{
-			"code": 0, "msg": "success",
-			"data": sampleItem("greet", "id-new"),
-		},
-	}
-}
-
-func createConflictStub() *httpmock.Stub {
-	return &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/application/v7/app_slash_commands",
-		Body: map[string]interface{}{
-			"code": 40000000, "msg": "Invalid Param 'command'. command already exists.",
-		},
-	}
-}
-
-func patchOKStub(id string) *httpmock.Stub {
-	return &httpmock.Stub{
-		Method: "PATCH",
-		URL:    "/open-apis/application/v7/app_slash_commands/" + id,
-		Body: map[string]interface{}{
-			"code": 0, "msg": "success",
-			"data": sampleItem("greet", id),
-		},
-	}
-}
-
-func TestSlashCommandCreate_OK(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(createOKStub())
-
-	err := mountAndRun(t, SlashCommandCreate, []string{"+slash-command-create",
-		"--command", "greet", "--description", "hi",
-		"--description-i18n", "zh_cn=你好", "--description-i18n", "en_us=Hello",
-		"--icon-key", "skill_outlined", "--format", "json", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var got map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &got); err != nil {
-		t.Fatalf("json: %v\n%s", err, stdout.String())
-	}
-	data := got["data"].(map[string]interface{})
-	if data["action"] != "created" {
-		t.Fatalf("action = %v", data["action"])
-	}
-	if data["command_id"] != "id-new" {
-		t.Fatalf("command_id = %v", data["command_id"])
-	}
-}
-
-func TestSlashCommandCreate_ValidateRejects(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, appTestConfig())
-	cases := [][]string{
-		{"+slash-command-create", "--command", "/greet", "--description", "hi", "--as", "bot"},
-		{"+slash-command-create", "--command", "greet", "--description", "hi", "--description-i18n", "bad", "--as", "bot"},
-		{"+slash-command-create", "--command", "greet", "--description", "hi", "--description-i18n", "zh_cn=a", "--description-i18n", "zh_cn=b", "--as", "bot"},
-		{"+slash-command-create", "--command", "greet", "--description", "  ", "--as", "bot"},
-	}
-	for i, args := range cases {
-		err := mountAndRun(t, SlashCommandCreate, args, f, stdout)
-		if err == nil {
-			t.Errorf("case %d: expected validation error", i)
-			continue
-		}
-		p, ok := errs.ProblemOf(err)
-		if !ok || p.Category != errs.CategoryValidation {
-			t.Errorf("case %d: expected validation problem, got %v", i, err)
-		}
-	}
-}
-
-func TestSlashCommandCreate_ConflictNoForce(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(createConflictStub())
-
-	err := mountAndRun(t, SlashCommandCreate, []string{"+slash-command-create",
-		"--command", "greet", "--description", "hi", "--as", "bot"}, f, stdout)
-	if err == nil {
-		t.Fatal("expected conflict error")
-	}
-	p, _ := errs.ProblemOf(err)
-	if p == nil || p.Category != errs.CategoryAPI || p.Subtype != errs.SubtypeAlreadyExists || p.Code != 40000000 {
-		t.Fatalf("expected api/already_exists code 40000000, got %#v", p)
-	}
-	if !strings.Contains(p.Hint, "--force") || !strings.Contains(p.Hint, "+slash-command-update") {
-		t.Fatalf("hint must offer --force and update, got %q", p.Hint)
-	}
-	var apiErr *errs.APIError
-	if !errors.As(err, &apiErr) {
-		t.Fatalf("rewrapped error must be *errs.APIError, got %T", err)
-	}
-	if errors.Unwrap(apiErr) == nil {
-		t.Fatal("rewrapped conflict error must preserve the original cause via WithCause")
-	}
-}
-
-func TestSlashCommandCreate_ForceConvertsToUpdate(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(createConflictStub())
-	reg.Register(listStub([]interface{}{sampleItem("greet", "id-exist")}))
-	reg.Register(patchOKStub("id-exist"))
-
-	err := mountAndRun(t, SlashCommandCreate, []string{"+slash-command-create",
-		"--command", "greet", "--description", "hi2", "--force", "--format", "json", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var got map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &got); err != nil {
-		t.Fatalf("json: %v", err)
-	}
-	data := got["data"].(map[string]interface{})
-	if data["action"] != "updated" {
-		t.Fatalf("action = %v (force must convert to update)", data["action"])
-	}
-}
-
-func TestSlashCommandCreate_TrimsCommandBeforeCreateAndForceResolution(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	conflict := createConflictStub()
-	reg.Register(conflict)
-	reg.Register(listStub([]interface{}{sampleItem("greet", "id-exist")}))
-	reg.Register(patchOKStub("id-exist"))
-
-	err := mountAndRun(t, SlashCommandCreate, []string{"+slash-command-create",
-		"--command", " greet ", "--description", "hi", "--force", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var body map[string]interface{}
-	if err := json.Unmarshal(conflict.CapturedBody, &body); err != nil {
-		t.Fatalf("decode captured create body: %v", err)
-	}
-	if body["command"] != "greet" {
-		t.Fatalf("command = %q, want trimmed value %q", body["command"], "greet")
-	}
-}
-
-func createIconInvalidStub() *httpmock.Stub {
-	return &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/application/v7/app_slash_commands",
-		Body: map[string]interface{}{
-			"code": 40000031, "msg": "Invalid Param 'icon_key'. icon_key is invalid.",
-		},
-	}
-}
-
-// TestSlashCommandCreate_ForceDoesNotConvertNonConflict guards against --force
-// blindly treating ANY POST failure as a name collision: only the
-// "command already exists" (40000000) shape may fall through to the
-// GET+PATCH idempotent-update path. No PATCH stub is registered here, so if
-// the code mistakenly attempted a PATCH, the httpmock registry would fail
-// the unexpected request and surface a different (registry) error instead
-// of the original icon_key failure asserted below.
-func TestSlashCommandCreate_ForceDoesNotConvertNonConflict(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(createIconInvalidStub())
-
-	err := mountAndRun(t, SlashCommandCreate, []string{"+slash-command-create",
-		"--command", "greet", "--description", "hi", "--icon-key", "bogus", "--force", "--as", "bot"}, f, stdout)
-	if err == nil {
-		t.Fatal("expected the original icon_key error, got nil")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok || p.Category != errs.CategoryAPI || p.Subtype == errs.SubtypeAlreadyExists || p.Code != 40000031 {
-		t.Fatalf("expected original API error code 40000031 without collision reclassification, got %#v", p)
-	}
-}
-
-func TestSlashCommandCreate_DryRun(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, appTestConfig())
-	if err := mountAndRun(t, SlashCommandCreate, []string{"+slash-command-create",
-		"--command", "greet", "--description", "hi", "--icon-key", "skill_outlined", "--dry-run", "--as", "bot"}, f, stdout); err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	out := stdout.String()
-	if !strings.Contains(out, "POST") || !strings.Contains(out, slashCommandBasePath) {
-		t.Fatalf("dry-run must show POST path: %s", out)
-	}
-	// icon 顶层：dry-run body 里 icon 不嵌套在 description 内
-	if !strings.Contains(out, "icon_key") {
-		t.Fatalf("dry-run must include body: %s", out)
-	}
-}
-
-func TestSlashCommandCreate_ForceHelpHasNoMetavar(t *testing.T) {
-	parent := &cobra.Command{Use: "application"}
-	SlashCommandCreate.Mount(parent, &cmdutil.Factory{})
-	cmd := parent.Commands()[0]
-	forceFlag := cmd.Flags().Lookup("force")
-	if forceFlag == nil {
-		t.Fatal("missing --force flag")
-	}
-	placeholder, usage := pflag.UnquoteUsage(forceFlag)
-	if placeholder != "" {
-		t.Fatalf("boolean --force must not render a value placeholder, got %q", placeholder)
-	}
-	if !strings.Contains(usage, "update it in place") || strings.Contains(usage, "gh ") {
-		t.Fatalf("unexpected --force help: %q", usage)
-	}
-	if help := cmd.Flags().FlagUsages(); !strings.Contains(help, "--force") || !strings.Contains(help, "update it in place") {
-		t.Fatalf("rendered help missing --force description:\n%s", help)
-	}
-}
--- a/shortcuts/application/slash_command_delete.go
+++ b/shortcuts/application/slash_command_delete.go
@@ -1,85 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// SlashCommandDelete removes a slash command (irreversible; command_id is not
-// reused - recreating the same name yields a NEW id).
-var SlashCommandDelete = common.Shortcut{
-	Service:     "application",
-	Command:     "+slash-command-delete",
-	Description: "Delete a slash command from the current bound app (high-risk: irreversible; recreating the same name yields a new command_id)",
-	Risk:        "high-risk-write",
-	Scopes:      []string{"application:app_slash_command:write"},
-	ConditionalScopes: []string{
-		"application:app_slash_command:read", // only the --command by-name path
-	},
-	AuthTypes: []string{"bot", "user"},
-	Flags: []common.Flag{
-		{Name: "command-id", Desc: "target command_id; mutually exclusive with --command"},
-		{Name: "command", Desc: "target command name WITHOUT leading slash (resolved via live list, needs read scope); mutually exclusive with --command-id"},
-	},
-	Tips: []string{
-		"lark-cli application +slash-command-delete --command greet --yes --as bot",
-		"deleted commands may linger in clients for ~5 minutes (client cache)",
-	},
-	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		id := strings.TrimSpace(runtime.Str("command-id"))
-		name := strings.TrimSpace(runtime.Str("command"))
-		if (id == "") == (name == "") {
-			return errs.NewValidationError(errs.SubtypeInvalidArgument,
-				"provide exactly one of --command-id or --command").WithParam("--command-id")
-		}
-		if name != "" {
-			return validateCommandName(name, "--command")
-		}
-		return nil
-	},
-	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		d := common.NewDryRunAPI().Desc("HIGH-RISK: delete a slash command (irreversible; same-name recreate gets a NEW command_id)")
-		target := strings.TrimSpace(runtime.Str("command-id"))
-		if target == "" {
-			name := strings.TrimSpace(runtime.Str("command"))
-			d.GET(slashCommandBasePath).
-				Desc(fmt.Sprintf("resolve command_id by name %q via GET list first", name))
-			target = "<resolved_command_id>"
-		} else {
-			target = encodeCommandIDPathSegment(target)
-		}
-		return d.DELETE(slashCommandBasePath + "/" + target)
-	},
-	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		id := strings.TrimSpace(runtime.Str("command-id"))
-		name := strings.TrimSpace(runtime.Str("command"))
-		if id == "" {
-			resolved, err := resolveCommandID(runtime, name)
-			if err != nil {
-				return err
-			}
-			id = resolved
-		}
-		if _, err := runtime.CallAPITyped("DELETE", slashCommandBasePath+"/"+encodeCommandIDPathSegment(id), nil, nil); err != nil {
-			return err
-		}
-		out := map[string]interface{}{"action": "deleted", "command_id": id}
-		if name != "" {
-			out["command"] = name
-		}
-		fmt.Fprintln(runtime.IO().ErrOut, clientCacheHint)
-		fmt.Fprintln(runtime.IO().ErrOut, "note: recreating the same command name will yield a NEW command_id.")
-		runtime.OutFormat(out, nil, func(w io.Writer) {
-			fmt.Fprintf(w, "deleted command_id %s\n", id)
-		})
-		return nil
-	},
-}
--- a/shortcuts/application/slash_command_delete_test.go
+++ b/shortcuts/application/slash_command_delete_test.go
@@ -1,135 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-func deleteOKStub(id string) *httpmock.Stub {
-	return &httpmock.Stub{
-		Method: "DELETE",
-		URL:    slashCommandBasePath + "/" + id,
-		Body:   map[string]interface{}{"code": 0, "msg": "success", "data": map[string]interface{}{}},
-	}
-}
-
-func TestSlashCommandDelete_RequiresYes(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, appTestConfig())
-	err := mountAndRun(t, SlashCommandDelete, []string{"+slash-command-delete",
-		"--command-id", "id1", "--as", "bot"}, f, stdout)
-	if err == nil {
-		t.Fatal("expected confirmation_required without --yes")
-	}
-	if errs.CategoryOf(err) != errs.CategoryConfirmation {
-		t.Fatalf("expected confirmation category, got %v (%v)", errs.CategoryOf(err), err)
-	}
-}
-
-func TestSlashCommandDelete_ByIDWithYes(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(deleteOKStub("id1"))
-
-	err := mountAndRun(t, SlashCommandDelete, []string{"+slash-command-delete",
-		"--command-id", "id1", "--yes", "--format", "json", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var got map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &got); err != nil {
-		t.Fatalf("json: %v", err)
-	}
-	data := got["data"].(map[string]interface{})
-	// 上游 DELETE 返回空对象；CLI 必须补 action/command_id（写操作返回资源 ID）
-	if data["action"] != "deleted" || data["command_id"] != "id1" {
-		t.Fatalf("data = %v", data)
-	}
-}
-
-func TestSlashCommandDelete_ByNameWithYes(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(listStub([]interface{}{sampleItem("greet", "id7")}))
-	reg.Register(deleteOKStub("id7"))
-
-	err := mountAndRun(t, SlashCommandDelete, []string{"+slash-command-delete",
-		"--command", "greet", "--yes", "--format", "json", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var got map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &got); err != nil {
-		t.Fatalf("json: %v", err)
-	}
-	data := got["data"].(map[string]interface{})
-	if data["command"] != "greet" || data["command_id"] != "id7" {
-		t.Fatalf("data = %v", data)
-	}
-}
-
-func TestSlashCommandDelete_ByNameDryRun(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, appTestConfig())
-
-	err := mountAndRun(t, SlashCommandDelete, []string{"+slash-command-delete",
-		"--command", "greet", "--dry-run", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var envlp struct {
-		Data struct {
-			Description string `json:"description"`
-			API         []struct {
-				Desc   string `json:"desc"`
-				Method string `json:"method"`
-			} `json:"api"`
-		} `json:"data"`
-	}
-	if err := json.Unmarshal(stdout.Bytes(), &envlp); err != nil {
-		t.Fatalf("json: %v", err)
-	}
-	got := envlp.Data
-	if !strings.Contains(got.Description, "HIGH-RISK") || strings.Contains(got.Description, "resolve command_id") {
-		t.Fatalf("top-level description must contain only the risk context: %q", got.Description)
-	}
-	if len(got.API) != 2 || got.API[0].Method != "GET" || !strings.Contains(got.API[0].Desc, "resolve command_id") {
-		t.Fatalf("first call must describe name resolution: %#v", got.API)
-	}
-	if got.API[1].Method != "DELETE" || strings.Contains(got.API[1].Desc, "resolve command_id") {
-		t.Fatalf("second call must be the delete without the resolve description: %#v", got.API)
-	}
-}
-
-func TestSlashCommandDelete_Validate(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, appTestConfig())
-	for _, args := range [][]string{
-		{"+slash-command-delete", "--yes", "--as", "bot"},
-		{"+slash-command-delete", "--command-id", "id1", "--command", "greet", "--yes", "--as", "bot"},
-	} {
-		err := mountAndRun(t, SlashCommandDelete, args, f, stdout)
-		if err == nil {
-			t.Errorf("%v: expected validation error", args)
-			continue
-		}
-		p, ok := errs.ProblemOf(err)
-		if !ok || p.Category != errs.CategoryValidation || p.Subtype != errs.SubtypeInvalidArgument {
-			t.Errorf("%v: expected validation problem, got %v", args, err)
-		}
-	}
-}
-
-func TestSlashCommandDelete_ByIDEncodesTrimmedPathSegment(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(deleteOKStub("id%2Fwith%20space%3Fx"))
-
-	err := mountAndRun(t, SlashCommandDelete, []string{"+slash-command-delete",
-		"--command-id", " id/with space?x ", "--yes", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-}
--- a/shortcuts/application/slash_command_list.go
+++ b/shortcuts/application/slash_command_list.go
@@ -1,58 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"context"
-	"fmt"
-	"io"
-
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// SlashCommandList lists all slash commands of the current bound app.
-var SlashCommandList = common.Shortcut{
-	Service:     "application",
-	Command:     "+slash-command-list",
-	Description: "List all slash commands (/ commands) registered on the currently bound Open Platform app; source of command_id for update/delete",
-	Risk:        "read",
-	Scopes:      []string{"application:app_slash_command:read"},
-	AuthTypes:   []string{"bot", "user"},
-	Tips: []string{
-		"lark-cli application +slash-command-list --as bot",
-		"user identity needs explicit authorization first: lark-cli auth login --scope application:app_slash_command:read",
-		"the upstream API returns all commands at once (max 100 per app, no pagination)",
-	},
-	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		return common.NewDryRunAPI().
-			Desc("List all slash commands of the current bound app (read-only)").
-			GET(slashCommandBasePath)
-	},
-	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		data, err := runtime.CallAPITyped("GET", slashCommandBasePath, nil, nil)
-		if err != nil {
-			return err
-		}
-		items, _ := data["items"].([]interface{})
-		if items == nil {
-			items = []interface{}{}
-		}
-		out := map[string]interface{}{"items": items, "count": len(items)}
-		runtime.OutFormat(out, nil, func(w io.Writer) {
-			fmt.Fprintf(w, "%d slash command(s)\n", len(items))
-			for _, it := range items {
-				m, ok := it.(map[string]interface{})
-				if !ok {
-					continue
-				}
-				desc := ""
-				if d, ok := m["description"].(map[string]interface{}); ok {
-					desc, _ = d["default_value"].(string)
-				}
-				fmt.Fprintf(w, "  /%v\t%v\t%s\n", m["command"], m["command_id"], desc)
-			}
-		})
-		return nil
-	},
-}
--- a/shortcuts/application/slash_command_list_test.go
+++ b/shortcuts/application/slash_command_list_test.go
@@ -1,115 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"bytes"
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/core"
-	"github.com/larksuite/cli/internal/httpmock"
-	"github.com/larksuite/cli/shortcuts/common"
-	"github.com/spf13/cobra"
-)
-
-func appTestConfig() *core.CliConfig {
-	return &core.CliConfig{AppID: "test-app", AppSecret: "test-secret", Brand: core.BrandFeishu}
-}
-
-// mountAndRun mounts the shortcut under a parent cobra command and runs it.
-// Mirrors shortcuts/contact tests.
-func mountAndRun(t *testing.T, s common.Shortcut, args []string, f *cmdutil.Factory, stdout *bytes.Buffer) error {
-	t.Helper()
-	parent := &cobra.Command{Use: "application"}
-	s.Mount(parent, f)
-	parent.SetArgs(args)
-	parent.SilenceErrors = true
-	parent.SilenceUsage = true
-	if stdout != nil {
-		stdout.Reset()
-	}
-	return parent.Execute()
-}
-
-func listStub(items []interface{}) *httpmock.Stub {
-	return &httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/application/v7/app_slash_commands",
-		Body: map[string]interface{}{
-			"code": 0, "msg": "success",
-			"data": map[string]interface{}{"items": items},
-		},
-	}
-}
-
-func sampleItem(name, id string) map[string]interface{} {
-	return map[string]interface{}{
-		"command": name, "command_id": id,
-		"create_time": "1783318553", "update_time": "1783318553",
-		"description": map[string]interface{}{"default_value": "desc of " + name},
-		"icon":        map[string]interface{}{"icon_key": "skill_outlined"},
-	}
-}
-
-func TestSlashCommandList_JSON(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(listStub([]interface{}{sampleItem("greet", "id1"), sampleItem("weather", "id2")}))
-
-	if err := mountAndRun(t, SlashCommandList, []string{"+slash-command-list", "--format", "json", "--as", "bot"}, f, stdout); err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var got map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &got); err != nil {
-		t.Fatalf("json: %v\n%s", err, stdout.String())
-	}
-	data := got["data"].(map[string]interface{})
-	items := data["items"].([]interface{})
-	if len(items) != 2 {
-		t.Fatalf("items = %d", len(items))
-	}
-	if data["count"] != float64(2) {
-		t.Fatalf("count = %v", data["count"])
-	}
-	first := items[0].(map[string]interface{})
-	for _, k := range []string{"command", "command_id", "description", "icon", "create_time", "update_time"} {
-		if _, ok := first[k]; !ok {
-			t.Errorf("missing item key %q", k)
-		}
-	}
-}
-
-func TestSlashCommandList_Empty(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(listStub(nil))
-
-	if err := mountAndRun(t, SlashCommandList, []string{"+slash-command-list", "--format", "json", "--as", "bot"}, f, stdout); err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var got map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &got); err != nil {
-		t.Fatalf("json: %v", err)
-	}
-	data := got["data"].(map[string]interface{})
-	items, ok := data["items"].([]interface{})
-	if !ok || len(items) != 0 {
-		t.Fatalf("empty list must be [] not %v", data["items"])
-	}
-	if data["count"] != float64(0) {
-		t.Fatalf("count = %v", data["count"])
-	}
-}
-
-func TestSlashCommandList_DryRun(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, appTestConfig())
-	if err := mountAndRun(t, SlashCommandList, []string{"+slash-command-list", "--dry-run", "--as", "bot"}, f, stdout); err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	out := stdout.String()
-	if !strings.Contains(out, "/open-apis/application/v7/app_slash_commands") || !strings.Contains(out, "GET") {
-		t.Fatalf("dry-run must show GET path, got %s", out)
-	}
-}
--- a/shortcuts/application/slash_command_resolve.go
+++ b/shortcuts/application/slash_command_resolve.go
@@ -1,54 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// matchCommandID finds the command_id of the item whose "command" equals
-// name (exact match - the server enforces name uniqueness, so first hit is the
-// only hit).
-func matchCommandID(items []interface{}, name string) string {
-	for _, it := range items {
-		m, ok := it.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		if m["command"] == name {
-			id, _ := m["command_id"].(string)
-			if id != "" {
-				return id
-			}
-		}
-	}
-	return ""
-}
-
-// commandNotFoundError reports a resolution miss against the live list as an
-// API-category not-found error (the name is a valid argument shape; the
-// resource simply does not exist server-side - this is not a validation
-// failure of caller input).
-func commandNotFoundError(name string) error {
-	return errs.NewAPIError(errs.SubtypeNotFound,
-		"slash command %q not found in the current bound app", name).
-		WithHint("run `lark-cli application +slash-command-list` to see registered commands")
-}
-
-// resolveCommandID resolves a command name to its command_id via the live
-// list endpoint (in-memory only; never touches local files). Requires the
-// read scope on the current identity.
-func resolveCommandID(runtime *common.RuntimeContext, name string) (string, error) {
-	data, err := runtime.CallAPITyped("GET", slashCommandBasePath, nil, nil)
-	if err != nil {
-		return "", err
-	}
-	items, _ := data["items"].([]interface{})
-	id := matchCommandID(items, name)
-	if id == "" {
-		return "", commandNotFoundError(name)
-	}
-	return id, nil
-}
--- a/shortcuts/application/slash_command_resolve_test.go
+++ b/shortcuts/application/slash_command_resolve_test.go
@@ -1,41 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-)
-
-func TestMatchCommandID(t *testing.T) {
-	items := []interface{}{
-		sampleItem("greet", "id1"),
-		sampleItem("weather", "id2"),
-	}
-	id := matchCommandID(items, "weather")
-	if id != "id2" {
-		t.Fatalf("got id=%q", id)
-	}
-	id = matchCommandID(items, "nope")
-	if id != "" {
-		t.Fatalf("miss should return empty, got id=%q", id)
-	}
-	// 精确匹配：大小写与空白不做宽容
-	id = matchCommandID(items, "Greet")
-	if id != "" {
-		t.Fatalf("match must be exact, got %q", id)
-	}
-}
-
-func TestResolveNotFoundErrorShape(t *testing.T) {
-	err := commandNotFoundError("nope")
-	if err == nil {
-		t.Fatalf("err = %v", err)
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok || p.Category != errs.CategoryAPI || p.Subtype != errs.SubtypeNotFound {
-		t.Fatalf("expected api/not_found, got %#v", p)
-	}
-}
--- a/shortcuts/application/slash_command_update.go
+++ b/shortcuts/application/slash_command_update.go
@@ -1,124 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// validateUpdateTarget enforces: exactly one of --command-id/--command, and at
-// least one editable field; --description-i18n requires --description (PATCH
-// replaces the whole description object - sending i18n alone would drop
-// default_value, so both values must be provided together).
-func validateUpdateTarget(runtime *common.RuntimeContext) error {
-	id := strings.TrimSpace(runtime.Str("command-id"))
-	name := strings.TrimSpace(runtime.Str("command"))
-	if (id == "") == (name == "") {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"provide exactly one of --command-id or --command").WithParam("--command-id")
-	}
-	if name != "" {
-		if err := validateCommandName(name, "--command"); err != nil {
-			return err
-		}
-	}
-	hasDesc := strings.TrimSpace(runtime.Str("description")) != ""
-	hasI18n := len(runtime.StrArray("description-i18n")) > 0
-	hasIcon := strings.TrimSpace(runtime.Str("icon-key")) != ""
-	if !hasDesc && !hasI18n && !hasIcon {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"provide at least one of --description / --description-i18n / --icon-key").WithParam("--description")
-	}
-	if hasI18n && !hasDesc {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"--description-i18n requires --description: PATCH replaces the whole description object, so default_value must be provided together").WithParam("--description-i18n")
-	}
-	if _, err := parseDescriptionI18n(runtime.StrArray("description-i18n")); err != nil {
-		return err
-	}
-	return nil
-}
-
-// SlashCommandUpdate updates description/i18n/icon of an existing slash command.
-var SlashCommandUpdate = common.Shortcut{
-	Service:     "application",
-	Command:     "+slash-command-update",
-	Description: "Update description / localized descriptions / icon of a slash command on the current bound app, addressed by --command-id or by name via --command",
-	Risk:        "write",
-	Scopes:      []string{"application:app_slash_command:write"},
-	ConditionalScopes: []string{
-		"application:app_slash_command:read", // only the --command by-name path lists to resolve the id
-	},
-	AuthTypes: []string{"bot", "user"},
-	Flags: []common.Flag{
-		{Name: "command-id", Desc: "target command_id (from +slash-command-list or create output); mutually exclusive with --command"},
-		{Name: "command", Desc: "target command name WITHOUT leading slash; resolved via live list (needs read scope); mutually exclusive with --command-id"},
-		{Name: "description", Desc: "new default description (description.default_value)"},
-		{Name: "description-i18n", Type: "string_array", Desc: "localized description, repeatable <lang>=<text>; REPLACES the whole i18n map (missing languages are dropped); requires --description"},
-		{Name: "icon-key", Desc: "new icon key (invalid keys rejected server-side with code 40000031)"},
-	},
-	Tips: []string{
-		`lark-cli application +slash-command-update --command greet --description "new text" --as bot`,
-		"PATCH is field-level partial: fields you do not pass are preserved server-side",
-		"the command NAME itself cannot be changed (API limitation): rename = delete + create (new command_id)",
-	},
-	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		return validateUpdateTarget(runtime)
-	},
-	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		i18n, err := parseDescriptionI18n(runtime.StrArray("description-i18n"))
-		if err != nil {
-			// The CLI validates first; keep this guard for direct DryRun callers.
-			return common.NewDryRunAPI().Set("error", err.Error())
-		}
-		body := buildSlashCommandBody("", runtime.Str("description"), i18n, runtime.Str("icon-key"))
-		d := common.NewDryRunAPI()
-		target := strings.TrimSpace(runtime.Str("command-id"))
-		if target == "" {
-			name := strings.TrimSpace(runtime.Str("command"))
-			d.GET(slashCommandBasePath).
-				Desc(fmt.Sprintf("resolve command_id by name %q via GET list first", name))
-			target = "<resolved_command_id>"
-		} else {
-			target = encodeCommandIDPathSegment(target)
-		}
-		return d.PATCH(slashCommandBasePath + "/" + target).
-			Desc("Update a slash command by command_id").
-			Body(body)
-	},
-	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		id := strings.TrimSpace(runtime.Str("command-id"))
-		if id == "" {
-			resolved, err := resolveCommandID(runtime, strings.TrimSpace(runtime.Str("command")))
-			if err != nil {
-				return err
-			}
-			id = resolved
-		}
-		i18n, err := parseDescriptionI18n(runtime.StrArray("description-i18n"))
-		if err != nil {
-			return err
-		}
-		body := buildSlashCommandBody("", runtime.Str("description"), i18n, runtime.Str("icon-key"))
-		data, err := runtime.CallAPITyped("PATCH", slashCommandBasePath+"/"+encodeCommandIDPathSegment(id), nil, body)
-		if err != nil {
-			return err
-		}
-		if data == nil {
-			data = map[string]interface{}{}
-		}
-		data["action"] = "updated"
-		fmt.Fprintln(runtime.IO().ErrOut, clientCacheHint)
-		runtime.OutFormat(data, nil, func(w io.Writer) {
-			fmt.Fprintf(w, "updated /%v (command_id: %v)\n", data["command"], data["command_id"])
-		})
-		return nil
-	},
-}
--- a/shortcuts/application/slash_command_update_test.go
+++ b/shortcuts/application/slash_command_update_test.go
@@ -1,150 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package application
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/cmdutil"
-)
-
-func TestSlashCommandUpdate_ByID(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(patchOKStub("id1"))
-
-	err := mountAndRun(t, SlashCommandUpdate, []string{"+slash-command-update",
-		"--command-id", "id1", "--description", "new", "--format", "json", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var got map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &got); err != nil {
-		t.Fatalf("json: %v", err)
-	}
-	data := got["data"].(map[string]interface{})
-	if data["action"] != "updated" {
-		t.Fatalf("action = %v", data["action"])
-	}
-}
-
-func TestSlashCommandUpdate_ByName(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(listStub([]interface{}{sampleItem("greet", "id9")}))
-	reg.Register(patchOKStub("id9"))
-
-	err := mountAndRun(t, SlashCommandUpdate, []string{"+slash-command-update",
-		"--command", "greet", "--icon-key", "skill_outlined", "--format", "json", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-}
-
-func TestSlashCommandUpdate_ByNameNotFound(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(listStub(nil))
-
-	err := mountAndRun(t, SlashCommandUpdate, []string{"+slash-command-update",
-		"--command", "nope", "--description", "x", "--as", "bot"}, f, stdout)
-	if err == nil {
-		t.Fatal("expected not-found error")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok || p.Category != errs.CategoryAPI || p.Subtype != errs.SubtypeNotFound {
-		t.Fatalf("expected api/not_found, got %#v", p)
-	}
-}
-
-func TestSlashCommandUpdate_Validate(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, appTestConfig())
-	cases := []struct {
-		name string
-		args []string
-	}{
-		{"both id and name", []string{"+slash-command-update", "--command-id", "id1", "--command", "greet", "--description", "x", "--as", "bot"}},
-		{"neither id nor name", []string{"+slash-command-update", "--description", "x", "--as", "bot"}},
-		{"no editable field", []string{"+slash-command-update", "--command-id", "id1", "--as", "bot"}},
-		{"i18n without description", []string{"+slash-command-update", "--command-id", "id1", "--description-i18n", "zh_cn=x", "--as", "bot"}},
-	}
-	for _, c := range cases {
-		err := mountAndRun(t, SlashCommandUpdate, c.args, f, stdout)
-		if err == nil {
-			t.Errorf("%s: expected validation error", c.name)
-			continue
-		}
-		p, ok := errs.ProblemOf(err)
-		if !ok || p.Category != errs.CategoryValidation || p.Subtype != errs.SubtypeInvalidArgument {
-			t.Errorf("%s: expected validation problem, got %v", c.name, err)
-		}
-	}
-}
-
-func TestSlashCommandUpdate_ByIDEncodesTrimmedPathSegment(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, appTestConfig())
-	reg.Register(patchOKStub("id%2Fwith%20space%3Fx"))
-
-	err := mountAndRun(t, SlashCommandUpdate, []string{"+slash-command-update",
-		"--command-id", " id/with space?x ", "--description", "new", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-}
-
-func TestSlashCommandUpdate_ByNameDryRunDescriptions(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, appTestConfig())
-	err := mountAndRun(t, SlashCommandUpdate, []string{"+slash-command-update",
-		"--command", " greet ", "--description", "new", "--dry-run", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var envlp struct {
-		Data struct {
-			Description string `json:"description"`
-			API         []struct {
-				Desc   string `json:"desc"`
-				Method string `json:"method"`
-			} `json:"api"`
-		} `json:"data"`
-	}
-	if err := json.Unmarshal(stdout.Bytes(), &envlp); err != nil {
-		t.Fatalf("json: %v", err)
-	}
-	got := envlp.Data
-	if strings.Contains(got.Description, "resolve command_id") {
-		t.Fatalf("resolve description must be attached to GET, not top-level: %q", got.Description)
-	}
-	if len(got.API) != 2 || got.API[0].Method != "GET" || !strings.Contains(got.API[0].Desc, "resolve command_id") {
-		t.Fatalf("first call must describe name resolution: %#v", got.API)
-	}
-	if got.API[1].Method != "PATCH" || !strings.Contains(got.API[1].Desc, "Update a slash command") {
-		t.Fatalf("second call must describe update: %#v", got.API)
-	}
-}
-
-func TestSlashCommandUpdate_ByIDDryRunEncodesTrimmedPathSegment(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, appTestConfig())
-	err := mountAndRun(t, SlashCommandUpdate, []string{"+slash-command-update",
-		"--command-id", " id/with space?x ", "--description", "new", "--dry-run", "--as", "bot"}, f, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var envlp struct {
-		Data struct {
-			API []struct {
-				Desc string `json:"desc"`
-				URL  string `json:"url"`
-			} `json:"api"`
-		} `json:"data"`
-	}
-	if err := json.Unmarshal(stdout.Bytes(), &envlp); err != nil {
-		t.Fatalf("json: %v", err)
-	}
-	got := envlp.Data
-	wantURL := slashCommandBasePath + "/id%2Fwith%20space%3Fx"
-	if len(got.API) != 1 || got.API[0].URL != wantURL || got.API[0].Desc == "" {
-		t.Fatalf("dry-run call = %#v, want encoded URL %q with description", got.API, wantURL)
-	}
-}
--- a/Show More
+++ b/Show More