Revert "fix(auth): unify token resolution and recover rejected tokens"

.github/workflows/ai-behavior-check.yml

@@ -95,7 +95,6 @@ jobs:
                 typeof filename === 'string' &&
                 (
                   filename.startsWith('.github/workflows/') ||
-                  filename.startsWith('scripts/ci/') ||
                   filename.startsWith('scripts/policy/') ||
                   filename.startsWith('scripts/release/') ||
                   filename === 'test/fixtures/cli-interface-baseline.txt' ||

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Code Admission — PR 合入门禁
 
 on:
   push:
@@ -19,7 +19,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     permissions:
-      checks: read
       contents: read
       pull-requests: read
     outputs:
@@ -27,7 +26,7 @@ jobs:
       changelog_changed: ${{ steps.classify.outputs.changelog_changed }}
       platform_sensitive: ${{ steps.classify.outputs.platform_sensitive }}
     steps:
-      - name: Classify revision scope
+      - name: Classify pull request scope
         id: classify
         uses: actions/github-script@v7
         with:
@@ -36,7 +35,6 @@ jobs:
             let changelogChanged = false;
             let platformSensitive = context.eventName === 'push';
             let files = [];
-            let fastPathTrust = 'not evaluated';
 
             if (context.eventName === 'pull_request') {
               const expectedHead = context.payload.pull_request.head.sha;
@@ -104,115 +102,6 @@ jobs:
                   isPlatformSensitive(filename) ||
                   isPlatformSensitive(previous_filename)
               );
-              fastPathTrust = changelogOnly
-                ? 'exact pull-request revision and synthetic merge policy'
-                : 'full admission required';
-            } else if (context.eventName === 'push') {
-              const expectedBefore = context.payload.before;
-              const expectedAfter = context.payload.after;
-              const fullCommit = /^[0-9a-f]{40}$/;
-              const zeroCommit = '0'.repeat(40);
-
-              if (
-                context.ref !== 'refs/heads/main' ||
-                context.payload.ref !== 'refs/heads/main' ||
-                context.payload.created !== false ||
-                context.payload.deleted !== false ||
-                context.payload.forced !== false ||
-                !fullCommit.test(expectedBefore || '') ||
-                !fullCommit.test(expectedAfter || '') ||
-                expectedBefore === zeroCommit ||
-                expectedAfter === zeroCommit ||
-                expectedAfter !== context.sha
-              ) {
-                fastPathTrust =
-                  'push identity is not a non-forced update of the existing main branch';
-              } else {
-                const { data: comparison } =
-                  await github.rest.repos.compareCommitsWithBasehead({
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    basehead: `${expectedBefore}...${expectedAfter}`,
-                    per_page: 100,
-                  });
-                files = Array.isArray(comparison.files) ? comparison.files : [];
-                const linearFromValidatedTip =
-                  comparison.status === 'ahead' &&
-                  comparison.merge_base_commit?.sha === expectedBefore &&
-                  comparison.behind_by === 0 &&
-                  comparison.ahead_by > 0 &&
-                  comparison.total_commits === comparison.ahead_by;
-                const exactChangelogDiff =
-                  files.length === 1 &&
-                  files[0].filename === 'CHANGELOG.md' &&
-                  files[0].status === 'modified' &&
-                  !files[0].previous_filename;
-
-                if (linearFromValidatedTip && exactChangelogDiff) {
-                  const requiredContexts = [
-                    'Lint',
-                    'Test',
-                    'Coverage',
-                    'Policy',
-                    'Edition',
-                    'Interface Integrity',
-                    'AI Behavior',
-                    'CLI Smoke',
-                    'Mock MCP',
-                  ];
-                  const runs = await github.paginate(
-                    github.rest.checks.listForRef,
-                    {
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      ref: expectedBefore,
-                      filter: 'latest',
-                      per_page: 100,
-                    }
-                  );
-                  const latestByName = new Map();
-                  for (const run of runs) {
-                    if (
-                      run.head_sha !== expectedBefore ||
-                      run.app?.slug !== 'github-actions' ||
-                      !requiredContexts.includes(run.name)
-                    ) {
-                      continue;
-                    }
-                    const current = latestByName.get(run.name);
-                    if (!current || run.id > current.id) {
-                      latestByName.set(run.name, run);
-                    }
-                  }
-                  const missing = requiredContexts.filter(
-                    (name) => !latestByName.has(name)
-                  );
-                  const nonSuccess = requiredContexts.flatMap((name) => {
-                    const run = latestByName.get(name);
-                    if (!run || run.conclusion === 'success') {
-                      return [];
-                    }
-                    return [
-                      `${name}=${run.conclusion || run.status || 'unknown'}`,
-                    ];
-                  });
-
-                  if (missing.length === 0 && nonSuccess.length === 0) {
-                    changelogOnly = true;
-                    changelogChanged = true;
-                    fastPathTrust =
-                      `exact CHANGELOG-only successor of validated ${expectedBefore}`;
-                  } else {
-                    fastPathTrust =
-                      'predecessor Code Admission is not fully successful; ' +
-                      `missing=${missing.join(',') || 'none'}; ` +
-                      `non-success=${nonSuccess.join(',') || 'none'}`;
-                  }
-                } else {
-                  fastPathTrust =
-                    'push is not an exact linear CHANGELOG-only successor';
-                }
-              }
             }
 
             core.setOutput('changelog_only', String(changelogOnly));
@@ -225,7 +114,6 @@ jobs:
               .addRaw(`- CHANGELOG touched: \`${changelogChanged}\`\n`)
               .addRaw(`- Native-platform risk paths touched: \`${platformSensitive}\`\n`)
               .addRaw(`- Changed files: \`${files.length}\`\n`)
-              .addRaw(`- Fast-path trust: ${fastPathTrust}\n`)
               .write();
 
       - name: Record CHANGELOG-only fast path
@@ -242,13 +130,11 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - name: Verify Test Package Plan
-        if: steps.classify.outputs.changelog_only != 'true'
-        run: make test-plan
-
       - name: Format Check
         if: steps.classify.outputs.changelog_only != 'true'
-        run: make format-check
+        run: |
+          unformatted="$(find cmd internal test scripts/policy -name '*.go' -print0 | xargs -0r gofmt -l)"
+          test -z "$unformatted" || (printf '%s\n' "$unformatted" && exit 1)
 
       - name: Go Vet
         if: steps.classify.outputs.changelog_only != 'true'
@@ -281,20 +167,38 @@ jobs:
         with:
           go-version-file: go.mod
 
+      - name: Install archive tooling
+        run: sudo apt-get update && sudo apt-get install -y zip unzip
+
       - name: Build
         if: ${{ matrix.shard == 'remaining' }}
         run: make build
 
       - name: Test shard with Race Detection
-        shell: bash
         env:
-          DWS_PACKAGE_VERSION: 0.0.0-test
           TEST_SHARD: ${{ matrix.shard }}
         run: |
-          set -euo pipefail
-          package_output="$(./scripts/ci/test-packages.sh list "$TEST_SHARD")"
-          test -n "$package_output"
-          mapfile -t packages <<< "$package_output"
+          case "$TEST_SHARD" in
+            app)
+              packages=(./internal/app/...)
+              ;;
+            generators)
+              packages=(./internal/generator/...)
+              ;;
+            helpers)
+              packages=(./internal/helpers/...)
+              ;;
+            remaining)
+              mapfile -t packages < <(
+                go list ./cmd/... ./internal/... |
+                  grep -Ev '/internal/(app|generator|helpers)(/|$)'
+              )
+              ;;
+            *)
+              printf 'unknown test shard: %s\n' "$TEST_SHARD" >&2
+              exit 1
+              ;;
+          esac
           test "${#packages[@]}" -gt 0
           go test -v -race -count=1 -timeout=10m "${packages[@]}"
 
@@ -303,7 +207,7 @@ jobs:
     needs: lint
     if: ${{ needs.lint.outputs.changelog_only != 'true' }}
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 10
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -317,16 +221,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y zip unzip
 
       - name: Test release scripts
-        shell: bash
-        env:
-          DWS_PACKAGE_VERSION: 0.0.0-test
-        run: |
-          set -euo pipefail
-          package_output="$(./scripts/ci/test-packages.sh list release-scripts)"
-          test -n "$package_output"
-          mapfile -t packages <<< "$package_output"
-          test "${#packages[@]}" -gt 0
-          go test -v -count=1 -timeout=10m "${packages[@]}"
+        run: go test -v -count=1 -timeout=5m ./test/scripts
 
   test-cross-platform:
     name: Test (cross-platform compile)
@@ -819,10 +714,9 @@ jobs:
       - name: Enforce coverage gate
         if: needs.lint.outputs.changelog_only != 'true'
         env:
-          COVERAGE_TARGET: "100"
+          COVERAGE_TARGET: "80"
           COVERAGE_ENFORCE_OVERALL: "false"
-          COVERAGE_OVERALL_TOLERANCE: "0"
-        run: COVERAGE_ADDITIONAL_DIFF_PROFILE=coverage-shortcut.txt make coverage-gate BASE_REF="$COVERAGE_BASE_REF"
+        run: COVERAGE_ADDITIONAL_PROFILE=coverage-shortcut.txt make coverage-gate BASE_REF="$COVERAGE_BASE_REF"
 
       - name: Generate coverage report
         if: needs.lint.outputs.changelog_only != 'true'
@@ -910,24 +804,10 @@ jobs:
           ./scripts/policy/check-changelog-pr.sh \
             "$mode" "$PR_BASE_SHA" HEAD
 
-      - name: Validate trusted main CHANGELOG-only push
-        if: github.event_name == 'push' && needs.lint.outputs.changelog_only == 'true'
-        env:
-          PUSH_BEFORE_SHA: ${{ github.event.before }}
-          PUSH_AFTER_SHA: ${{ github.event.after }}
-        run: |
-          set -eu
-          test "$(git rev-parse HEAD)" = "$PUSH_AFTER_SHA" || {
-            echo "checked-out push revision does not match event after SHA" >&2
-            exit 1
-          }
-          ./scripts/policy/check-changelog-pr.sh \
-            --fast-path "$PUSH_BEFORE_SHA" "$PUSH_AFTER_SHA"
-
       - name: Record CHANGELOG-only fast path
         if: needs.lint.outputs.changelog_only == 'true'
         run: |
-          echo "Only the trusted base-equivalent CHANGELOG validator ran; executable sources are unchanged." \
+          echo "Only the base-equivalent CHANGELOG validator ran; full Policy resumes on main." \
             >> "$GITHUB_STEP_SUMMARY"
 
       - name: Build

.github/workflows/notify-wukong.yml

@@ -3,7 +3,7 @@ name: Main Integration — Wukong Overlay
 on:
   workflow_run:
     workflows:
-      - CI
+      - Code Admission — PR 合入门禁
     types:
       - completed
 

.github/workflows/withdraw-release.yml

@@ -1,148 +0,0 @@
-name: Withdraw release
-run-name: Withdraw ${{ inputs.version }}
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Exact published version to withdraw (vX.Y.Z or vX.Y.Z-beta.N)"
-        required: true
-        type: string
-      reason:
-        description: "Public, single-line withdrawal reason (8-300 characters)"
-        required: true
-        type: string
-      confirmation:
-        description: "Type WITHDRAW followed by a space and the exact version"
-        required: true
-        type: string
-
-permissions:
-  contents: read
-
-# Share the publication lock with release.yml. A withdrawal and a publication
-# must never mutate channel pointers concurrently.
-concurrency:
-  group: dws-release-publication
-  cancel-in-progress: false
-
-jobs:
-  withdraw:
-    name: Withdraw release from every distribution channel
-    environment: release-withdrawal
-    runs-on: ubuntu-latest
-    timeout-minutes: 180
-    permissions:
-      actions: read
-      contents: write
-    steps:
-      - name: Verify withdrawal environment protection
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            const response = await github.request(
-              "GET /repos/{owner}/{repo}/environments/{environment_name}",
-              { owner, repo, environment_name: "release-withdrawal" },
-            );
-            const reviewerRule = response.data.protection_rules.find(
-              (rule) => rule.type === "required_reviewers",
-            );
-            if (
-              !reviewerRule ||
-              reviewerRule.prevent_self_review !== true ||
-              !Array.isArray(reviewerRule.reviewers) ||
-              reviewerRule.reviewers.length === 0
-            ) {
-              core.setFailed("release-withdrawal must require a reviewer and prevent self-review");
-              return;
-            }
-            if (response.data.deployment_branch_policy?.protected_branches !== true) {
-              core.setFailed("release-withdrawal must allow only protected branches");
-            }
-            if (response.data.can_admins_bypass !== false) {
-              core.setFailed("release-withdrawal must not allow administrator bypass");
-            }
-
-      - name: Require the exact current official default-branch commit
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const expectedRepository = "DingTalk-Real-AI/dingtalk-workspace-cli";
-            const defaultBranch = context.payload.repository.default_branch;
-            if (context.eventName !== "workflow_dispatch") {
-              core.setFailed("release withdrawal accepts workflow_dispatch only");
-              return;
-            }
-            if (`${context.repo.owner}/${context.repo.repo}` !== expectedRepository) {
-              core.setFailed(`release withdrawal is restricted to ${expectedRepository}`);
-              return;
-            }
-            if (context.ref !== `refs/heads/${defaultBranch}`) {
-              core.setFailed(`release withdrawal must be dispatched from ${defaultBranch}`);
-              return;
-            }
-            const branch = await github.rest.git.getRef({
-              ...context.repo,
-              ref: `heads/${defaultBranch}`,
-            });
-            if (branch.data.object.sha !== context.sha) {
-              core.setFailed(
-                `default branch advanced to ${branch.data.object.sha}; re-dispatch from the new head`,
-              );
-            }
-
-      - name: Check out trusted withdrawal tooling
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.sha }}
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Set up Node.js for npm channel withdrawal
-        uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Withdraw immutable release and roll back channels
-        id: withdrawal
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-          GITHUB_EVENT_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
-          WITHDRAW_VERSION: ${{ inputs.version }}
-          WITHDRAW_REASON: ${{ inputs.reason }}
-          WITHDRAW_CONFIRMATION: ${{ inputs.confirmation }}
-          OSS_ACCESS_KEY_ID: ${{ secrets.OSS_ACCESS_KEY_ID }}
-          OSS_ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
-          OSS_ENDPOINT: ${{ secrets.OSS_ENDPOINT }}
-          OSS_BUCKET: ${{ secrets.OSS_BUCKET }}
-          OSS_PREFIX: ${{ secrets.OSS_PREFIX }}
-          GITEE_TOKEN: ${{ secrets.GITEE_TOKEN }}
-          GITEE_USER: ${{ secrets.GITEE_USER }}
-          GITEE_REPO: ${{ secrets.GITEE_REPO }}
-          DWS_GITEE_ENABLED: ${{ vars.ENABLE_GITEE_UPLOAD_FALLBACK == 'true' && 'true' || 'false' }}
-          HOMEBREW_PR_TOKEN: ${{ secrets.HOMEBREW_PR_TOKEN }}
-        run: |
-          ./scripts/release/withdraw-release.sh \
-            "$WITHDRAW_VERSION" \
-            "$WITHDRAW_REASON" \
-            "$WITHDRAW_CONFIRMATION"
-
-      - name: Report withdrawal boundary
-        if: ${{ always() }}
-        env:
-          VERSION: ${{ inputs.version }}
-          RESULT: ${{ steps.withdrawal.outcome }}
-        run: |
-          {
-            echo "### Release withdrawal: ${VERSION}"
-            echo
-            echo "- Workflow result: ${RESULT}"
-            echo "- Success means every configured channel was verified and the permanent withdrawn/${VERSION} tombstone remains as the version-reuse barrier."
-            echo "- Failure may occur before or after the tombstone/channel mutations; inspect the failed step and rerun the exact same inputs after fixing the cause."
-            echo "- The problem GitHub Release and original tag are removed after npm and every tag-enabled/configured mirror are rolled back, so GitHub installers stop resolving the bad version while the Homebrew rollback PR is reviewed."
-            echo "- npm is deprecated rather than unpublished; already-installed clients cannot be remotely downgraded."
-            echo "- If a Homebrew rollback PR was opened, this run remains failed until that PR is independently reviewed, merged, and the workflow is rerun."
-          } >> "$GITHUB_STEP_SUMMARY"

.gitignore

@@ -54,15 +54,3 @@ test/dev_functional/results.jsonl
 /coverage-policy.txt
 /coverage.html
 dwsbin
-
-# Local shortcut eval / real-backend capture artifacts — may contain real PII
-# (employee names/emails, userIds, conversation & message IDs). Never commit.
-/docs/shortcut-real-read-results.json
-/docs/shortcut-real-write-results.json
-/docs/shortcut-comparison.html
-/docs/shortcut-gsb-eval.*
-/scripts/run_shortcut_real_read_matrix.py
-
-# Local coverage artifacts
-coverage-shortcut.txt
-coverage-*.txt

CHANGELOG.md

@@ -6,132 +6,6 @@ The format is inspired by [Keep a Changelog](https://keepachangelog.com/) and th
 
 ## [Unreleased]
 
-## [1.0.55-beta.2] - 2026-07-23
-
-This beta validates Wukong capability parity across Chat, Contacts, documents,
-Drive, Markdown, and Todos, together with faster guarded releases and legacy
-authentication migration.
-
-### Added
-
-- **Chat editing and group management** — adds `chat message edit`, conversation-category lookups through `chat category list-by-conv` and `chat category batch-info`, and the confirmed, irreversible `chat group upgrade-to-external` flow.
-- **Contact maintenance commands** — adds `contact user update`, `contact user update-self`, `contact dept create`, `contact dept update`, and `contact account update`, all with guarded write behavior.
-- **Markdown file workflows** — adds the `markdown` product with `fetch`, `create`, `overwrite`, and `patch` commands for Drive-native `.md` files, including explicit routing, dry-run previews, and confirmation for destructive writes.
-- **Todo labels** — adds `todo tag add`, `delete`, `update`, `list`, and `create`.
-
-### Changed
-
-- **Faster guarded releases** — trusts an independently revalidated, exact `CHANGELOG.md`-only successor of an already admitted `main` commit, runs cloud planning alongside governance, and executes sealed-release automation, compatibility, and multi-profile validation in parallel with artifact compilation. Normal cloud publication no longer requires an unshareable local packaging preflight.
-- **Scoped document reads and group mentions** — `doc read --content-format jsonml` can return `outline`, `range`, `section`, or custom-tag fragments with depth and block-boundary controls; document comment create, reply, and update can mention groups through `--mentioned-open-conversation-id`.
-- **Drive overwrite uploads** — `drive upload --node <fileId>` can replace an existing Drive or document-space file, is mutually exclusive with `--folder`, supports dry-run, and requires confirmation before writing.
-- **Chat nickname clearing and cross-organization todos** — omitting `--nick` from `chat group update-nick` now clears the current user's group nickname, while `todo task list --query-all` queries todos across organizations.
-
-### Fixed
-
-- **Legacy authentication compatibility** (#756) — migrates pre-v1.0.53 global and organization-scoped login state into the identity-aware token store, including all legacy organizations, while keeping unresolved accounts isolated from exact `corpId:userId` credentials so external or no-directory identities can complete login without borrowing another user's token.
-
-## [1.0.55-beta.1] - 2026-07-23
-
-This beta validates MCP Market URL resolution, the supported Wukong local-file
-send path after retiring the legacy credential-based media upload command from
-discovery, and reliable message-read rendering for rich content, forwarded
-records, encrypted messages, and media-download ID aliases.
-
-### Added
-
-- **MCP URL resolution** — adds `dws mcp url get <mcpId>` for resolving a DingTalk MCP Market ID to the current user and organization scoped Streamable HTTP URL, while keeping the helper-only `mcp-meta` endpoint out of the public product command surface.
-
-### Changed
-
-- **Chat local-file sending** — hides the open-source-only `chat media upload` compatibility command from Help, Schema, and bundled Skills, and removes its legacy AppKey/AppSecret OAPI path. Historical argv still receives an actionable migration error. Send local images and files through `chat message send --msg-type file --file-path`; callers that already hold a mediaId may continue to use `--msg-type image --media-id`.
-
-### Fixed
-
-- **Message-read shortcut projection** (#706) — the message-list shortcuts (`chat +chat-messages` / `+messages-list` / `+messages-list-direct` / `+at-me` / `+search-msg` / `+thread-replies`) now render card and out-of-office rich-content JSON as readable text (without ever rewriting ordinary text that merely embeds a JSON fragment), expand a forwarded chat record's nested `forwardMessages` instead of collapsing to a "[卡片]" summary, and mark undecryptable encrypted card messages as `[加密消息]`; the speaker is read from the bare `sender` key, nested `{name:…}` sender objects yield their display name, and the literal string `"null"` is treated as absent. Shared projection helpers now live in `internal/shortcut/chatmsg`. `chat message download-media` also gains `--msg-id` / `--open-message-id` aliases for its `--message-id` flag so agents copying the `openMessageId`/`msgId` output field no longer hit "unknown flag".
-
-## [1.0.54] - 2026-07-21
-
-This release promotes the validated `v1.0.54-beta.2` baseline to stable. It restores the default transport envelope for personal event output with opt-in flattening, plus Schema CLI path and plugin overlay compatibility fixes.
-
-### Changed
-
-- **Personal event output compatibility** (#743) — `event consume` once again preserves the transport envelope by default for `ndjson`/`json`/`pretty`, while retaining the existing `compact` processor. New Agent workflows opt into the event-specific top-level DTO with `--flatten`, which is mutually exclusive with `-f raw` and `--debug-raw-events`; `event schema --flatten` describes that DTO, while the default schema describes `type/event_type/data/headers` and points to `.data | fromjson`.
-
-### Fixed
-
-- **Schema CLI path compatibility** (#738) — user-facing Schema lookups once again accept space-, dot-, and slash-separated CLI paths without weakening strict canonical identity resolution.
-- **Plugin CLI overlays** (#701) — installed plugins register their manifest-authored command trees again for HTTP and stdio servers, and a plugin may now replace a hidden compatibility fallback (for example `conference`) instead of being skipped as a distribution conflict.
-
-## [1.0.54-beta.2] - 2026-07-21
-
-This beta revalidates the same `v1.0.54-beta.1` source through the cloud release path with a sealed `OSS-Mirror: deferred` policy, because the manually tagged `v1.0.54-beta.1` push run failed on the unavailable OSS mirror channel after GitHub and npm delivery.
-
-### Changed
-
-- **Release delivery only** — no source changes since `v1.0.54-beta.1`; see that section for the user-visible changes under validation (#743, #738, #701).
-
-## [1.0.54-beta.1] - 2026-07-21
-
-This beta validates the restored default transport envelope for personal event output with opt-in flattening, plus Schema CLI path and plugin overlay compatibility fixes, on top of the validated `v1.0.53-beta.7` baseline.
-
-### Changed
-
-- **Personal event output compatibility** (#743) — `event consume` once again preserves the transport envelope by default for `ndjson`/`json`/`pretty`, while retaining the existing `compact` processor. New Agent workflows opt into the event-specific top-level DTO with `--flatten`, which is mutually exclusive with `-f raw` and `--debug-raw-events`; `event schema --flatten` describes that DTO, while the default schema describes `type/event_type/data/headers` and points to `.data | fromjson`.
-
-### Fixed
-
-- **Schema CLI path compatibility** (#738) — user-facing Schema lookups once again accept space-, dot-, and slash-separated CLI paths without weakening strict canonical identity resolution.
-- **Plugin CLI overlays** (#701) — installed plugins register their manifest-authored command trees again for HTTP and stdio servers, and a plugin may now replace a hidden compatibility fallback (for example `conference`) instead of being skipped as a distribution conflict.
-
-## [1.0.53] - 2026-07-21
-
-This release promotes the validated `v1.0.53-beta.7` baseline to stable. It adds enterprise onboarding, declarative shortcuts, Sheet/Aitable writes, multi-account profiles, and broader personal IM events, while hardening authentication and the guarded release path.
-
-### Added
-
-- **Enterprise and office command coverage** — adds enterprise creation, employee invitation, and account provisioning commands; 366 declarative service shortcuts; Sheet import commands; and Aitable workflow create/update support with reviewed Schema contracts.
-- **Multiple accounts in one DingTalk organization** — profiles can distinguish accounts by organization and user, select them explicitly, and log out one account or an entire organization without overwriting another account's credentials.
-- **Expanded personal IM event subscriptions** (#651) — adds read-receipt, recall, and reaction events for one-to-one and group chats, plus specified-sender subscriptions by staff ID or OpenDingTalk ID.
-- **Official multi-platform Homebrew channel** — ships separate stable and keg-only beta Formulae for macOS and Linux across amd64 and arm64, with isolated update PRs.
-
-### Changed
-
-- **Personal event output contract** (#651) — `event consume` now emits event-specific top-level structured fields; scripts that consumed the former transport envelope must use the flat fields or select `-f raw`, while `--debug-raw-events` retains the diagnostic envelope.
-- **Guarded release lifecycle** — beta/stable publication now uses explicit promotion, immutable delivery proofs, protected recovery, and tag-bound optional OSS policy; an unprovisioned OSS mirror is sealed as `deferred` so GitHub, npm, and Homebrew are not blocked.
-- **Relaxed stable promotion contract** (#729) — a stable release still requires a delivered, non-withdrawn beta baseline in its commit history, but no longer requires a byte-identical tree with that beta; reviewed commits merged to `main` after the beta can now ship in the stable release. Local releases now accept any sealed commit contained in `main` history and push only the release tag, so `main` is never frozen during the beta-to-stable window.
-
-### Fixed
-
-- **Authentication and credential reliability** — organization-policy denials stop before mutation or polling, long-running clients reload and refresh access tokens consistently, concurrent credential writes are atomic, and Windows portable-auth commands fail before reading or writing unsupported credential bundles.
-- **Command validation and compatibility** — invalid Sheet/task targets fail locally, IM shortcuts preserve AI-tag and alias compatibility, and Aitable import uploads require and forward a positive file size.
-- **Release publication reliability** — GitHub draft publication is bound to one verified release ID and exact assets, preflight uses isolated installer worktrees, guarded local tags remain compatible, cloud planning fingerprints the actual allocated release refs, and npm channel verification waits for bounded registry propagation without moving tags.
-- **Package-manager version verification** (#735) — npm-vendored, Homebrew-installed, and packaged release binaries are now verified by searching their raw bytes for the injected version marker, so a correctly versioned stable binary is no longer rejected when the short version marker coalesces with adjacent printable linker metadata; incorrect or missing markers still fail closed.
-
-## [1.0.53-beta.7] - 2026-07-21
-
-This beta validates bounded npm channel verification after registry publication.
-
-### Fixed
-
-- **npm dist-tag eventual consistency** — Release delivery now tolerates a briefly stale `latest` or `beta` read after publishing by retrying only when npm reports a valid older version. Registry errors, invalid or incomparable tags, and channels that never converge still fail closed without moving any tag during verification.
-
-## [1.0.53-beta.6] - 2026-07-21
-
-This beta validates guarded local release compatibility and tag-bound OSS deferral so an unprovisioned mirror cannot block the primary release channels.
-
-### Changed
-
-- **Tag-bound optional OSS release mirror** — Official cloud Release runs no longer block GitHub, npm, and Homebrew delivery when an OSS bucket has not been provisioned. Cloud tags immutably record `OSS-Mirror: enabled|deferred`; publication, repair, and withdrawal consume that sealed policy instead of the current repository variable. Enabled releases remain fail-closed, while deferred releases skip the nonexistent channel and cannot be backfilled without a future audited repair proof.
-
-### Fixed
-
-- **Guarded local release compatibility** — The tag-push Release workflow now accepts the `Channel`-only annotated tags created by the guarded local release entry while continuing to reject any partial cloud-only seal metadata.
-- **Cloud release tag allocation fingerprint** — Release planning now fingerprints the actual `v*` and `withdrawn/v*` refs fetched from GitHub, matching the seal job's API view instead of hashing an empty non-wildcard ref prefix and rejecting every publish before tag creation.
-
-## [1.0.53-beta.5] - 2026-07-21
-
-This beta validates long-running access-token recovery and the faster, recoverable guarded release path introduced after v1.0.53-beta.4.
-
 ### Changed
 
 - **Fast guarded beta and stable releases** — successful local release checks now leave a six-hour proof bound to the exact version, commit, repository identity, remote `main`, and stable baseline, so the subsequent guarded `--publish` invocation revalidates authority without repeating tests and packaging. A default-branch governance smoke uses the same dedicated immutable-release credential as the tag workflow before any tag is allocated.
@@ -139,8 +13,6 @@ This beta validates long-running access-token recovery and the faster, recoverab
 
 ### Fixed
 
-- **Long-running event authentication recovery** — personal and portal event streams resolve the current access token for every ticket request, refresh a server-rejected token with compare-and-refresh semantics, and reconnect with backoff when refresh is temporarily blocked by network failures, rate limits, or 5xx responses.
-- **Consistent access-token caching and errors** — runtime, recovery, Skill, PAT polling, and personal/portal event clients now resolve user access tokens through one expiry- and publication-aware manager, so long-running processes reload rotated credentials while keychain, refresh, parse, permission, and cancellation failures remain observable instead of being collapsed into “not authenticated.”
 - **Tag-push GitHub Release publication** — Draft publication now locks one GitHub Release database ID, verifies its exact tag, channel, notes, recovery marker, asset set, and uploaded bytes, then publishes and rechecks that same ID as immutable. Recovery runs use the trusted default-branch release helpers instead of the sealed tag's historical scripts, fixing the Draft-only `GET /releases/tags/{tag}` 404 without allowing the release identity to drift during recovery.
 - **Release preflight reliability** — source-mode installer tests now use isolated temporary checkouts and HOME directories instead of overwriting and deleting the real repository `dws` binary, release preflight explicitly rebuilds before policy checks, and the full-suite runner gives the growing script package a non-flaky five-minute per-suite budget.
 

CONTRIBUTING.md

@@ -36,8 +36,8 @@ Common repository checks already used here include:
 ./scripts/policy/check-open-source-assets.sh
 go test ./...
 make test
-make test-plan
 make lint
+bash test/scripts/run_all_tests.sh --jobs 8
 ./scripts/policy/check-generated-drift.sh
 ./scripts/policy/check-command-surface.sh --strict
 ./scripts/release/verify-package-managers.sh

Formula/dingtalk-workspace-cli-beta.rb

@@ -1,33 +1,33 @@
 class DingtalkWorkspaceCliBeta < Formula
   desc "Automate DingTalk workspace tasks from the terminal (beta channel)"
   homepage "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli"
-  version "1.0.55-beta.2"
+  version "1.0.53-beta.4"
   license "Apache-2.0"
   keg_only "it is the beta channel and conflicts with dingtalk-workspace-cli"
 
   on_macos do
     if Hardware::CPU.arm?
-      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.55-beta.2/dws-darwin-arm64.tar.gz"
-      sha256 "fd23353c473419ce8cfaf316e7afff757cc4606291f4ad41a62c6f5625f45c8f"
+      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.53-beta.4/dws-darwin-arm64.tar.gz"
+      sha256 "32a442d5b42dfed8512a695a7cef513722db6912f3c3168954cfaefb68e0b075"
     else
-      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.55-beta.2/dws-darwin-amd64.tar.gz"
-      sha256 "0b429950a6449736338b504386d8009a4f2cdb0668f64f72a61cd503a25df193"
+      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.53-beta.4/dws-darwin-amd64.tar.gz"
+      sha256 "00c694677b9ce2e1a711535740681defe0a5f83d6b72140f305483501628faf8"
     end
   end
 
   on_linux do
     if Hardware::CPU.arm?
-      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.55-beta.2/dws-linux-arm64.tar.gz"
-      sha256 "c213a22d6187a8f68596b9f25d6277f5fd58cea5120f5b7caeef011fb41f1104"
+      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.53-beta.4/dws-linux-arm64.tar.gz"
+      sha256 "98516620e861e516cf846cf418f1a0ad5c5eb9a8681bd066b1fd29f4847aca6a"
     else
-      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.55-beta.2/dws-linux-amd64.tar.gz"
-      sha256 "4e041ba7b1d8038fa34deba3a3f78af8377f4361131d8bfdb1f1913e5f9454dc"
+      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.53-beta.4/dws-linux-amd64.tar.gz"
+      sha256 "266df80e8a989971789a157dd134685a7c9eda01dd1d082719ec9e09d5a07bf0"
     end
   end
 
   resource "skills" do
-    url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.55-beta.2/dws-skills.zip"
-    sha256 "1cec445c73b9ff569ca002b6548f4ee8383712447bc4cebd7701c6065774524a"
+    url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.53-beta.4/dws-skills.zip"
+    sha256 "6770511ab9b04b4d97da1858069ff694830ba91d47c1e8564fd85856f95b016e"
   end
 
   def install

Formula/dingtalk-workspace-cli.rb

@@ -1,33 +1,32 @@
 class DingtalkWorkspaceCli < Formula
   desc "Automate DingTalk workspace tasks from the terminal"
   homepage "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli"
-  version "1.0.54"
+  version "1.0.52"
   license "Apache-2.0"
 
-
   on_macos do
     if Hardware::CPU.arm?
-      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.54/dws-darwin-arm64.tar.gz"
-      sha256 "8ae0e52cf973f6fb3df61c67a41fd11e2df417a0c815762b6060cbcb5e600c08"
+      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.52/dws-darwin-arm64.tar.gz"
+      sha256 "4f6b4d064a76bcefac42feb5f356253fe43f9499b8cec9d2cdf202e7d3b9b60c"
     else
-      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.54/dws-darwin-amd64.tar.gz"
-      sha256 "11b711b9d70dea62304bf5f8206c56b4e7ea91148dafe97fb7c0f844a2a61da3"
+      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.52/dws-darwin-amd64.tar.gz"
+      sha256 "abc87128f4b98d0a01ea99235449031971db8fa4ce94167403e3b736c4b81e9a"
     end
   end
 
   on_linux do
     if Hardware::CPU.arm?
-      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.54/dws-linux-arm64.tar.gz"
-      sha256 "9c7ecb4c8cd55644b2faa73f6ce7843c0279b23793e23deb5061692ea71a0cf1"
+      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.52/dws-linux-arm64.tar.gz"
+      sha256 "0d357ef0535f99f2f63b5ecbfdee9c32448be2a2c24f3096c03126b3b7570bc5"
     else
-      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.54/dws-linux-amd64.tar.gz"
-      sha256 "8a0bc245747fc3facf98c8103c06da46852a30bff31ac93b0aa874e8c7e46db7"
+      url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.52/dws-linux-amd64.tar.gz"
+      sha256 "b7dfd9a4b3489211359261747ed0cb9c8c261434bb762ad3f76df33bdbabd5cb"
     end
   end
 
   resource "skills" do
-    url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.54/dws-skills.zip"
-    sha256 "7450fd0115c75bfe6820c7099f348973d9353cca9d8d647c9cddcd70978a7ec0"
+    url "https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli/releases/download/v1.0.52/dws-skills.zip"
+    sha256 "0fa3c8dec500c1659e6480d6772ae901b2d12d24322dd5d7283f016024290c21"
   end
 
   def install
@@ -53,7 +52,6 @@ class DingtalkWorkspaceCli < Formula
     <<~EOS
       Agent Skills are bundled in #{pkgshare}/skills/dws.
       Run `dws skill setup` to install them into your Agent directories.
-
     EOS
   end
 

Makefile

@@ -1,14 +1,12 @@
 GO ?= go
-DWS_PACKAGE_VERSION ?= 0.0.0-test
 REMOTE ?=
 PUBLISH ?= 0
 YES ?= 0
 DWS_POLICY_TMPDIR ?= $(CURDIR)/.worktrees/policy-tmp
 POLICY_GOTMPDIR ?= $(DWS_POLICY_TMPDIR)/go
 POLICY_ENV = DWS_POLICY_TMPDIR="$(DWS_POLICY_TMPDIR)" GOTMPDIR="$(POLICY_GOTMPDIR)"
-GO_SOURCE_LIST = git ls-files -z --cached --others --exclude-standard -- '*.go'
 
-.PHONY: all help build rebuild test test-plan test-auth-legacy-compat lint format-check fmt policy edition-test interface-integrity authoritative-interface-integrity coverage-gate coverage-gate-platform update-interface-baseline reset-interface-baseline schema-compatibility skill-command-integrity cli-smoke mock-mcp-smoke test-schema-agent-examples generate-schema generate-schema-agent-metadata generate-schema-catalog package release release-pre release-stable changelog-pre changelog-stable publish-homebrew-formula setup-hooks
+.PHONY: all help build rebuild test lint fmt policy edition-test interface-integrity authoritative-interface-integrity coverage-gate coverage-gate-platform update-interface-baseline reset-interface-baseline schema-compatibility skill-command-integrity cli-smoke mock-mcp-smoke test-schema-agent-examples generate-schema generate-schema-agent-metadata generate-schema-catalog package release release-pre release-stable changelog-pre changelog-stable publish-homebrew-formula setup-hooks
 
 all: setup-hooks fmt lint build test rebuild
 
@@ -16,16 +14,13 @@ help:
 	@printf "Available targets:\n"
 	@printf "  make build         - Build the dws CLI binary\n"
 	@printf "  make test          - Run the Go test suite\n"
-	@printf "  make test-plan     - Verify every default Go package belongs to one CI test shard\n"
-	@printf "  make test-auth-legacy-compat - Run stable legacy authentication compatibility regressions\n"
-	@printf "  make lint          - Run formatting checks, go vet, and staticcheck\n"
-	@printf "  make format-check  - Check all repository Go source files with gofmt\n"
-	@printf "  make fmt           - Format all repository Go source files\n"
+	@printf "  make lint          - Run formatting checks and golangci-lint when available\n"
+	@printf "  make fmt           - Format Go source files\n"
 	@printf "  make policy        - Check the built dws plus open-source and Schema policies\n"
 	@printf "  make interface-integrity - Check historical commands and help contracts still work\n"
 	@printf "  make authoritative-interface-integrity BASE_REF=<ref> - Check the Git-owned PR merge-base\n"
-	@printf "  make coverage-gate BASE_REF=<ref> - Enforce overall non-regression and 100%% changed-code coverage\n"
-	@printf "  make coverage-gate-platform BASE_REF=<ref> PROFILE=<file> - Enforce 100%% native changed-code coverage\n"
+	@printf "  make coverage-gate BASE_REF=<ref> - Enforce overall non-regression and changed-code coverage\n"
+	@printf "  make coverage-gate-platform BASE_REF=<ref> PROFILE=<file> - Enforce native-platform changed-code coverage\n"
 	@printf "  make update-interface-baseline - Add new CLI contracts without removing history\n"
 	@printf "  make reset-interface-baseline - DANGEROUS: replace all CLI compatibility history\n"
 	@printf "  make schema-compatibility BASE_REF=<ref> - Check the complete Schema contract against the PR merge-base\n"
@@ -50,38 +45,15 @@ rebuild:
 	@./scripts/dev/build.sh
 
 test:
-	@DWS_PACKAGE_VERSION="$(DWS_PACKAGE_VERSION)" $(GO) test -count=1 -timeout=10m ./...
-
-test-plan:
-	@./scripts/ci/test-packages.sh verify
-
-test-auth-legacy-compat:
-	@mkdir -p "$(POLICY_GOTMPDIR)"
-	@GO="$(GO)" $(POLICY_ENV) ./scripts/policy/check-auth-legacy-compat.sh
+	@./test/scripts/run_all_tests.sh --timeout 5m
 
 lint:
 	@./scripts/dev/lint.sh
 
-format-check:
-	@set -eu; \
-	go_files="$$(mktemp "$${TMPDIR:-/tmp}/dws-go-files.XXXXXX")"; \
-	trap 'rm -f "$$go_files"' EXIT HUP INT TERM; \
-	$(GO_SOURCE_LIST) > "$$go_files"; \
-	unformatted="$$(xargs -0 sh -c 'if [ "$$#" -gt 0 ]; then exec gofmt -l -- "$$@"; fi' sh < "$$go_files")"; \
-	if [ -n "$$unformatted" ]; then \
-		printf '%s\n' "$$unformatted"; \
-		printf '%s\n' "Go files are not formatted. Run 'make fmt'." >&2; \
-		exit 1; \
-	fi
-
 fmt:
-	@set -eu; \
-	go_files="$$(mktemp "$${TMPDIR:-/tmp}/dws-go-files.XXXXXX")"; \
-	trap 'rm -f "$$go_files"' EXIT HUP INT TERM; \
-	$(GO_SOURCE_LIST) > "$$go_files"; \
-	xargs -0 sh -c 'if [ "$$#" -gt 0 ]; then exec gofmt -w -- "$$@"; fi' sh < "$$go_files"
+	@find cmd internal test scripts/policy -name '*.go' -print0 2>/dev/null | xargs -0r gofmt -w
 
-policy: test-auth-legacy-compat
+policy:
 	@mkdir -p "$(POLICY_GOTMPDIR)"
 	@$(POLICY_ENV) ./scripts/policy/check-open-source-assets.sh
 	@$(POLICY_ENV) ./scripts/policy/check-schema-command-registry.sh

README.md

@@ -476,8 +476,6 @@ Env vars: `DWS_SKILL_MODE=mono|multi` (also honored by `install.sh` / `install.p
 
 `dws event consume` subscribes as the currently logged-in user over a managed Stream WebSocket and emits each event as one NDJSON line on stdout. The public catalog currently covers messages that mention the current user, one-to-one messages with a specified user, and messages in a specified group.
 
-The default `ndjson`, `json`, and `pretty` output preserves the transport envelope (`type`, `event_type`, string `data`, and `headers`) for existing scripts; `compact` retains its existing processor. Add `--flatten` to emit the stable top-level business fields used by Agent workflows. `--format` controls JSON serialization; `--flatten` controls the data structure and cannot be combined with `-f raw` or `--debug-raw-events`.
-
 > **Prerequisite**: run `dws auth login`. Personal identity is resolved from the OAuth token and cannot be supplied through command-line identity flags.
 
 For an event-focused installation, use the official convenience installer:
@@ -489,19 +487,19 @@ curl -fsSL https://raw.githubusercontent.com/DingTalk-Real-AI/dingtalk-workspace
 ```bash
 # Inspect the public personal event catalog and schema
 dws event list
-dws event schema user_im_message_receive_o2o --flatten
+dws event schema user_im_message_receive_o2o
 
 # Listen for messages that mention the current user
-dws event consume user_im_message_receive_at --flatten -f ndjson
+dws event consume user_im_message_receive_at -f ndjson
 
 # Listen for one-to-one messages with a specified user
-dws event consume user_im_message_receive_o2o --user <userId> --flatten -f ndjson
+dws event consume user_im_message_receive_o2o --user <userId> -f ndjson
 
 # Listen by openDingtalkId (external contact, bot, or cross-organization identity)
-dws event consume user_im_message_receive_o2o --open-dingtalk-id <openDingtalkId> --flatten -f ndjson
+dws event consume user_im_message_receive_o2o --open-dingtalk-id <openDingtalkId> -f ndjson
 
 # Listen for messages in a specified group
-dws event consume user_im_message_receive_group --group <openConversationId> --flatten -f ndjson
+dws event consume user_im_message_receive_group --group <openConversationId> -f ndjson
 
 # Inspect local consumers and cancel a subscription
 dws event status

README_zh.md

@@ -470,8 +470,6 @@ DWS_SKILL_SOURCE=/path/to/skills dws skill setup --mode multi
 
 `dws event consume` 使用当前 OAuth 登录用户建立托管的 Stream WebSocket 长连接，并把每条事件以 NDJSON 一行输出到 stdout。当前公开目录包括：当前用户被 @ 的消息、与指定用户的单聊消息、指定群的消息。
 
-默认 `ndjson`、`json`、`pretty` 输出保留兼容 transport envelope（`type`、`event_type`、字符串 `data`、`headers`），`compact` 继续沿用原 processor。Agent 或新脚本显式加 `--flatten` 后，输出稳定的顶层业务字段。`--format` 控制 JSON 序列化，`--flatten` 控制数据结构，且不能与 `-f raw` 或 `--debug-raw-events` 同时使用。
-
 > **前置条件**：先运行 `dws auth login`。个人身份从 OAuth token 解析，不允许通过命令行伪造。
 
 只需要 event 能力时，可以使用官方便捷安装脚本：
@@ -483,19 +481,19 @@ curl -fsSL https://raw.githubusercontent.com/DingTalk-Real-AI/dingtalk-workspace
 ```bash
 # 查看公开个人事件目录和 schema
 dws event list
-dws event schema user_im_message_receive_o2o --flatten
+dws event schema user_im_message_receive_o2o
 
 # 监听当前用户被 @ 的消息
-dws event consume user_im_message_receive_at --flatten -f ndjson
+dws event consume user_im_message_receive_at -f ndjson
 
 # 监听与指定用户的单聊消息
-dws event consume user_im_message_receive_o2o --user <userId> --flatten -f ndjson
+dws event consume user_im_message_receive_o2o --user <userId> -f ndjson
 
 # 使用 openDingtalkId 监听外部联系人、机器人或跨组织身份
-dws event consume user_im_message_receive_o2o --open-dingtalk-id <openDingtalkId> --flatten -f ndjson
+dws event consume user_im_message_receive_o2o --open-dingtalk-id <openDingtalkId> -f ndjson
 
 # 监听指定群的消息
-dws event consume user_im_message_receive_group --group <openConversationId> --flatten -f ndjson
+dws event consume user_im_message_receive_group --group <openConversationId> -f ndjson
 
 # 查看本地 consume，并取消指定订阅
 dws event status

docs/architecture.md

@@ -52,7 +52,7 @@ run.
 
 ```mermaid
 flowchart TB
-  PR["Pull request"] --> CA["CI"]
+  PR["Pull request"] --> CA["Code Admission — PR 合入门禁"]
   subgraph CA_CHECKS["Nine required contexts"]
     L["Lint"]
     T["Test"]

docs/automation.md

@@ -108,33 +108,21 @@ commit, and failed tag-push run all match; it then reuses the normal release
 jobs. Do not put publication secrets in temporary branches or create ad-hoc
 recovery workflows.
 
-Cloud-sealed releases mirror to OSS only when the repository variable
-`ENABLE_OSS_MIRROR` is exactly `true`. Leave the variable unset while no Bucket
-is provisioned; GitHub, npm, and Homebrew delivery can then complete without
-running the OSS step. Once enabled, missing credentials, an invalid Bucket, or
-an upload failure remains fail-closed. The cloud tag immutably records the
-decision as `OSS-Mirror: enabled|deferred`; publication and withdrawal consume
-that sealed value instead of the variable's later state. Deferred releases
-cannot use `repair_oss_version`; enabling OSS applies to later release tags
-until an audited immutable repair marker is implemented.
-
-If an immutable GitHub Release and npm package were delivered but an enabled
-downstream China mirror failed, dispatch the normal `Release` workflow from the
-protected default branch with exactly one of `repair_gitee_version` or
-`repair_oss_version`. Channel repair accepts a fully successful exact release,
-or a failed exact-tag run only when its latest attempt completed the release
-contract, build, Apple signature, immutable GitHub publication, and npm
-delivery checks for the exact tagged commit. OSS repair additionally requires
-the tag's sealed policy to be `enabled`. It then downloads and re-verifies the
-immutable assets before invoking only the selected mirror. For a failed
-release, an OSS repair requires the OSS step itself to be the recorded failure.
-A Gitee repair accepts either a failed Gitee job or a Gitee job that was
-skipped behind that OSS failure; the latter is an explicit Gitee backfill and
-does not claim that OSS has been repaired. Gitee repair requires `GITEE_TOKEN`,
-`GITEE_USER`, and `GITEE_REPO`; OSS repair requires `OSS_ACCESS_KEY_ID`,
-`OSS_ACCESS_KEY_SECRET`, `OSS_ENDPOINT`, and `OSS_BUCKET` (with optional
-`OSS_PREFIX`) as Actions secrets. Missing credentials fail the selected repair
-closed.
+If the immutable GitHub Release and npm package were delivered but a downstream
+China mirror failed, dispatch the normal `Release` workflow from the protected
+default branch with exactly one of `repair_gitee_version` or
+`repair_oss_version`. Channel repair accepts a failed exact-tag run only when
+its latest attempt completed the release contract, build, Apple signature,
+immutable GitHub publication, and npm delivery checks for the exact tagged
+commit. It then downloads and re-verifies the immutable assets before invoking
+only the selected mirror. An OSS repair requires the OSS step itself to be the
+recorded failure. A Gitee repair accepts either a failed Gitee job or a Gitee
+job that was skipped behind that OSS failure; the latter is an explicit Gitee
+backfill and does not claim that OSS has been repaired. Gitee repair requires
+`GITEE_TOKEN`, `GITEE_USER`, and `GITEE_REPO`; OSS repair requires
+`OSS_ACCESS_KEY_ID`, `OSS_ACCESS_KEY_SECRET`, `OSS_ENDPOINT`, and `OSS_BUCKET`
+(with optional `OSS_PREFIX`) as Actions secrets. Missing credentials fail the
+selected repair closed.
 
 ## Handoff Checklist
 

docs/ci-pr-gates.md

@@ -1,4 +1,4 @@
-# CI — PR 合入门禁
+# Code Admission — PR 合入门禁
 
 The pull-request admission layer has exactly nine required external contexts:
 
@@ -6,7 +6,7 @@ The pull-request admission layer has exactly nine required external contexts:
 |---|---|
 | `Lint` | Stable PR revision classification, formatting, `go vet`, and Actionlint |
 | `Test` | Race/unit/release-script tests plus fast cross-platform compilation |
-| `Coverage` | Overall non-regression and 100% changed-code coverage |
+| `Coverage` | Overall non-regression and changed-code coverage |
 | `Policy` | Repository policy and the fail-closed CHANGELOG contract |
 | `Edition` | Edition contract tests |
 | `Interface Integrity` | CLI, Schema, Skill, and stable-release compatibility |
@@ -14,7 +14,7 @@ The pull-request admission layer has exactly nine required external contexts:
 | `CLI Smoke` | Offline help for every public top-level command |
 | `Mock MCP` | HTTP and stdio MCP lifecycle smoke tests |
 
-The workflow display name is `CI`. Parallel helper
+The workflow display name is `Code Admission — PR 合入门禁`. Parallel helper
 jobs may implement `Test` and `Coverage`, but they are not ruleset contexts.
 Do not require an aggregate alias or a downstream integration check in place of
 the nine contracts above.
@@ -56,27 +56,8 @@ base notes into an invalid final CHANGELOG.
 
 All nine admission contexts are still emitted and must succeed. Expensive
 implementation helpers are skipped; the named contexts record that their code
-surface is unaffected.
-
-The protected `main` push keeps that fast path only when all of these
-fail-closed conditions hold:
-
-- the event is a non-forced update of the existing `refs/heads/main`;
-- the event `after` SHA is the exact workflow SHA, and both event SHAs are
-  complete, non-zero commit IDs;
-- GitHub's comparison reports the previous main tip as the unique linear merge
-  base, with no commits behind it;
-- the complete resulting tree diff is exactly one in-place modification of
-  `CHANGELOG.md`;
-- the previous main tip already has successful GitHub Actions checks for all
-  nine Code Admission contexts.
-
-`Policy` then independently checks out the pushed revision and runs the same
-`check-changelog-pr.sh --fast-path` contract from the event's `before` SHA to
-its `after` SHA. If identity, ancestry, file scope, tree mode, CHANGELOG
-content, or predecessor admission cannot be proved, classification falls back
-to the complete main admission suite. A source change can therefore never
-inherit the CHANGELOG-only result.
+surface is unaffected. After merge, the protected `main` push executes the
+full admission suite.
 
 Any PR that touches `CHANGELOG.md` but also changes another file runs the same
 content contract in `Policy` with `--content-only`. That mode permits the
@@ -100,7 +81,7 @@ successful PR check.
 
 ```mermaid
 flowchart TB
-  PR["Pull request"] --> ADMISSION["CI"]
+  PR["Pull request"] --> ADMISSION["Code Admission — PR 合入门禁"]
   ADMISSION --> L["Lint"]
   ADMISSION --> T["Test"]
   ADMISSION --> C["Coverage"]
@@ -141,13 +122,7 @@ base_ref=$(git merge-base HEAD origin/main)
 
 `make coverage-gate` is an enforcement step, not a profile generator. CI
 generates the candidate, supporting, merge-base, and (when risk-selected)
-native profiles before the aggregate `Coverage` context evaluates them. The
-aggregate and native gates require 100% coverage for changed executable Go
-statements. Overall coverage remains an unrounded, zero-tolerance merge-base
-non-regression check. Candidate and baseline profiles are evaluated by the
-same block-deduplicating checker; supporting policy and shortcut profiles
-contribute to changed-code coverage only. The checked-in badge is presentation
-only and is never read as a gate input.
+native profiles before the aggregate `Coverage` context evaluates them.
 
 Compatibility checks derive authoritative Interface snapshots from the PR
 merge-base and the latest reachable stable release. The candidate cannot bless

docs/releasing.md

@@ -1,56 +1,10 @@
 # 发布手册（预发 / 正式）
 
-发布只走一条受控链路：GitHub Actions 的 `Release` workflow 负责版本分配、封板、构建、签名和下游发布；Homebrew 以 workflow 自动创建的 Formula PR 经独立审核合入为交付边界。本地 `dws-release` 仍是兼容入口，但不再要求某一台固定电脑承担打包；不要直接运行 `goreleaser release`，也不要手工补打、移动或复用 tag。
+发布只走一条链路：本地脚本负责封板、验证并推送 annotated tag；GitHub Actions 负责构建和发布最终产物。不要直接运行 `goreleaser release`，也不要手工补打或移动 tag。
 
-发布前必须完成平台治理：目标 GitHub 仓库已启用 immutable releases，`main` 精确要求 `CI` workflow 的九个 context：`Lint`、`Test`、`Coverage`、`Policy`、`Edition`、`Interface Integrity`、`AI Behavior`、`CLI Smoke`、`Mock MCP`。云端和本地入口都会在封 tag 前检查 immutable releases、当前 SHA 的全部九个 context 和在途 Release；`v*` tag ruleset 仍需仓库管理员预先配置。
+发布前必须完成平台治理：目标 GitHub 仓库已启用 immutable releases，`main` 精确要求 `Code Admission — PR 合入门禁` 的九个 context：`Lint`、`Test`、`Coverage`、`Policy`、`Edition`、`Interface Integrity`、`AI Behavior`、`CLI Smoke`、`Mock MCP`，操作机已安装并登录 `gh`。本地脚本会在封 tag 前通过 API 检查 immutable releases、当前 SHA 的全部九个 context 和在途 Release；`v*` tag ruleset 仍需仓库管理员预先配置并由操作人确认。
 
-## 推荐入口：GitHub 云端发布
-
-任何具有仓库写权限、因而可以手动运行 Actions workflow 的成员，都可以基于当时最新的 `main` 发起发布：
-
-1. 在 GitHub Actions 打开 `Release`，选择 `Run workflow`，分支必须是默认分支 `main`。
-2. `release_operation=plan`，选择 `release_channel=beta|stable`；仅在开始新 beta 线时选择 `release_bump=patch|minor|major`。
-3. workflow summary 会给出唯一的下一版本。把对应的精确 `CHANGELOG.md` 章节通过 PR 合入 `main`。
-4. 再次运行，改为 `release_operation=publish`，并输入 `PUBLISH beta` 或 `PUBLISH stable`。
-
-`plan` 是纯只读操作，不创建 tag、预留版本号或生成包。CHANGELOG 合入期间若另一个发布先占用了该版本，`publish` 会重新分配并因 CHANGELOG 章节不匹配而拒绝，需要重新 plan。`publish` 会先再次确认 dispatch SHA 仍是当前 `main`、Code Admission 和平台治理均通过，再由唯一的 write job 使用 GitHub API 原子创建 annotated tag；同一次 run 随即进入既有的跨平台构建、GitHub/npm、可选 OSS/Gitee 发布和 Homebrew PR DAG。内置 `GITHUB_TOKEN` 创建的 tag 不依赖第二条 workflow 被再次触发。
-
-为缩短封板前后的关键路径，`publish` 的只读版本规划会与平台治理检查并行，seal 仍严格等待二者成功；plan 在 candidate annotated tag 上验证过的 contract 和 stable/beta baseline 会绑定进 seal，并由 seal 后的 tag authority 检查复用。Code Admission 状态与 immutable-releases 治理仍会在 seal 后再次读取，避免 preflight 与发布之间的状态变化被忽略。随后三类只读门禁（release automation、命令兼容性、multi-profile E2E）与 GoReleaser 构建并行；Node/archive 等仅供后处理使用的工具也延后到构建完成后安装。并行和已验证结果复用只改变调度，不降低发布门禁：任何一条验证失败都会阻止 GitHub Release、npm、镜像和 Homebrew 发布，delivery proof 也要求三条验证 job 全部成功。
-
-OSS 镜像默认不参与发布 DAG，适用于尚未创建 Bucket 的仓库。云端封板会把当时的仓库变量 `ENABLE_OSS_MIRROR=true` 记录为不可变 tag 元数据 `OSS-Mirror: enabled`，否则记录为 `deferred`；后续发布和撤回只读取该 sealed policy，不读取变量的当前值。`enabled` 继续对缺失凭据、无效 Bucket、上传、pointer 和撤回失败保持 fail-closed；`deferred` 明确跳过不存在的渠道。为避免补发后撤回遗漏，deferred 版本暂不接受 `repair_oss_version`，启用 OSS 只影响后续新 tag，直到补齐可审计的不可变 repair 证明。
-
-## 自动版本规则
-
-- beta：如果存在尚未封正式版的最高版本线，自动取 `beta.N+1`；否则从最新已分配正式版按所选 patch/minor/major 开新线并取 `beta.1`。
-- stable：先锁定最高开放版本线上的最新已分配 beta，再要求它已成功交付且未撤回；不会跳过失败/撤回的最新 beta 去选择更早版本。正式版 core 与该 beta 完全相同。
-- `vX.Y.Z`、`vX.Y.Z-beta.N` 一经分配就永久占用。撤回时创建 `withdrawn/v...` 墓碑，原编号永不复用。
-- 例如撤回 `v1.0.53-beta.5` 后，下一 beta 是 `v1.0.53-beta.6`；撤回正式版 `v1.0.53` 后，下一 patch 修复线是 `v1.0.54-beta.1`，验证后再发布 `v1.0.54`。
-- 如果最新 beta 已撤回，禁止直接用更早 beta 晋级正式版；必须先构建下一个 beta。
-
-## 全平台撤回与回滚
-
-已公开版本出现问题时，在 GitHub Actions 运行 `Withdraw release`，分支必须选择当前默认分支 `main`，并填写：
-
-- `version`：精确版本，例如 `v1.0.53` 或 `v1.0.53-beta.5`。
-- `reason`：8–300 字符的单行公开原因。
-- `confirmation`：精确输入 `WITHDRAW <version>`，例如 `WITHDRAW v1.0.53`。
-
-该 workflow 使用与发布相同的串行 publication lock，并进入受保护的 `release-withdrawal` environment。它只接受已经由 Release workflow 完整交付的 public immutable release，自动选择同一渠道中最新的、更早且未撤回的完整版本作为回退目标，然后按以下顺序执行：
-
-1. 先创建永久 annotated tag `withdrawn/<version>`，记录原 tag object、commit、原因、申请人和 workflow run。这个墓碑是版本号永久占用记录，永不移动、永不删除。
-2. 先验证 Homebrew Formula；若它仍指向问题版本，先创建回退 PR，再继续其他渠道撤回。这样 PR 创建失败时只留下可安全续跑的墓碑，不会先造成渠道分裂。若 Formula 尚未指向问题版本或已经处于安全版本，则直接校验。
-3. GitHub Release 先标记为 withdrawn；npm 精确版本执行 `deprecate`，并把 `latest` / `beta` dist-tag 回退；只有目标 tag 封存了 `OSS-Mirror: enabled` 时，OSS 才会先补齐回退版本资产，再移动 `latest.txt` / `beta.txt` 并删除问题版本目录；启用 Gitee 时同样先补齐回退 Release，再删除问题 Release 和 tag。
-4. npm 以及目标 tag 启用或发布时配置的镜像渠道均已验证安全后，删除 GitHub 上的问题 Release 和原 `v...` tag，并验证 `/releases/latest` 对正式版回到安全版本。若本次创建了 Homebrew PR，run 最后故意保持失败，直到另一名维护者审核合入；合入后，从新的 `main` 使用完全相同的 version、reason 和 confirmation 重跑并完成。永久 `withdrawn/v...` 墓碑始终保留。
-
-GitHub、npm、OSS、Gitee 和 Homebrew 的“回滚”指新的安装、升级和渠道解析不再拿到问题版本。已经装到用户电脑上的二进制无法被服务端强制降级；用户必须重新安装回退版本、安装后续修复版，或使用 CLI 自带的本地 rollback 能力。npm 不执行 `unpublish`：问题版本保留明确的弃用警告，但 `latest` / `beta` 不再指向它；即使 registry 允许删除，已发布过的版本号也不会重新使用。
-
-撤回前必须存在同一渠道中更早、完整交付且未撤回的安全版本；若目标是该渠道第一个版本、没有安全候选，workflow 会在创建墓碑或修改任何渠道前 fail closed，需要先决定明确的替代策略。CLI 本地 rollback 也只有在本机仍保留上一次升级备份时可用。
-
-撤回以“精确版本”为单位，不会因为正式版曾由某个 beta 晋级就隐式级联修改另一个渠道。若同一缺陷同时存在于正式版及其 beta，应先撤回正式版，再撤回对应 beta，并分别使用各自的精确确认串；每次都只会把该渠道回退到自己的安全候选。
-
-撤回正式版 `v1.0.53` 后，`v1.0.53` 仍被墓碑视为已分配。下一次 patch 发布从 `v1.0.54-beta.1` 开始，验证后晋级 `v1.0.54`。撤回 `v1.0.53-beta.5` 后，同一开放版本线继续为 `v1.0.53-beta.6`；不会退回或复用 `beta.5`。
-
-## 兼容入口：本地发布
+## 日常只用一个入口
 
 安装发布 Skill 后直接运行：
 
@@ -71,11 +25,11 @@ dws-release config --remote origin
 ```text
 main 上的候选代码 + beta CHANGELOG
   → vX.Y.Z-beta.N（预发验证）
-  → 补正式 CHANGELOG；允许继续通过 PR 合入新 commit
-  → vX.Y.Z（正式发布，封板提交必须包含该 beta 提交）
+  → 只允许补正式 CHANGELOG，源码不得再变化
+  → vX.Y.Z（正式发布）
 ```
 
-云端入口自动选择本次最新、已交付且未撤回的 beta；本地入口必须显式指定。流水线要求该 beta 已成功交付、未撤回，且 beta 提交必须位于正式发布封板提交的历史中——不能跳过 beta 直接发正式版，但允许在 beta 之后把经过 review 合入 `main` 的 commit 一起发布。
+正式版必须显式指定本次验证过的 beta。脚本会比较两者：除 `CHANGELOG.md` 外只要有任何文件变化，就拒绝正式发布。这样预发测过的代码、命令树和正式发布的代码是同一份。
 
 ## 预发发布
 
@@ -114,7 +68,7 @@ dws-release v1.2.3 --from-beta v1.2.3-beta.1
 dws-release v1.2.3 --from-beta v1.2.3-beta.1 --publish
 ```
 
-本地入口的 `FROM_BETA` 不会自动推断；云端入口会按上述规则唯一选择。两种入口都会把它写入 stable annotated tag 的 `From-Beta` 元数据，CI 会再次读取和验证。
+`FROM_BETA` 不会自动推断，并会写入 stable annotated tag 的 `From-Beta` 元数据，CI 会再次读取和验证。
 
 ## CHANGELOG 契约
 
@@ -132,20 +86,20 @@ dws-release v1.2.3 --from-beta v1.2.3-beta.1 --publish
 
 ## CI/CD 保证
 
-- 只接受 `vX.Y.Z-beta.N` 和 `vX.Y.Z`，且新版本必须高于上一正式版。这里的“上一正式版”必须同时具备公开非草稿 GitHub Release 和同 tag/commit 的成功 Release workflow；只有 tag、没有交付成功的孤儿版本会阻断后续发布，要求走受保护恢复补齐。云端 tag 会固定 `Release-Run`、requester、commit 和版本分配指纹，交付验证按该精确 run/attempt 及完整 job graph 取证，不接受任意 `workflow_dispatch`。历史版本若曾通过专用 recovery workflow 完成交付，只能使用仓库内 `delivered-stable-recoveries.json` 中精确到 tag、commit、run、workflow SHA 与 attempt 的 reviewed 证据。
-- tag 必须是 annotated tag；本地脚本要求封板提交已通过 PR 合入并包含在远端 `main` 历史中，发布只推送 tag。CI 允许其后 `main` 继续前进，但始终要求封板提交位于 `main` 历史中。
+- 只接受 `vX.Y.Z-beta.N` 和 `vX.Y.Z`，且新版本必须高于上一正式版。这里的“上一正式版”必须同时具备公开非草稿 GitHub Release 和同 tag/commit 的成功 Release workflow；只有 tag、没有交付成功的孤儿版本会阻断后续发布，要求先重跑补齐。历史版本若曾通过专用 recovery workflow 完成交付，只能使用仓库内 `delivered-stable-recoveries.json` 中精确到 tag、commit、run、workflow SHA 与 attempt 的 reviewed 证据；验证仍要求 release、Darwin 签名和最终发布三个 job 全部成功，不能接受任意 workflow_dispatch。
+- tag 必须是 annotated tag；本地脚本在推送前重新确认 HEAD 与远端 `main` 完全一致，CI 允许其后 `main` 前进，但要求封板提交仍位于 `main` 历史中。
 - 日常 CI 和发布前都会对比“最新已交付正式版”的完整命令树；若长时间预检期间该 baseline 发生变化，会针对新的 baseline 重新比较。
 - GoReleaser 只构建；Darwin 重签、checksums 重算和 npm 安装验证通过后，才统一上传 GitHub Release 的最终产物。
 - 六个平台归档会逐个解包并核验二进制内嵌版本；公开资产集合、checksums 集合和 npm tarball integrity 都必须精确一致。npm tarball 固定由 npm `10.9.2` 打包，避免重跑时因 runner 自带 npm 漂移产生不同字节。
-- stable 发布到 npm `latest`；prerelease 发布到 npm `beta`。启用 `ENABLE_OSS_MIRROR=true` 后，stable 同步 OSS `latest.txt` 和共享安装脚本，prerelease 只同步 OSS `beta.txt`，不会覆盖稳定入口。
-- Release workflow 使用一个最多容纳 100 个 pending run 的串行 publication queue；版本规划、云端封板、发布、恢复、修复和撤回共享同一发布锁。
-- 本地 tag push 失败时会删除本次新建的本地 tag。远端 tag 一旦创建，后续发布归 CI 所有；发布中途失败时走受保护恢复，禁止改 tag 指向或复用版本号。只有已经公开版本经过受保护的全渠道撤回并留下永久 `withdrawn/...` 墓碑后，撤回 workflow 才会在最后一步删除原 tag。
+- stable 发布到 npm `latest`，更新 OSS `latest.txt` 和共享安装脚本；prerelease 发布到 npm `beta`，只更新 OSS `beta.txt`，不会覆盖稳定入口。
+- Release workflow 使用一个最多容纳 100 个 pending run 的串行 publication queue；本地入口仍要求上一条 Release 完成后才能封下一个 tag。
+- 本地 tag push 失败时会删除本次新建的本地 tag。tag 一旦成功推送，后续发布归 CI 所有，禁止改 tag 指向或复用版本号。
 
 npm 补发只允许从默认分支触发 Release workflow 的 `repair_npm_version`。它只支持启用 immutable releases 后、由本流水线成功产出的公开 immutable release：目标必须是 `main` 历史中的 annotated tag，并且同 commit 的 `Build immutable GitHub Release` job 已成功。即使后续 npm 分发失败，这个独立的产物封存边界仍可作为补发依据。补发会用目标 commit 的 npm 模板重组包，逐平台核验资产和二进制版本，再发布到隔离的 `backfill` dist-tag，不会回滚 `latest` / `beta`。历史 mutable release 不进入自动补发路径，避免把可被替换的资产带入 npm。
 
-已启用的 OSS 或 Gitee 分发失败且 GitHub immutable Release、npm 已交付时，从受保护的默认分支触发
+OSS/Gitee 分发失败且 GitHub immutable Release、npm 已交付时，从受保护的默认分支触发
 Release workflow，并且只填写 `repair_oss_version` 或 `repair_gitee_version` 之一。channel
-repair 会精确绑定失败 tag run 的最新 attempt，且 OSS repair 要求 tag 的 sealed policy 为 `enabled`；contract、构建、Developer ID 签名、
+repair 会精确绑定失败 tag run 的最新 attempt；contract、构建、Developer ID 签名、
 immutable GitHub 发布和 npm delivery 必须全部成功，且只能有一个 OSS/Gitee 下游失败，
 随后才会下载并重新校验原始资产、修复所选镜像。OSS repair 必须匹配失败的 OSS step；
 Gitee repair 还允许其 job 因该 OSS 失败而 skipped，此时只代表 Gitee backfill 成功，
@@ -156,27 +110,25 @@ workflow 和本地直发脚本已停用，避免绕开 publication queue 或用
 
 ## 既有 tag 的紧急恢复
 
-云端封板或本地 tag push 已成功、但 Release workflow 失败且 GitHub Release 尚未公开时，不要新建临时 workflow、移动 tag 或跳过门禁。在最新且干净的 `main` worktree 运行：
+tag push 已成功、但 Release workflow 失败且 GitHub Release 尚未公开时，不要新建临时 workflow、移动 tag 或跳过门禁。在最新且干净的 `main` worktree 运行：
 
 ```bash
 dws-release recover v1.2.3-beta.1
 ```
 
-命令会自动解析 annotated tag object、peeled commit，以及 tag 绑定的失败云端 run 或最近一次匹配的失败 tag-push run；也可以用 `--failed-run <run-id>` 精确指定。确认完整版本号后，它从默认分支触发受保护的恢复模式并等待完成。恢复模式必须满足：
+命令会自动解析 annotated tag object、peeled commit 和最近一次匹配的失败 tag-push run；也可以用 `--failed-run <run-id>` 精确指定。确认完整版本号后，它从默认分支触发受保护的恢复模式并等待完成。恢复模式必须满足：
 
-- 输入精确绑定原 annotated tag object、commit 和失败的 sealed `Release` run；云端 run 还必须与 tag 内的 run ID、attempt、requester 完全一致，commit 必须仍在 `main` 历史中。
-- 目标只允许不存在 GitHub Release 或仍为 Draft；已经公开的版本不能全量重建：单个下游故障走对应的 channel repair，版本本身有问题则走受保护的全平台 withdrawal。
+- 输入精确绑定原 annotated tag object、commit 和失败的 exact-tag `Release` run；commit 必须仍在 `main` 历史中。
+- 目标只允许不存在 GitHub Release 或仍为 Draft；已经公开的版本只能走对应的 channel repair，不能全量重建。
 - `release-recovery` environment 必须限制为受保护分支、配置至少一名 required reviewer，并禁止自审；workflow 会通过 API 复核这些设置，未配置时 fail closed。
-- 恢复复用正常的 contract、构建、Developer ID 签名、资产校验、immutable 发布、Homebrew、npm，以及已启用的 OSS jobs，不存在 recovery 专用 publisher 或门禁跳过。
+- 恢复复用正常的 contract、构建、Developer ID 签名、资产校验、immutable 发布、Homebrew、npm 和 OSS jobs，不存在 recovery 专用 publisher 或门禁跳过。
 - 如果 GitHub Release 已在 recovery 中封存、后续 Homebrew/npm 校验发生瞬时失败，只重跑该 run 的 failed jobs；流水线仅在隐藏 run marker、tag object、commit 和 finalized artifact 字节全部精确一致时复用公开 Release。
 
 成功的默认分支恢复 run 会成为后续 beta → stable 和 stable baseline 验证的可审计交付证据；历史临时分支恢复仍只接受 reviewed manifest 中的固定证据。
 
-云端 seal 后不要使用 GitHub 的 “Re-run failed jobs” 作为交付修复：annotated tag 永久绑定最初的 run attempt，普通 rerun 不会成为可接受的交付证据。GitHub Release 尚未公开时走上述 protected recovery；已经公开且仅 npm/OSS/Gitee 某一渠道失败时走对应 repair；版本内容本身有问题时走 withdrawal。
+OSS 的 `latest.txt` / `beta.txt` 当前是镜像频道元数据；仓库内安装器仍从 GitHub/Gitee 解析版本，不能把 OSS pointer 当成已接入的安装通道。
 
-OSS 的 `latest.txt` / `beta.txt` 是镜像频道元数据；当前仓库安装器仍主要从 GitHub/Gitee 解析版本。启用 OSS 后，发布和撤回把它作为受控分发渠道处理，保证一旦外部消费者接入该 pointer，也不会继续解析到已撤回版本；未启用时两条流程都明确跳过不存在的 OSS 渠道。
-
-Release workflow 会生成 Darwin/Linux 双架构 Formula，并分别为 stable/beta 打开 Homebrew PR；tap 的默认分支仍以独立审核合入为交付边界。撤回 workflow 使用相同模板和回退版本 checksums 打开反向 PR；问题 GitHub Release 会先被移除以阻止新安装，永久墓碑和 workflow 日志承担审计/续跑依据。
+Homebrew 当前只属于本机预检/手工公式通道：预检会在当前 macOS 架构真实安装，但 Release workflow 不发布 tap，CI 生成的单主机公式也不应当作 Darwin 双架构正式交付。正式自动交付范围是 GitHub Release、npm、OSS，以及显式开启时的 Gitee fallback；Homebrew 双架构 tap 发布需另立需求。
 
 ## 平台治理前置
 
@@ -184,14 +136,8 @@ Release workflow 会生成 Darwin/Linux 双架构 Formula，并分别为 stable/
 
 - `main` 必须精确要求 `Lint`、`Test`、`Coverage`、`Policy`、`Edition`、`Interface Integrity`、`AI Behavior`、`CLI Smoke`、`Mock MCP` 九个 Code Admission context；tag workflow 也会通过 Checks API 再确认该封板 SHA 上九项全部成功。
 - 必须启用 immutable releases；它只保护启用后发布的 release，因此应在第一次使用新流水线前配置。为 `v*` 增加 tag ruleset，限制创建权限，并在 release 发布前保护 tag 的短暂窗口。
-- tag ruleset 还必须覆盖 `withdrawn/v*`：只允许受保护的撤回 workflow 创建墓碑，禁止更新或删除墓碑；同时应允许 Release workflow 创建新的 `v*`，允许撤回 workflow 在全部渠道回退后删除精确的问题 `v*`。若组织级规则阻止这两个 workflow 的预期动作，发布或撤回会 fail closed，不能靠手工移动 tag 绕过。
 - 配置 `RELEASE_GOVERNANCE_TOKEN` Actions secret，只授予目标仓库 `Administration: read`；内置 `GITHUB_TOKEN` 不具备 immutable-releases API 所需的仓库治理权限。每次本地预检和 tag workflow 都使用这一个身份进行 fail-closed 验证。
-- 配置 `APPLE_CERTIFICATE_P12_BASE64`、`APPLE_CERTIFICATE_PASSWORD` 和具备发布权限的 `NPM_TOKEN`；撤回还要求该 npm 身份能够执行 `deprecate` 和修改 dist-tag。
-- 启用 OSS 镜像时，先创建有效 Bucket，再设置仓库变量 `ENABLE_OSS_MIRROR=true`，并配置 `OSS_ACCESS_KEY_ID`、`OSS_ACCESS_KEY_SECRET`、`OSS_ENDPOINT`、`OSS_BUCKET`，按需配置 `OSS_PREFIX`。启用后发布保持 fail-closed；撤回身份必须能够补齐安全版本资产、写 `latest.txt` / `beta.txt` 并删除问题版本前缀。尚未 provision Bucket 时保持该变量未设置或不等于 `true`，新 tag 会封存 `OSS-Mirror: deferred` 并跳过 OSS；该版本不能通过现有 repair 流程事后改成启用。
-- 若启用 Gitee fallback，设置 `ENABLE_GITEE_UPLOAD_FALLBACK=true`，并配置 `GITEE_TOKEN`、`GITEE_USER`、`GITEE_REPO`；该身份必须能够创建和删除目标仓库的 Release 与 tag。
 - 单独配置 `HOMEBREW_PR_TOKEN`，优先使用仅授权本仓库且具备 `Contents: write`、`Pull requests: write` 的 fine-grained PAT；若组织策略不允许该账号使用 fine-grained PAT，则回退到仅带 `public_repo` scope 的专用 classic PAT。治理预检和 tag contract 会验证 token 身份、classic scope，并用 `[skip ci]` 临时分支和 draft PR 完成真实写权限 canary，随后立即关闭 PR、删除分支；任何清理失败都会 fail closed。门禁也会拒绝与治理 token 复用。
 - 创建 `release-recovery` environment，只允许受保护分支，设置 required reviewer、禁止自审并关闭管理员绕过。workflow 会读取 environment 的 required-reviewer、prevent-self-review 和 protected-branch 规则；规则缺失时紧急恢复会失败，正常 beta/stable tag 发布不受影响。
-- 创建 `release-withdrawal` environment，只允许受保护分支，设置至少一名 required reviewer、禁止申请人自审并关闭管理员绕过。撤回 workflow 会通过 API 复核这些规则；任何一项缺失都会在触碰 npm、OSS、Gitee、Homebrew 或 GitHub Release 前失败。
-- 仓库或组织的 Actions 策略必须允许 `Release` 与 `Withdraw release` workflow 的 `GITHUB_TOKEN` 获得各 job 声明的 `contents: write`。若上述发布凭证采用 environment secret，确认 `release-withdrawal` 审批完成后能够读取撤回所需的 npm、OSS、Gitee 和 Homebrew 凭证。
 
 immutable releases，或任一 Code Admission context 缺失、未成功时，发布脚本会自动拒绝封 tag。tag ruleset 可能来自组织层，脚本不自动推断其最终作用范围；管理员确认不能省略，脚本约定也不能替代平台强制。

internal/app/access_token_manager_test.go

@@ -1,223 +0,0 @@
-package app
-
-import (
-	"context"
-	"errors"
-	"os"
-	"path/filepath"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	authpkg "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/auth"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/edition"
-)
-
-type tokenManagerSnapshotProvider struct {
-	load func() (*authpkg.TokenData, error)
-}
-
-func (p tokenManagerSnapshotProvider) GetAccessToken(context.Context) (string, error) {
-	data, err := p.load()
-	if err != nil || data == nil {
-		return "", err
-	}
-	return data.AccessToken, nil
-}
-
-func (p tokenManagerSnapshotProvider) GetTokenSnapshot(context.Context) (*authpkg.TokenData, error) {
-	return p.load()
-}
-
-type tokenManagerLegacyGetter struct {
-	token string
-	err   error
-}
-
-func (g tokenManagerLegacyGetter) GetToken() (string, string, error) {
-	return g.token, "file", g.err
-}
-
-func installTokenManagerFakes(t *testing.T, load func() (*authpkg.TokenData, error)) {
-	t.Helper()
-	oldProvider, oldLegacy := newAccessTokenProvider, newLegacyTokenManager
-	oldEdition := edition.Get()
-	edition.Override(&edition.Hooks{})
-	newAccessTokenProvider = func(string) accessTokenGetter {
-		return tokenManagerSnapshotProvider{load: load}
-	}
-	newLegacyTokenManager = func(string) legacyTokenGetter {
-		return tokenManagerLegacyGetter{err: authpkg.ErrTokenDataNotFound}
-	}
-	t.Cleanup(func() {
-		newAccessTokenProvider, newLegacyTokenManager = oldProvider, oldLegacy
-		edition.Override(oldEdition)
-	})
-}
-
-func TestCrossPlatformCoverageTokenManagerCachesUntilMarkerRevisionChanges(t *testing.T) {
-	configDir := t.TempDir()
-	if err := authpkg.WriteTokenMarker(configDir); err != nil {
-		t.Fatal(err)
-	}
-	var calls atomic.Int32
-	token := "token-a"
-	installTokenManagerFakes(t, func() (*authpkg.TokenData, error) {
-		calls.Add(1)
-		return &authpkg.TokenData{AccessToken: token, ExpiresAt: time.Now().Add(time.Hour)}, nil
-	})
-
-	manager := NewTokenManager()
-	first, err := manager.Get(context.Background(), configDir, "")
-	if err != nil || first.AccessToken != "token-a" {
-		t.Fatalf("first token = %#v, %v", first, err)
-	}
-	second, err := manager.Get(context.Background(), configDir, "")
-	if err != nil || second.AccessToken != "token-a" || calls.Load() != 1 {
-		t.Fatalf("cached token = %#v, %v, calls=%d", second, err, calls.Load())
-	}
-
-	token = "token-b"
-	if err := authpkg.WriteTokenMarker(configDir); err != nil {
-		t.Fatal(err)
-	}
-	rotated, err := manager.Get(context.Background(), configDir, "")
-	if err != nil || rotated.AccessToken != "token-b" || calls.Load() != 2 {
-		t.Fatalf("rotated token = %#v, %v, calls=%d", rotated, err, calls.Load())
-	}
-}
-
-func TestCrossPlatformCoverageTokenManagerDoesNotCacheWithoutExpiryOrRevision(t *testing.T) {
-	configDir := t.TempDir()
-	var calls atomic.Int32
-	installTokenManagerFakes(t, func() (*authpkg.TokenData, error) {
-		calls.Add(1)
-		return &authpkg.TokenData{AccessToken: "token"}, nil
-	})
-	manager := NewTokenManager()
-	for range 2 {
-		if _, err := manager.Get(context.Background(), configDir, ""); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if calls.Load() != 2 {
-		t.Fatalf("provider calls = %d, want 2", calls.Load())
-	}
-}
-
-func TestCrossPlatformCoverageTokenManagerTreatsMalformedMarkerAsUncacheable(t *testing.T) {
-	configDir := t.TempDir()
-	if err := os.WriteFile(filepath.Join(configDir, "token.json"), []byte("{"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	var calls atomic.Int32
-	installTokenManagerFakes(t, func() (*authpkg.TokenData, error) {
-		calls.Add(1)
-		return &authpkg.TokenData{AccessToken: "token", ExpiresAt: time.Now().Add(time.Hour)}, nil
-	})
-	manager := NewTokenManager()
-	for range 2 {
-		if snapshot, err := manager.Get(context.Background(), configDir, ""); err != nil || snapshot.AccessToken != "token" {
-			t.Fatalf("snapshot = %#v, error = %v", snapshot, err)
-		}
-	}
-	if calls.Load() != 2 {
-		t.Fatalf("provider calls = %d, want 2", calls.Load())
-	}
-}
-
-func TestCrossPlatformCoverageTokenManagerDoesNotCacheOpaqueEditionStorageWithProviderFallback(t *testing.T) {
-	configDir := t.TempDir()
-	if err := authpkg.WriteTokenMarker(configDir); err != nil {
-		t.Fatal(err)
-	}
-	var calls atomic.Int32
-	installTokenManagerFakes(t, func() (*authpkg.TokenData, error) {
-		calls.Add(1)
-		return &authpkg.TokenData{AccessToken: "token", ExpiresAt: time.Now().Add(time.Hour)}, nil
-	})
-	edition.Override(&edition.Hooks{
-		LoadToken: func(string) ([]byte, error) { return nil, nil },
-		TokenProvider: func(_ context.Context, fallback func() (string, error)) (string, error) {
-			return fallback()
-		},
-	})
-	manager := NewTokenManager()
-	for range 2 {
-		if _, err := manager.Get(context.Background(), configDir, ""); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if calls.Load() != 2 {
-		t.Fatalf("provider calls = %d, want 2", calls.Load())
-	}
-}
-
-func TestCrossPlatformCoverageTokenManagerCoalescesConcurrentLoads(t *testing.T) {
-	configDir := t.TempDir()
-	if err := authpkg.WriteTokenMarker(configDir); err != nil {
-		t.Fatal(err)
-	}
-	var calls atomic.Int32
-	release := make(chan struct{})
-	installTokenManagerFakes(t, func() (*authpkg.TokenData, error) {
-		calls.Add(1)
-		<-release
-		return &authpkg.TokenData{AccessToken: "token", ExpiresAt: time.Now().Add(time.Hour)}, nil
-	})
-	manager := NewTokenManager()
-	const workers = 8
-	var wg sync.WaitGroup
-	wg.Add(workers)
-	errs := make(chan error, workers)
-	for range workers {
-		go func() {
-			defer wg.Done()
-			_, err := manager.Get(context.Background(), configDir, "")
-			errs <- err
-		}()
-	}
-	for calls.Load() == 0 {
-		time.Sleep(time.Millisecond)
-	}
-	close(release)
-	wg.Wait()
-	close(errs)
-	for err := range errs {
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-	if calls.Load() != 1 {
-		t.Fatalf("provider calls = %d, want 1", calls.Load())
-	}
-}
-
-func TestCrossPlatformCoverageTokenManagerPreservesProviderFailure(t *testing.T) {
-	configDir := t.TempDir()
-	want := errors.New("keychain permission denied")
-	installTokenManagerFakes(t, func() (*authpkg.TokenData, error) { return nil, want })
-	_, err := NewTokenManager().Get(context.Background(), configDir, "")
-	if !errors.Is(err, want) {
-		t.Fatalf("error = %v, want cause %v", err, want)
-	}
-	if errors.Is(err, authpkg.ErrTokenDataNotFound) {
-		t.Fatalf("provider failure was misclassified as missing credentials: %v", err)
-	}
-}
-
-func TestCrossPlatformCoverageTokenResolutionErrorOnlyClassifiesTrueMissingCredential(t *testing.T) {
-	missing := tokenResolutionError(authpkg.ErrTokenDataNotFound)
-	var typed interface{ Unwrap() error }
-	if !errors.As(missing, &typed) || !errors.Is(missing, authpkg.ErrTokenDataNotFound) {
-		t.Fatalf("missing error = %v", missing)
-	}
-	want := errors.New("decrypt failed")
-	if got := tokenResolutionError(want); !errors.Is(got, want) || errors.Is(got, authpkg.ErrTokenDataNotFound) {
-		t.Fatalf("storage error = %v", got)
-	}
-	if got := tokenResolutionError(context.Canceled); !errors.Is(got, context.Canceled) {
-		t.Fatalf("cancellation = %v", got)
-	}
-}

internal/app/access_token_resolve.go

@@ -21,61 +21,19 @@ import (
 	"log/slog"
 	"path/filepath"
 	"strings"
-	"sync"
-	"time"
 
 	authpkg "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/auth"
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/edition"
 )
 
-const accessTokenRefreshWindow = 5 * time.Minute
-
 type legacyTokenGetter interface {
 	GetToken() (string, string, error)
 }
 
-type accessTokenSnapshotGetter interface {
-	GetTokenSnapshot(context.Context) (*authpkg.TokenData, error)
-}
-
-// AccessTokenSnapshot is the minimal bearer view needed by the process cache.
-// Refresh-token material never leaves the auth package.
-type AccessTokenSnapshot struct {
-	AccessToken string
-	ExpiresAt   time.Time
-	Source      string
-}
-
-type tokenManagerKey struct {
-	configDir string
-	profile   string
-}
-
-type tokenManagerEntry struct {
-	mu       sync.Mutex
-	snapshot AccessTokenSnapshot
-	revision string
-}
-
-// TokenManager is the only process cache for user access tokens. Cache entries
-// are isolated by config directory and profile, expiry-aware, and invalidated
-// by the credential publication marker written by auth storage.
-type TokenManager struct {
-	mu      sync.Mutex
-	entries map[tokenManagerKey]*tokenManagerEntry
-	now     func() time.Time
-}
-
-func NewTokenManager() *TokenManager {
-	return &TokenManager{entries: make(map[tokenManagerKey]*tokenManagerEntry), now: time.Now}
-}
-
-var runtimeTokenManager = NewTokenManager()
-
 var (
 	newAccessTokenProvider = func(configDir string) accessTokenGetter {
-		discard := slog.New(slog.NewTextHandler(io.Discard, nil))
-		provider := authpkg.NewOAuthProvider(configDir, discard)
+		disc := slog.New(slog.NewTextHandler(io.Discard, nil))
+		provider := authpkg.NewOAuthProvider(configDir, disc)
 		configureOAuthProviderCompatibility(provider, configDir)
 		return provider
 	}
@@ -86,218 +44,64 @@ var (
 	}
 )
 
-// Get resolves an access token for the active runtime profile.
-func (m *TokenManager) Get(ctx context.Context, configDir, explicitToken string) (AccessTokenSnapshot, error) {
-	if token := strings.TrimSpace(explicitToken); token != "" {
-		return AccessTokenSnapshot{AccessToken: token, Source: "explicit"}, nil
+// resolveAccessTokenFromDir loads OAuth then legacy token from configDir, applying
+// the same host compatibility hooks as MCP. It mirrors the former body of
+// getCachedRuntimeToken (excluding process-level cache and timing).
+func resolveAccessTokenFromDir(ctx context.Context, configDir string) (string, error) {
+	provider := newAccessTokenProvider(configDir)
+	token, tokenErr := provider.GetAccessToken(ctx)
+	if tokenErr == nil && strings.TrimSpace(token) != "" {
+		return strings.TrimSpace(token), nil
+	}
+	if tokenErr != nil && errors.Is(tokenErr, authpkg.ErrTokenDecryption) {
+		return "", tokenErr
+	}
+	if strings.TrimSpace(authpkg.RuntimeProfile()) != "" {
+		if tokenErr != nil {
+			return "", tokenErr
+		}
+		return "", nil
+	}
+	manager := newLegacyTokenManager(configDir)
+	if leg, _, err := manager.GetToken(); err == nil && strings.TrimSpace(leg) != "" {
+		return strings.TrimSpace(leg), nil
+	}
+	if tokenErr != nil {
+		return "", tokenErr
+	}
+	return "", nil
+}
+
+// ResolveAuxiliaryAccessToken resolves a bearer token for HTTP clients that should
+// align with MCP tool calls. Non-empty explicitToken wins. When configDir matches
+// the active edition config directory, the same process-cached path as MCP is used.
+// Otherwise tokens are loaded from configDir with host compatibility hooks applied.
+func ResolveAuxiliaryAccessToken(ctx context.Context, configDir, explicitToken string) (string, error) {
+	if t := strings.TrimSpace(explicitToken); t != "" {
+		return t, nil
 	}
 	if strings.TrimSpace(configDir) == "" {
-		return AccessTokenSnapshot{}, fmt.Errorf("config directory is empty")
+		return "", fmt.Errorf("config directory is empty")
 	}
-	key := tokenManagerKey{
-		configDir: canonicalTokenConfigDir(configDir),
-		profile:   strings.TrimSpace(authpkg.RuntimeProfile()),
-	}
-	entry := m.entry(key)
-	entry.mu.Lock()
-	defer entry.mu.Unlock()
-
-	now := time.Now()
-	if m != nil && m.now != nil {
-		now = m.now()
-	}
-	revision, present, err := authpkg.ReadTokenMarkerRevision(configDir)
-	if err != nil {
-		return AccessTokenSnapshot{}, err
-	}
-	if tokenSnapshotUsable(entry.snapshot, now) && present && revision != "" && revision == entry.revision {
-		return entry.snapshot, nil
-	}
-
-	// Treat the marker and credential as one optimistic snapshot. A concurrent
-	// login/refresh between the reads causes a retry instead of caching stale A
-	// under the publication marker for B.
-	for attempt := 0; attempt < 4; attempt++ {
-		beforeRevision, beforePresent, err := authpkg.ReadTokenMarkerRevision(configDir)
-		if err != nil {
-			return AccessTokenSnapshot{}, err
+	if filepath.Clean(configDir) == filepath.Clean(defaultConfigDir()) {
+		if tok := resolveRuntimeAuthToken(ctx, ""); tok != "" {
+			return tok, nil
 		}
-		snapshot, err := resolveTokenSnapshotWithEdition(ctx, configDir, key.profile)
-		if err != nil {
-			return AccessTokenSnapshot{}, err
-		}
-		afterRevision, afterPresent, err := authpkg.ReadTokenMarkerRevision(configDir)
-		if err != nil {
-			return AccessTokenSnapshot{}, err
-		}
-		if beforePresent != afterPresent || beforeRevision != afterRevision {
-			continue
-		}
-		if strings.TrimSpace(snapshot.AccessToken) == "" {
-			return AccessTokenSnapshot{}, noCredentialsError()
-		}
-		if tokenSnapshotUsable(snapshot, now) && afterPresent && afterRevision != "" {
-			entry.snapshot = snapshot
-			entry.revision = afterRevision
-		} else {
-			entry.snapshot = AccessTokenSnapshot{}
-			entry.revision = ""
-		}
-		return snapshot, nil
+		return "", noCredentialsError()
 	}
-	return AccessTokenSnapshot{}, fmt.Errorf("token publication changed repeatedly while resolving credentials")
-}
-
-func (m *TokenManager) entry(key tokenManagerKey) *tokenManagerEntry {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	if m.entries == nil {
-		m.entries = make(map[tokenManagerKey]*tokenManagerEntry)
-	}
-	entry := m.entries[key]
-	if entry == nil {
-		entry = &tokenManagerEntry{}
-		m.entries[key] = entry
-	}
-	return entry
-}
-
-func (m *TokenManager) Invalidate() {
-	if m == nil {
-		return
-	}
-	m.mu.Lock()
-	m.entries = make(map[tokenManagerKey]*tokenManagerEntry)
-	m.mu.Unlock()
-}
-
-func resolveTokenSnapshotWithEdition(ctx context.Context, configDir, profile string) (AccessTokenSnapshot, error) {
-	hooks := edition.Get()
-	opaqueStorage := hooks.LoadToken != nil || hooks.SaveToken != nil || hooks.DeleteToken != nil
-	provider := hooks.TokenProvider
-	if provider == nil {
-		snapshot, err := resolveAccessTokenSnapshotFromDir(ctx, configDir, profile)
-		if err != nil {
-			return AccessTokenSnapshot{}, err
-		}
-		// Opaque edition storage hooks have no publication-revision contract.
-		// Resolve them on every logical request instead of caching a token that
-		// may be replaced outside the default auth store.
-		if opaqueStorage {
-			snapshot.ExpiresAt = time.Time{}
-		}
-		return snapshot, nil
-	}
-	var fallbackSnapshot AccessTokenSnapshot
-	var fallbackCalled bool
-	token, err := provider(ctx, func() (string, error) {
-		fallbackCalled = true
-		var fallbackErr error
-		fallbackSnapshot, fallbackErr = resolveAccessTokenSnapshotFromDir(ctx, configDir, profile)
-		if fallbackErr != nil {
-			return "", fallbackErr
-		}
-		return fallbackSnapshot.AccessToken, nil
-	})
-	if err != nil {
-		return AccessTokenSnapshot{}, fmt.Errorf("edition token provider: %w", err)
-	}
-	token = strings.TrimSpace(token)
-	if token == "" {
-		return AccessTokenSnapshot{}, noCredentialsError()
-	}
-	if fallbackCalled && token == fallbackSnapshot.AccessToken {
-		if opaqueStorage {
-			fallbackSnapshot.ExpiresAt = time.Time{}
-		}
-		return fallbackSnapshot, nil
-	}
-	// Edition providers expose no lifetime metadata, so resolve them on every
-	// logical request instead of recreating a process-lifetime string cache.
-	return AccessTokenSnapshot{AccessToken: token, Source: "edition"}, nil
-}
-
-func resolveAccessTokenSnapshotFromDir(ctx context.Context, configDir, profile string) (AccessTokenSnapshot, error) {
-	provider := newAccessTokenProvider(configDir)
-	if snapshotProvider, ok := provider.(accessTokenSnapshotGetter); ok {
-		data, err := snapshotProvider.GetTokenSnapshot(ctx)
-		if err == nil && data != nil && strings.TrimSpace(data.AccessToken) != "" {
-			return AccessTokenSnapshot{
-				AccessToken: strings.TrimSpace(data.AccessToken),
-				ExpiresAt:   data.ExpiresAt,
-				Source:      "oauth",
-			}, nil
-		}
-		if err != nil && !errors.Is(err, authpkg.ErrTokenDataNotFound) {
-			return AccessTokenSnapshot{}, err
-		}
-		if strings.TrimSpace(profile) != "" {
-			return AccessTokenSnapshot{}, authpkg.ErrTokenDataNotFound
-		}
-		return resolveLegacyToken(configDir, err)
-	}
-
-	token, err := provider.GetAccessToken(ctx)
-	if err == nil && strings.TrimSpace(token) != "" {
-		return AccessTokenSnapshot{AccessToken: strings.TrimSpace(token), Source: "oauth_compat"}, nil
-	}
-	if err != nil && !errors.Is(err, authpkg.ErrTokenDataNotFound) {
-		return AccessTokenSnapshot{}, err
-	}
-	if strings.TrimSpace(profile) != "" {
-		return AccessTokenSnapshot{}, authpkg.ErrTokenDataNotFound
-	}
-	return resolveLegacyToken(configDir, err)
-}
-
-func resolveLegacyToken(configDir string, oauthErr error) (AccessTokenSnapshot, error) {
-	token, source, err := newLegacyTokenManager(configDir).GetToken()
-	if err == nil && strings.TrimSpace(token) != "" {
-		return AccessTokenSnapshot{AccessToken: strings.TrimSpace(token), Source: source}, nil
-	}
-	if err != nil && !errors.Is(err, authpkg.ErrTokenDataNotFound) {
-		return AccessTokenSnapshot{}, err
-	}
-	if oauthErr != nil {
-		return AccessTokenSnapshot{}, oauthErr
-	}
-	return AccessTokenSnapshot{}, authpkg.ErrTokenDataNotFound
-}
-
-func resolveAccessTokenFromDir(ctx context.Context, configDir string) (string, error) {
-	snapshot, err := resolveAccessTokenSnapshotFromDir(ctx, configDir, authpkg.RuntimeProfile())
+	tok, err := resolveAccessTokenFromDir(ctx, configDir)
 	if err != nil {
 		return "", err
 	}
-	return snapshot.AccessToken, nil
-}
-
-// ResolveAuxiliaryAccessToken resolves every non-runner bearer token through
-// the same TokenManager used by MCP tool calls.
-func ResolveAuxiliaryAccessToken(ctx context.Context, configDir, explicitToken string) (string, error) {
-	snapshot, err := runtimeTokenManager.Get(ctx, configDir, explicitToken)
-	if err != nil {
-		return "", err
+	if tok != "" {
+		return tok, nil
 	}
-	return snapshot.AccessToken, nil
-}
-
-func tokenSnapshotUsable(snapshot AccessTokenSnapshot, now time.Time) bool {
-	return strings.TrimSpace(snapshot.AccessToken) != "" &&
-		!snapshot.ExpiresAt.IsZero() &&
-		now.Before(snapshot.ExpiresAt.Add(-accessTokenRefreshWindow))
-}
-
-func canonicalTokenConfigDir(configDir string) string {
-	if absolute, err := filepath.Abs(configDir); err == nil {
-		return filepath.Clean(absolute)
-	}
-	return filepath.Clean(configDir)
+	return "", noCredentialsError()
 }
 
 func noCredentialsError() error {
 	if edition.Get().IsEmbedded {
-		return fmt.Errorf("认证信息已失效，请重新认证: %w", authpkg.ErrTokenDataNotFound)
+		return fmt.Errorf("认证信息已失效，请重新认证")
 	}
-	return fmt.Errorf("no credentials found, run: dws auth login: %w", authpkg.ErrTokenDataNotFound)
+	return fmt.Errorf("no credentials found, run: dws auth login")
 }

internal/app/app_small_coverage_test.go

@@ -34,10 +34,6 @@ func (g fakeAccessTokenGetter) GetAccessToken(context.Context) (string, error) {
 	return g.token, g.err
 }
 
-func (g fakeAccessTokenGetter) ForceRefreshRejectedToken(context.Context, string) (string, error) {
-	return g.token, g.err
-}
-
 type fakeLegacyTokenGetter struct {
 	token string
 	err   error
@@ -216,16 +212,14 @@ func TestCrossPlatformCoverageConfigAndTokenSeamsCoverage(t *testing.T) {
 	if _, err := resolveAccessTokenFromDir(context.Background(), "unused"); !errors.Is(err, authpkg.ErrTokenDecryption) {
 		t.Fatalf("decryption error = %v", err)
 	}
-	newAccessTokenProvider = func(string) accessTokenGetter {
-		return fakeAccessTokenGetter{err: authpkg.ErrTokenDataNotFound}
-	}
+	newAccessTokenProvider = func(string) accessTokenGetter { return fakeAccessTokenGetter{err: errors.New("missing")} }
 	newLegacyTokenManager = func(string) legacyTokenGetter { return fakeLegacyTokenGetter{token: " legacy "} }
 	if got, err := resolveAccessTokenFromDir(context.Background(), "unused"); err != nil || got != "legacy" {
 		t.Fatalf("legacy token = %q, %v", got, err)
 	}
 	authpkg.SetRuntimeProfile("corp:user")
 	t.Cleanup(func() { authpkg.SetRuntimeProfile("") })
-	if got, err := resolveAccessTokenFromDir(context.Background(), "unused"); got != "" || !errors.Is(err, authpkg.ErrTokenDataNotFound) {
+	if got, err := resolveAccessTokenFromDir(context.Background(), "unused"); got != "" || err == nil || err.Error() != "missing" {
 		t.Fatalf("explicit profile fallback = token %q error %v, want profile error", got, err)
 	}
 	authpkg.SetRuntimeProfile("")
@@ -252,10 +246,10 @@ func TestCrossPlatformCoverageConfigAndTokenSeamsCoverage(t *testing.T) {
 }
 
 func TestCrossPlatformCoverageForceRefreshAndStdioFailureCoverage(t *testing.T) {
-	oldLoad, oldFactory := loadRefreshTokenData, newRefreshProvider
+	oldMark, oldFactory := markAccessTokenStale, newRefreshProvider
 	oldStop := stopStdio
 	t.Cleanup(func() {
-		loadRefreshTokenData, newRefreshProvider = oldLoad, oldFactory
+		markAccessTokenStale, newRefreshProvider = oldMark, oldFactory
 		stopStdio = oldStop
 		stdioMu.Lock()
 		stdioClients = make(map[string]*transport.StdioClient)
@@ -263,13 +257,11 @@ func TestCrossPlatformCoverageForceRefreshAndStdioFailureCoverage(t *testing.T)
 	})
 	fail := errors.New("failure")
 	_ = oldFactory(t.TempDir())
-	loadRefreshTokenData = func(string) (*authpkg.TokenData, error) { return nil, fail }
+	markAccessTokenStale = func(string) error { return fail }
 	if _, err := ForceRefreshAccessToken(context.Background(), "config"); !errors.Is(err, fail) {
-		t.Fatalf("load rejected token error = %v", err)
-	}
-	loadRefreshTokenData = func(string) (*authpkg.TokenData, error) {
-		return &authpkg.TokenData{AccessToken: "rejected"}, nil
+		t.Fatalf("mark stale error = %v", err)
 	}
+	markAccessTokenStale = func(string) error { return nil }
 	for _, tc := range []struct {
 		getter fakeAccessTokenGetter
 		want   string
@@ -278,7 +270,7 @@ func TestCrossPlatformCoverageForceRefreshAndStdioFailureCoverage(t *testing.T)
 		{getter: fakeAccessTokenGetter{token: "  "}, want: "empty"},
 		{getter: fakeAccessTokenGetter{token: " refreshed "}},
 	} {
-		newRefreshProvider = func(string) rejectedAccessTokenRefresher { return tc.getter }
+		newRefreshProvider = func(string) accessTokenGetter { return tc.getter }
 		got, err := ForceRefreshAccessToken(context.Background(), "config")
 		if tc.want != "" && (err == nil || !strings.Contains(err.Error(), tc.want)) {
 			t.Fatalf("refresh error = %v, want %q", err, tc.want)

internal/app/auth_command.go

@@ -40,14 +40,12 @@ import (
 )
 
 type authLoginConfig struct {
-	Token                          string
-	Force                          bool
-	Device                         bool
-	Recommend                      bool
-	Yes                            bool
-	TargetCorpID                   string
-	HistoryProfileSelector         string
-	HistoryProfileSelectorExplicit bool
+	Token        string
+	Force        bool
+	Device       bool
+	Recommend    bool
+	Yes          bool
+	TargetCorpID string
 }
 
 type authLoginGuideAction string
@@ -150,10 +148,7 @@ func newAuthLoginCommand(patCaller edition.ToolCaller) *cobra.Command {
 				provider.Output = cmd.ErrOrStderr()
 				provider.NoBrowser, _ = cmd.Flags().GetBool("no-browser")
 				provider.IdentityEnricher = func(ctx context.Context, data *authpkg.TokenData) error {
-					return enrichAuthLoginProfileFromContact(ctx, configDir, patCaller, data, authLoginHistoryHint{
-						Selector: cfg.HistoryProfileSelector,
-						Explicit: cfg.HistoryProfileSelectorExplicit,
-					})
+					return enrichAuthLoginProfileFromContact(ctx, configDir, patCaller, data)
 				}
 				tokenData, err = authDeviceLogin(provider, loginCtx)
 				if err != nil {
@@ -168,10 +163,7 @@ func newAuthLoginCommand(patCaller edition.ToolCaller) *cobra.Command {
 				provider.NoBrowser, _ = cmd.Flags().GetBool("no-browser")
 				provider.TargetCorpID = cfg.TargetCorpID
 				provider.IdentityEnricher = func(ctx context.Context, data *authpkg.TokenData) error {
-					return enrichAuthLoginProfileFromContact(ctx, configDir, patCaller, data, authLoginHistoryHint{
-						Selector: cfg.HistoryProfileSelector,
-						Explicit: cfg.HistoryProfileSelectorExplicit,
-					})
+					return enrichAuthLoginProfileFromContact(ctx, configDir, patCaller, data)
 				}
 				configureOAuthProviderCompatibility(provider, configDir)
 				tokenData, err = authOAuthLogin(provider, loginCtx, authLoginForcesAuthorization(cfg))
@@ -183,23 +175,11 @@ func newAuthLoginCommand(patCaller edition.ToolCaller) *cobra.Command {
 			ResetRuntimeTokenCache()
 			clearCompatCache()
 			w := cmd.OutOrStdout()
-			postLoginSelector := authpkg.TokenProfileSelector(tokenData)
-			if tokenData != nil && strings.TrimSpace(tokenData.CorpID) != "" && strings.TrimSpace(tokenData.UserID) == "" {
-				if profiles, loadErr := authLoadProfiles(configDir); loadErr == nil && profiles != nil {
-					for i := range profiles.Profiles {
-						profile := profiles.Profiles[i]
-						if strings.TrimSpace(profile.CorpID) == strings.TrimSpace(tokenData.CorpID) && strings.TrimSpace(profile.UserID) == "" {
-							postLoginSelector = profileCLISelector(profile, profiles)
-							break
-						}
-					}
-				}
-			}
 			runPostLoginAuthorization := func() error {
 				if !recommendAuthMode {
 					return nil
 				}
-				restoreProfile := replaceRuntimeProfile(postLoginSelector)
+				restoreProfile := replaceRuntimeProfile(authpkg.TokenProfileSelector(tokenData))
 				defer restoreProfile()
 				recommendScopeMode := pat.LoginRecommendScopeRecommended
 				var initialPlan *pat.LoginRecommendPlan
@@ -307,7 +287,7 @@ var (
 	migrateKeychainToFileDEK         = authpkg.MigrateKeychainToFileDEK
 	authMigrateTarget                = func(cmd *cobra.Command) (string, error) { return cmd.Flags().GetString("to") }
 	authRunForm                      = (*huh.Form).Run
-	authSaveTokenData                = authpkg.SaveLoginTokenData
+	authSaveTokenData                = authpkg.SaveTokenData
 	authSaveAppConfig                = authpkg.SaveAppConfig
 	authDeviceLogin                  = func(provider *authpkg.DeviceFlowProvider, ctx context.Context) (*authpkg.TokenData, error) {
 		return provider.Login(ctx)
@@ -514,9 +494,7 @@ func newAuthStatusCommand() *cobra.Command {
 				if selected == nil {
 					return apperrors.NewValidation(fmt.Sprintf("profile %q not found", profileSelector))
 				}
-				if strings.TrimSpace(selected.UserID) != "" {
-					profileSelector = authpkg.ProfileSelector(*selected)
-				}
+				profileSelector = authpkg.ProfileSelector(*selected)
 			}
 			restoreProfile := pushRuntimeProfile(profileSelector)
 			defer restoreProfile()
@@ -544,11 +522,7 @@ func newAuthStatusCommand() *cobra.Command {
 						_ = authDeleteTokenData(configDir)
 					} else if tokenData != nil {
 						refreshFailure = refreshErr
-						markSelector := profileSelector
-						if markSelector == "" {
-							markSelector = authpkg.StableTokenProfileSelector(configDir, tokenData)
-						}
-						_ = authMarkProfileStatus(configDir, markSelector, authpkg.ProfileStatusExpired)
+						_ = authMarkProfileStatus(configDir, authpkg.TokenProfileSelector(tokenData), authpkg.ProfileStatusExpired)
 					}
 				}
 				if refreshFailure == nil && authStatusAuthenticated(tokenData) {
@@ -678,14 +652,7 @@ func logoutOneProfile(_ *cobra.Command, ctx context.Context, configDir, selector
 	}
 	stableSelector := selected.CorpID
 	if exact {
-		if strings.TrimSpace(selected.UserID) == "" {
-			// A blank historical profile can coexist with exact accounts in the
-			// same organization. Preserve the exact local-name selector; reducing
-			// it to corpId would log out the entire organization.
-			stableSelector = strings.TrimSpace(selector)
-		} else {
-			stableSelector = authpkg.ProfileSelector(*selected)
-		}
+		stableSelector = authpkg.ProfileSelector(*selected)
 		if data, loadErr := authLoadTokenForProfile(configDir, stableSelector); loadErr == nil {
 			_ = authRevokeTokenForData(ctx, data)
 		}
@@ -694,7 +661,7 @@ func logoutOneProfile(_ *cobra.Command, ctx context.Context, configDir, selector
 			if profile.CorpID != selected.CorpID {
 				continue
 			}
-			if data, tokenErr := authLoadTokenForProfile(configDir, profileCLISelector(profile, cfg)); tokenErr == nil {
+			if data, tokenErr := authLoadTokenForProfile(configDir, authpkg.ProfileSelector(profile)); tokenErr == nil {
 				_ = authRevokeTokenForData(ctx, data)
 			}
 		}
@@ -720,7 +687,7 @@ func logoutAllProfiles(_ *cobra.Command, ctx context.Context, configDir string)
 		_ = authRevokeToken(ctx)
 	} else {
 		for _, profile := range cfg.Profiles {
-			if data, tokenErr := authLoadTokenForProfile(configDir, profileCLISelector(profile, cfg)); tokenErr == nil {
+			if data, tokenErr := authLoadTokenForProfile(configDir, authpkg.ProfileSelector(profile)); tokenErr == nil {
 				_ = authRevokeTokenForData(ctx, data)
 			}
 		}
@@ -1239,7 +1206,7 @@ func resolveAuthLoginConfig(cmd *cobra.Command) (authLoginConfig, error) {
 		yes, _ = cmd.Root().PersistentFlags().GetBool("yes")
 		profileSelector, _ = cmd.Root().PersistentFlags().GetString("profile")
 	}
-	targetCorpID, historyProfileSelector, historyProfileSelectorExplicit, err := resolveAuthLoginTarget(defaultConfigDir(), profileSelector)
+	targetCorpID, err := resolveAuthLoginTargetCorpID(defaultConfigDir(), profileSelector)
 	if err != nil {
 		return authLoginConfig{}, err
 	}
@@ -1254,18 +1221,15 @@ func resolveAuthLoginConfig(cmd *cobra.Command) (authLoginConfig, error) {
 		"flow", flow,
 		"profile_selector", strings.TrimSpace(profileSelector),
 		"target_corp_id", targetCorpID,
-		"history_profile_selector", historyProfileSelector,
 		"recommend", recommend,
 	)
 	return authLoginConfig{
-		Token:                          strings.TrimSpace(token),
-		Force:                          force,
-		Device:                         device,
-		Recommend:                      recommend,
-		Yes:                            yes,
-		TargetCorpID:                   targetCorpID,
-		HistoryProfileSelector:         historyProfileSelector,
-		HistoryProfileSelectorExplicit: historyProfileSelectorExplicit,
+		Token:        strings.TrimSpace(token),
+		Force:        force,
+		Device:       device,
+		Recommend:    recommend,
+		Yes:          yes,
+		TargetCorpID: targetCorpID,
 	}, nil
 }
 
@@ -1274,57 +1238,17 @@ func authLoginForcesAuthorization(_ authLoginConfig) bool {
 }
 
 func resolveAuthLoginTargetCorpID(configDir, selector string) (string, error) {
-	targetCorpID, _, _, err := resolveAuthLoginTarget(configDir, selector)
-	return targetCorpID, err
-}
-
-// resolveAuthLoginTarget keeps the authorization target separate from the
-// local identity hint used only when contact cannot resolve the logged-in
-// account. An implicit current profile must never constrain a fresh OAuth
-// authorization to that profile's organization.
-func resolveAuthLoginTarget(configDir, selector string) (targetCorpID, historySelector string, explicit bool, err error) {
 	selector = strings.TrimSpace(selector)
 	if selector == "" {
-		if profile, resolveErr := authResolveProfile(configDir, ""); resolveErr == nil && profile != nil {
-			return "", authLoginHistorySelector(configDir, profile), false, nil
-		}
-		return "", "", false, nil
+		return "", nil
 	}
 	if profile, err := authResolveProfile(configDir, selector); err == nil && profile != nil {
-		historySelector := authLoginHistorySelector(configDir, profile)
-		_, _, identityExact := authpkg.ParseIdentitySelector(selector)
-		if selector != strings.TrimSpace(profile.CorpID) && selector != strings.TrimSpace(profile.CorpName) {
-			identityExact = true
-		}
-		return strings.TrimSpace(profile.CorpID), historySelector, identityExact, nil
-	}
-	if _, _, exact := authpkg.ParseIdentitySelector(selector); exact || strings.Contains(selector, ":") {
-		return "", "", true, apperrors.NewValidation(fmt.Sprintf("profile %q not found", selector))
+		return strings.TrimSpace(profile.CorpID), nil
 	}
 	if strings.HasPrefix(selector, "ding") {
-		// A known organization that failed resolution is ambiguous (for
-		// example, two local accounts without an org-current pointer), not a
-		// request to invent a new corpId.
-		if cfg, loadErr := authLoadProfiles(configDir); loadErr == nil && cfg != nil {
-			for i := range cfg.Profiles {
-				if strings.TrimSpace(cfg.Profiles[i].CorpID) == selector {
-					return "", "", true, apperrors.NewValidation(fmt.Sprintf("profile %q is ambiguous; use an exact corpId:userId selector", selector))
-				}
-			}
-		}
-		return selector, "", false, nil
+		return selector, nil
 	}
-	return "", "", true, apperrors.NewValidation(fmt.Sprintf("profile %q not found", selector))
-}
-
-func authLoginHistorySelector(configDir string, profile *authpkg.Profile) string {
-	if profile == nil {
-		return ""
-	}
-	if cfg, err := authLoadProfiles(configDir); err == nil && cfg != nil {
-		return authpkg.ProfileSelectionSelector(*profile, cfg)
-	}
-	return authpkg.ProfileSelector(*profile)
+	return "", apperrors.NewValidation(fmt.Sprintf("profile %q not found", selector))
 }
 
 type contactProfileIdentity struct {
@@ -1334,23 +1258,12 @@ type contactProfileIdentity struct {
 	UserName string
 }
 
-type authLoginHistoryHint struct {
-	Selector string
-	Explicit bool
-}
-
 type tokenOverrideToolCaller interface {
 	CallToolWithToken(ctx context.Context, token, productID, toolName string, args map[string]any) (*edition.ToolResult, error)
 }
 
-func enrichAuthLoginProfileFromContact(
-	ctx context.Context,
-	configDir string,
-	caller edition.ToolCaller,
-	data *authpkg.TokenData,
-	hints ...authLoginHistoryHint,
-) error {
-	if data == nil {
+func enrichAuthLoginProfileFromContact(ctx context.Context, _ string, caller edition.ToolCaller, data *authpkg.TokenData) error {
+	if caller == nil || data == nil {
 		return nil
 	}
 	corpID := strings.TrimSpace(data.CorpID)
@@ -1375,27 +1288,6 @@ func enrichAuthLoginProfileFromContact(
 		)
 		return nil
 	}
-	hint := authLoginHistoryHint{}
-	if len(hints) > 0 {
-		hint = hints[0]
-	}
-	tryHistory := func() bool {
-		reused, historyErr := enrichAuthLoginProfileFromHistory(configDir, data, hint)
-		if historyErr != nil {
-			logging.AuthDebug(
-				"auth.login.identity.history.error",
-				"corp_id", corpID,
-				"error", historyErr,
-			)
-		}
-		return reused
-	}
-	if caller == nil {
-		if strings.TrimSpace(data.UserID) == "" {
-			tryHistory()
-		}
-		return nil
-	}
 
 	var (
 		result *edition.ToolResult
@@ -1405,7 +1297,7 @@ func enrichAuthLoginProfileFromContact(
 		result, err = tokenCaller.CallToolWithToken(ctx, data.AccessToken, "contact", "get_current_user_profile", nil)
 	} else {
 		if strings.TrimSpace(data.UserID) == "" {
-			tryHistory()
+			return fmt.Errorf("login identity lookup requires an in-memory token override")
 		}
 		return nil
 	}
@@ -1419,15 +1311,11 @@ func enrichAuthLoginProfileFromContact(
 		if strings.TrimSpace(data.UserID) != "" {
 			return nil
 		}
-		tryHistory()
-		return nil
+		return err
 	}
-	identity, ok := contactProfileIdentityFromToolResult(result, corpID)
+	identity, ok := contactProfileIdentityFromToolResult(result)
 	if !ok {
 		logging.AuthDebug("auth.login.identity.lookup.empty", "corp_id", corpID)
-		if strings.TrimSpace(data.UserID) == "" {
-			tryHistory()
-		}
 		return nil
 	}
 	logging.AuthDebug(
@@ -1439,42 +1327,19 @@ func enrichAuthLoginProfileFromContact(
 		"corp_name", strings.TrimSpace(identity.CorpName),
 	)
 	if identity.CorpID != "" && identity.CorpID != corpID {
-		logging.AuthDebug(
-			"auth.login.identity.lookup.mismatch",
-			"login_corp_id", corpID,
-			"contact_corp_id", strings.TrimSpace(identity.CorpID),
-		)
-		if strings.TrimSpace(data.UserID) == "" {
-			tryHistory()
-		}
-		return nil
+		return fmt.Errorf("contact profile corpId %q does not match login corpId %q", identity.CorpID, corpID)
 	}
 
 	updated := *data
-	exchangeUserID := strings.TrimSpace(data.UserID)
 	if identity.CorpName != "" {
 		updated.CorpName = identity.CorpName
 	}
-	if exchangeUserID == "" && identity.UserID != "" {
+	if identity.UserID != "" {
 		updated.UserID = identity.UserID
 	}
-	if identity.UserName != "" && (exchangeUserID == "" || identity.UserID == "" || identity.UserID == exchangeUserID) {
+	if identity.UserName != "" {
 		updated.UserName = identity.UserName
 	}
-	if strings.TrimSpace(updated.UserID) == "" {
-		reused, historyErr := enrichAuthLoginProfileFromHistory(configDir, &updated, hint)
-		if historyErr != nil {
-			logging.AuthDebug(
-				"auth.login.identity.history.error",
-				"corp_id", corpID,
-				"error", historyErr,
-			)
-		}
-		if reused {
-			*data = updated
-			return nil
-		}
-	}
 	if updated.CorpName == data.CorpName && updated.UserID == data.UserID && updated.UserName == data.UserName {
 		logging.AuthDebug(
 			"auth.login.identity.resolved",
@@ -1496,144 +1361,7 @@ func enrichAuthLoginProfileFromContact(
 	return nil
 }
 
-// enrichAuthLoginProfileFromHistory recovers display metadata when the contact
-// service cannot describe an external-worker account. Historical profile
-// selection is never proof of the user who completed a fresh authorization:
-// only the token exchange or contact service may supply UserID.
-//
-// An explicit profile remains useful as a storage/selection hint. Keeping it in
-// LegacyOrgScopedProfile prevents the login from switching the process-global
-// current profile while SaveTokenData publishes the UID-less credential to the
-// unresolved organization slot. A historical blank profile is updated in
-// place; an exact historical profile and its token remain untouched.
-func enrichAuthLoginProfileFromHistory(configDir string, data *authpkg.TokenData, hints ...authLoginHistoryHint) (bool, error) {
-	if data == nil || strings.TrimSpace(data.UserID) != "" {
-		return false, nil
-	}
-	corpID := strings.TrimSpace(data.CorpID)
-	if corpID == "" {
-		return false, nil
-	}
-	cfg, err := authLoadProfiles(configDir)
-	if err != nil {
-		return false, err
-	}
-	if cfg == nil {
-		return false, nil
-	}
-	sameCorp := make([]*authpkg.Profile, 0, len(cfg.Profiles))
-	for i := range cfg.Profiles {
-		profile := &cfg.Profiles[i]
-		if strings.TrimSpace(profile.CorpID) != corpID {
-			continue
-		}
-		sameCorp = append(sameCorp, profile)
-	}
-	if len(sameCorp) == 0 {
-		return false, nil
-	}
-
-	hint := authLoginHistoryHint{}
-	if len(hints) > 0 {
-		hint = hints[0]
-	}
-	var candidate *authpkg.Profile
-	if hint.Explicit {
-		candidate = historicalProfileForSelector(corpID, hint.Selector, sameCorp)
-		if candidate == nil {
-			// An explicit account is a hard identity boundary. If that exact
-			// historical hint no longer matches the token's organization, do
-			// not silently substitute org-current, sole, or global-current.
-			return false, nil
-		}
-	} else if len(sameCorp) > 1 {
-		// Organization-current is a storage preference, not proof of which user
-		// completed a fresh authorization. With multiple accounts, only an exact
-		// user selection may be used when the token/contact response has no UID.
-		return false, nil
-	} else {
-		candidate = sameCorp[0]
-	}
-
-	updated := *data
-	if hint.Explicit {
-		updated.LegacyOrgScopedProfile = strings.TrimSpace(hint.Selector)
-	}
-	if strings.TrimSpace(updated.CorpName) == "" {
-		updated.CorpName = strings.TrimSpace(candidate.CorpName)
-	}
-	if strings.TrimSpace(updated.UserName) == "" {
-		updated.UserName = strings.TrimSpace(candidate.UserName)
-	}
-	*data = updated
-	logging.AuthDebug(
-		"auth.login.identity.resolved",
-		"source", "local_profile_history_display_only",
-		"corp_id", corpID,
-		"user_id", updated.UserID,
-		"user_name", updated.UserName,
-		"corp_name", updated.CorpName,
-		"identity_proven", false,
-	)
-	return true, nil
-}
-
-func historicalProfileForSelector(corpID, selector string, profiles []*authpkg.Profile) *authpkg.Profile {
-	selector = strings.TrimSpace(selector)
-	if selector == "" {
-		return nil
-	}
-	cfg := &authpkg.ProfilesConfig{Profiles: make([]authpkg.Profile, 0, len(profiles))}
-	for _, profile := range profiles {
-		if profile != nil {
-			cfg.Profiles = append(cfg.Profiles, *profile)
-		}
-	}
-	var stableMatch *authpkg.Profile
-	for _, profile := range profiles {
-		if profile == nil || strings.TrimSpace(profile.CorpID) != strings.TrimSpace(corpID) ||
-			authpkg.ProfileSelectionSelector(*profile, cfg) != selector {
-			continue
-		}
-		if stableMatch != nil {
-			return nil
-		}
-		stableMatch = profile
-	}
-	if stableMatch != nil {
-		return stableMatch
-	}
-	if selectedCorpID, userID, exact := authpkg.ParseIdentitySelector(selector); exact {
-		if strings.TrimSpace(selectedCorpID) != strings.TrimSpace(corpID) {
-			return nil
-		}
-		for _, profile := range profiles {
-			if profile != nil && strings.TrimSpace(profile.UserID) == strings.TrimSpace(userID) {
-				return profile
-			}
-		}
-		return nil
-	}
-	var named *authpkg.Profile
-	for _, profile := range profiles {
-		if profile == nil || strings.TrimSpace(profile.Name) != selector {
-			continue
-		}
-		if named != nil {
-			return nil
-		}
-		named = profile
-	}
-	if named != nil {
-		return named
-	}
-	if selector == strings.TrimSpace(corpID) && len(profiles) == 1 {
-		return profiles[0]
-	}
-	return nil
-}
-
-func contactProfileIdentityFromToolResult(result *edition.ToolResult, expectedCorpIDs ...string) (contactProfileIdentity, bool) {
+func contactProfileIdentityFromToolResult(result *edition.ToolResult) (contactProfileIdentity, bool) {
 	if result == nil {
 		return contactProfileIdentity{}, false
 	}
@@ -1641,14 +1369,14 @@ func contactProfileIdentityFromToolResult(result *edition.ToolResult, expectedCo
 		if strings.TrimSpace(block.Text) == "" {
 			continue
 		}
-		if identity, ok := contactProfileIdentityFromJSON([]byte(block.Text), expectedCorpIDs...); ok {
+		if identity, ok := contactProfileIdentityFromJSON([]byte(block.Text)); ok {
 			return identity, true
 		}
 	}
 	return contactProfileIdentity{}, false
 }
 
-func contactProfileIdentityFromJSON(data []byte, expectedCorpIDs ...string) (contactProfileIdentity, bool) {
+func contactProfileIdentityFromJSON(data []byte) (contactProfileIdentity, bool) {
 	var payload struct {
 		Result []struct {
 			OrgEmployeeModel struct {
@@ -1668,40 +1396,14 @@ func contactProfileIdentityFromJSON(data []byte, expectedCorpIDs ...string) (con
 	if len(payload.Result) == 0 {
 		return contactProfileIdentity{}, false
 	}
-	identities := make([]contactProfileIdentity, 0, len(payload.Result))
-	for i := range payload.Result {
-		org := payload.Result[i].OrgEmployeeModel
-		identity := contactProfileIdentity{
-			CorpID:   strings.TrimSpace(org.CorpID),
-			CorpName: strings.TrimSpace(org.OrgName),
-			UserID:   firstNonEmptyString(org.UserID, org.UserIDLower, org.OrgUserID),
-			UserName: firstNonEmptyString(org.OrgUserName, org.Name),
-		}
-		if identity.CorpID != "" || identity.CorpName != "" || identity.UserID != "" || identity.UserName != "" {
-			identities = append(identities, identity)
-		}
+	org := payload.Result[0].OrgEmployeeModel
+	identity := contactProfileIdentity{
+		CorpID:   strings.TrimSpace(org.CorpID),
+		CorpName: strings.TrimSpace(org.OrgName),
+		UserID:   firstNonEmptyString(org.UserID, org.UserIDLower, org.OrgUserID),
+		UserName: firstNonEmptyString(org.OrgUserName, org.Name),
 	}
-	if len(identities) == 0 {
-		return contactProfileIdentity{}, false
-	}
-	expectedCorpID := ""
-	if len(expectedCorpIDs) > 0 {
-		expectedCorpID = strings.TrimSpace(expectedCorpIDs[0])
-	}
-	if expectedCorpID != "" {
-		for _, identity := range identities {
-			if identity.CorpID == expectedCorpID {
-				return identity, true
-			}
-		}
-		// Older contact responses omit corpId. A single result is still
-		// unambiguous; multiple organization records without a target match
-		// must fall back to local history instead of choosing result[0].
-		if len(payload.Result) != 1 {
-			return contactProfileIdentity{}, false
-		}
-	}
-	return identities[0], true
+	return identity, identity.CorpID != "" || identity.CorpName != "" || identity.UserID != "" || identity.UserName != ""
 }
 
 func firstNonEmptyString(values ...string) string {

internal/app/auth_command_full_coverage_test.go

@@ -262,10 +262,7 @@ func TestCrossPlatformCoverageAuthCoverageLoginFlows(t *testing.T) {
 	if _, _, err := authCoverageRunLogin(t, nil, "table", true, map[string]string{"device": "true"}); err == nil {
 		t.Fatal("device error should propagate")
 	}
-	authDeviceLogin = func(provider *authpkg.DeviceFlowProvider, _ context.Context) (*authpkg.TokenData, error) {
-		if provider.IdentityEnricher == nil {
-			t.Error("device login missing shared identity enricher")
-		}
+	authDeviceLogin = func(*authpkg.DeviceFlowProvider, context.Context) (*authpkg.TokenData, error) {
 		return &authpkg.TokenData{AccessToken: "a", ExpiresAt: time.Now().Add(time.Hour)}, nil
 	}
 	if _, _, err := authCoverageRunLogin(t, nil, "table", true, map[string]string{"device": "true", "no-browser": "true"}); err != nil {
@@ -278,10 +275,7 @@ func TestCrossPlatformCoverageAuthCoverageLoginFlows(t *testing.T) {
 	if _, _, err := authCoverageRunLogin(t, nil, "table", true, nil); err == nil {
 		t.Fatal("oauth error should propagate")
 	}
-	authOAuthLogin = func(provider *authpkg.OAuthProvider, _ context.Context, _ bool) (*authpkg.TokenData, error) {
-		if provider.IdentityEnricher == nil {
-			t.Error("OAuth login missing shared identity enricher")
-		}
+	authOAuthLogin = func(*authpkg.OAuthProvider, context.Context, bool) (*authpkg.TokenData, error) {
 		return &authpkg.TokenData{
 			AccessToken: "a", ExpiresAt: time.Now().Add(time.Hour), RefreshToken: "r", RefreshExpAt: time.Now().Add(48 * time.Hour),
 			CorpName: "Corp", CorpID: "ding1", UserName: "User", UserID: "u",
@@ -362,8 +356,8 @@ func TestCrossPlatformCoverageAuthCoverageContactEnrichment(t *testing.T) {
 	if err := enrichAuthLoginProfileFromContact(ctx, "cfg", &authCoverageCaller{}, complete); err != nil {
 		t.Fatal(err)
 	}
-	if err := enrichAuthLoginProfileFromContact(ctx, "cfg", &authCoverageCaller{err: errors.New("call")}, &authpkg.TokenData{CorpID: "ding"}); err != nil {
-		t.Fatalf("contact failure must remain best effort: %v", err)
+	if err := enrichAuthLoginProfileFromContact(ctx, "cfg", &authCoverageCaller{err: errors.New("call")}, &authpkg.TokenData{CorpID: "ding"}); err == nil {
+		t.Fatal("caller error should propagate")
 	}
 	if err := enrichAuthLoginProfileFromContact(
 		ctx,
@@ -380,8 +374,8 @@ func TestCrossPlatformCoverageAuthCoverageContactEnrichment(t *testing.T) {
 		}
 	}
 	mismatch := &authCoverageCaller{result: &edition.ToolResult{Content: []edition.ContentBlock{{Text: `{"result":[{"orgEmployeeModel":{"corpId":"other"}}]}`}}}}
-	if err := enrichAuthLoginProfileFromContact(ctx, "cfg", mismatch, &authpkg.TokenData{CorpID: "ding", AccessToken: "token"}); err != nil {
-		t.Fatalf("contact corp mismatch must remain best effort: %v", err)
+	if err := enrichAuthLoginProfileFromContact(ctx, "cfg", mismatch, &authpkg.TokenData{CorpID: "ding", AccessToken: "token"}); err == nil {
+		t.Fatal("corp mismatch should fail")
 	}
 	same := &authCoverageCaller{result: &edition.ToolResult{Content: []edition.ContentBlock{{Text: `{"result":[{"orgEmployeeModel":{"corpId":"ding","orgName":"Corp","userid":"u","name":"User"}}]}`}}}}
 	if err := enrichAuthLoginProfileFromContact(ctx, "cfg", same, complete); err != nil {
@@ -396,25 +390,6 @@ func TestCrossPlatformCoverageAuthCoverageContactEnrichment(t *testing.T) {
 	if err := enrichAuthLoginProfileFromContact(ctx, "cfg", same, data); err != nil || data.CorpName != "Corp" || data.UserID != "u" {
 		t.Fatalf("enriched = %#v, %v", data, err)
 	}
-	known := &authpkg.TokenData{CorpID: "ding", UserID: "exchange-user", AccessToken: "token"}
-	differentContactUser := &authCoverageCaller{result: &edition.ToolResult{Content: []edition.ContentBlock{{Text: `{"result":[{"orgEmployeeModel":{"corpId":"ding","orgName":"Corp","userid":"other-user","name":"Other User"}}]}`}}}}
-	if err := enrichAuthLoginProfileFromContact(ctx, "cfg", differentContactUser, known); err != nil {
-		t.Fatal(err)
-	}
-	if known.UserID != "exchange-user" || known.UserName != "" || known.CorpName != "Corp" {
-		t.Fatalf("token-exchange identity was overwritten: %#v", known)
-	}
-	multiOrg := &authCoverageCaller{result: &edition.ToolResult{Content: []edition.ContentBlock{{Text: `{"result":[{"orgEmployeeModel":{"corpId":"other","userid":"other-user"}},{"orgEmployeeModel":{"corpId":"ding","orgName":"Target Corp","userid":"target-user","name":"Target User"}}]}`}}}}
-	multiOrgData := &authpkg.TokenData{CorpID: "ding", AccessToken: "token"}
-	if err := enrichAuthLoginProfileFromContact(ctx, "cfg", multiOrg, multiOrgData); err != nil || multiOrgData.UserID != "target-user" || multiOrgData.CorpName != "Target Corp" {
-		t.Fatalf("multi-org contact selection = %#v, %v", multiOrgData, err)
-	}
-	if _, ok := contactProfileIdentityFromJSON(
-		[]byte(`{"result":[{"orgEmployeeModel":{"corpId":"other-a","userid":"user-a"}},{"orgEmployeeModel":{"corpId":"other-b","userid":"user-b"}}]}`),
-		"ding",
-	); ok {
-		t.Fatal("multiple nonmatching organizations must not select an arbitrary contact identity")
-	}
 	if _, ok := contactProfileIdentityFromToolResult(nil); ok {
 		t.Fatal("nil result should not parse")
 	}
@@ -423,570 +398,6 @@ func TestCrossPlatformCoverageAuthCoverageContactEnrichment(t *testing.T) {
 	}
 }
 
-func TestCrossPlatformCoverageContactFailureReusesOnlySameCorpHistoricalDisplayMetadata(t *testing.T) {
-	configDir := t.TempDir()
-	if err := authpkg.SaveProfiles(configDir, &authpkg.ProfilesConfig{
-		Version: 1,
-		Profiles: []authpkg.Profile{{
-			CorpID:   "ding_ecological_worker",
-			CorpName: "Historical Corp",
-			UserID:   "external-user",
-			UserName: "Historical Worker",
-		}},
-	}); err != nil {
-		t.Fatalf("SaveProfiles() error = %v", err)
-	}
-
-	for _, tc := range []struct {
-		name     string
-		caller   edition.ToolCaller
-		wantCorp string
-	}{
-		{
-			name: "contact business error",
-			caller: &authCoverageCaller{err: apperrors.NewAPI(
-				"business error: success=false",
-				apperrors.WithReason("business_error"),
-			)},
-			wantCorp: "Fresh Corp",
-		},
-		{
-			name:     "contact has no identity",
-			caller:   &authCoverageCaller{result: &edition.ToolResult{Content: []edition.ContentBlock{{Text: `{"success":false}`}}}},
-			wantCorp: "Fresh Corp",
-		},
-		{
-			name: "contact identity is missing user id",
-			caller: &authCoverageCaller{result: &edition.ToolResult{Content: []edition.ContentBlock{{
-				Text: `{"result":[{"orgEmployeeModel":{"corpId":"ding_ecological_worker","orgName":"Contact Corp"}}]}`,
-			}}}},
-			wantCorp: "Contact Corp",
-		},
-		{
-			name:     "ordinary contact error",
-			caller:   &authCoverageCaller{err: errors.New("network failure")},
-			wantCorp: "Fresh Corp",
-		},
-		{
-			name: "other contact business error",
-			caller: &authCoverageCaller{err: apperrors.NewAPI(
-				"permission denied",
-				apperrors.WithReason("business_error"),
-			)},
-			wantCorp: "Fresh Corp",
-		},
-		{
-			name:     "contact caller unavailable",
-			caller:   nil,
-			wantCorp: "Fresh Corp",
-		},
-		{
-			name: "contact returns another organization",
-			caller: &authCoverageCaller{result: &edition.ToolResult{Content: []edition.ContentBlock{{
-				Text: `{"result":[{"orgEmployeeModel":{"corpId":"ding_other","userid":"other-user"}}]}`,
-			}}}},
-			wantCorp: "Fresh Corp",
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			data := &authpkg.TokenData{
-				AccessToken:  "new-access",
-				RefreshToken: "new-refresh",
-				CorpID:       "ding_ecological_worker",
-				CorpName:     "Fresh Corp",
-			}
-			if err := enrichAuthLoginProfileFromContact(context.Background(), configDir, tc.caller, data); err != nil {
-				t.Fatalf("contact failure blocked historical identity recovery: %v", err)
-			}
-			if data.UserID != "" || data.UserName != "Historical Worker" {
-				t.Fatalf("historical metadata supplied UID evidence: %#v", data)
-			}
-			if data.CorpName != tc.wantCorp {
-				t.Fatalf("corp name = %q, want %q", data.CorpName, tc.wantCorp)
-			}
-			if data.AccessToken != "new-access" || data.RefreshToken != "new-refresh" {
-				t.Fatalf("new token material was changed: %#v", data)
-			}
-		})
-	}
-}
-
-func TestCrossPlatformCoverageContactFailureDoesNotGuessHistoricalIdentity(t *testing.T) {
-	businessErr := apperrors.NewAPI(
-		"business error: success=false",
-		apperrors.WithReason("business_error"),
-	)
-	for _, tc := range []struct {
-		name     string
-		corpID   string
-		profiles []authpkg.Profile
-		callErr  error
-	}{
-		{
-			name:   "same corp has two identities",
-			corpID: "ding_ecological_worker",
-			profiles: []authpkg.Profile{
-				{CorpID: "ding_ecological_worker", UserID: "external-user"},
-				{CorpID: "ding_ecological_worker", UserID: "external-user-b"},
-			},
-			callErr: businessErr,
-		},
-		{
-			name:   "same corp has one identity and one blank profile",
-			corpID: "ding_ecological_worker",
-			profiles: []authpkg.Profile{
-				{CorpID: "ding_ecological_worker", UserID: "external-user"},
-				{CorpID: "ding_ecological_worker"},
-			},
-			callErr: businessErr,
-		},
-		{
-			name:   "identity belongs to another corp",
-			corpID: "ding_ecological_worker",
-			profiles: []authpkg.Profile{
-				{CorpID: "ding_other", UserID: "external-user"},
-			},
-			callErr: businessErr,
-		},
-		{
-			name:    "no historical identity",
-			corpID:  "ding_ecological_worker",
-			callErr: businessErr,
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			configDir := t.TempDir()
-			if err := authpkg.SaveProfiles(configDir, &authpkg.ProfilesConfig{Version: 2, Profiles: tc.profiles}); err != nil {
-				t.Fatalf("SaveProfiles() error = %v", err)
-			}
-			data := &authpkg.TokenData{AccessToken: "new-access", CorpID: tc.corpID}
-			err := enrichAuthLoginProfileFromContact(
-				context.Background(),
-				configDir,
-				&authCoverageCaller{err: tc.callErr},
-				data,
-			)
-			if err != nil {
-				t.Fatalf("contact failure must not block unresolved legacy login: %v", err)
-			}
-			if data.UserID != "" {
-				t.Fatalf("ambiguous/cross-corp identity was reused: %#v", data)
-			}
-		})
-	}
-}
-
-func TestCrossPlatformCoverageContactHistoryFallbackEdges(t *testing.T) {
-	for _, data := range []*authpkg.TokenData{
-		nil,
-		{UserID: "known"},
-		{},
-	} {
-		reused, err := enrichAuthLoginProfileFromHistory(t.TempDir(), data)
-		if reused || err != nil {
-			t.Fatalf("ineligible history fallback = %v, %v", reused, err)
-		}
-	}
-
-	configDir := t.TempDir()
-	if err := authpkg.SaveProfiles(configDir, &authpkg.ProfilesConfig{
-		Version: 2,
-		Profiles: []authpkg.Profile{{
-			CorpID:   "ding_external",
-			CorpName: "Historical Corp",
-			UserID:   "external-user",
-			UserName: "Historical Worker",
-		}},
-	}); err != nil {
-		t.Fatalf("SaveProfiles() error = %v", err)
-	}
-	data := &authpkg.TokenData{CorpID: "ding_external"}
-	reused, err := enrichAuthLoginProfileFromHistory(configDir, data)
-	if err != nil || !reused {
-		t.Fatalf("history fallback = %v, %v", reused, err)
-	}
-	if data.CorpName != "Historical Corp" || data.UserName != "Historical Worker" || data.UserID != "" {
-		t.Fatalf("history metadata = %#v", data)
-	}
-
-	corruptDir := t.TempDir()
-	if err := os.Mkdir(authpkg.ProfilesPath(corruptDir), 0o700); err != nil {
-		t.Fatalf("create unreadable profiles path: %v", err)
-	}
-	if reused, err := enrichAuthLoginProfileFromHistory(corruptDir, &authpkg.TokenData{CorpID: "ding_external"}); reused || err == nil {
-		t.Fatalf("corrupt history fallback = %v, %v; want load error", reused, err)
-	}
-
-	businessErr := apperrors.NewAPI(
-		"business error: success=false",
-		apperrors.WithReason("business_error"),
-	)
-	for _, tc := range []struct {
-		name   string
-		caller *authCoverageCaller
-	}{
-		{
-			name:   "contact business error",
-			caller: &authCoverageCaller{err: businessErr},
-		},
-		{
-			name:   "contact has no identity",
-			caller: &authCoverageCaller{result: &edition.ToolResult{}},
-		},
-		{
-			name: "contact identity is missing user id",
-			caller: &authCoverageCaller{result: &edition.ToolResult{Content: []edition.ContentBlock{{
-				Text: `{"result":[{"orgEmployeeModel":{"corpId":"ding_external"}}]}`,
-			}}}},
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			err := enrichAuthLoginProfileFromContact(
-				context.Background(),
-				corruptDir,
-				tc.caller,
-				&authpkg.TokenData{CorpID: "ding_external", AccessToken: "new-access"},
-			)
-			if err != nil {
-				t.Fatalf("best-effort contact/history lookup blocked login: %v", err)
-			}
-		})
-	}
-}
-
-func TestCrossPlatformCoverageAuthLoginConfigPreservesHistoryIdentityHint(t *testing.T) {
-	t.Setenv("DWS_CONFIG_DIR", t.TempDir())
-	oldResolve := authResolveProfile
-	oldLoad := authLoadProfiles
-	t.Cleanup(func() {
-		authResolveProfile = oldResolve
-		authLoadProfiles = oldLoad
-	})
-
-	explicit := &authpkg.Profile{CorpID: "ding_same", UserID: "user_2", Name: "second"}
-	current := &authpkg.Profile{CorpID: "ding_current", UserID: "current_user"}
-	authResolveProfile = func(_ string, selector string) (*authpkg.Profile, error) {
-		switch selector {
-		case "ding_same:user_2":
-			clone := *explicit
-			return &clone, nil
-		case "external-worker":
-			return &authpkg.Profile{Name: "external-worker", CorpID: "ding_external"}, nil
-		case "":
-			clone := *current
-			return &clone, nil
-		default:
-			return nil, errors.New("missing")
-		}
-	}
-	authLoadProfiles = func(string) (*authpkg.ProfilesConfig, error) {
-		return &authpkg.ProfilesConfig{}, nil
-	}
-
-	cmd := newAuthLoginCommand(nil)
-	root, _, _ := authCoverageRoot(cmd, "table", true)
-	if err := root.PersistentFlags().Set("profile", "ding_same:user_2"); err != nil {
-		t.Fatal(err)
-	}
-	cfg, err := resolveAuthLoginConfig(cmd)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cfg.TargetCorpID != "ding_same" || cfg.HistoryProfileSelector != "ding_same:user_2" || !cfg.HistoryProfileSelectorExplicit {
-		t.Fatalf("explicit login config = %#v", cfg)
-	}
-	if target, hint, exact, err := resolveAuthLoginTarget("cfg", "external-worker"); err != nil ||
-		target != "ding_external" || hint != "ding_external" || !exact {
-		t.Fatalf("blank-userId profile target = %q/%q/%v, %v", target, hint, exact, err)
-	}
-
-	if err := root.PersistentFlags().Set("profile", ""); err != nil {
-		t.Fatal(err)
-	}
-	cfg, err = resolveAuthLoginConfig(cmd)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cfg.TargetCorpID != "" || cfg.HistoryProfileSelector != "ding_current:current_user" || cfg.HistoryProfileSelectorExplicit {
-		t.Fatalf("implicit login config constrained authorization target: %#v", cfg)
-	}
-
-	if _, _, _, err := resolveAuthLoginTarget("cfg", "ding_same:missing"); err == nil {
-		t.Fatal("missing exact profile must not be reinterpreted as a corpId")
-	}
-	if target, hint, explicitHint, err := resolveAuthLoginTarget("cfg", "ding_new"); err != nil || target != "ding_new" || hint != "" || explicitHint {
-		t.Fatalf("new organization target = %q/%q/%v, %v", target, hint, explicitHint, err)
-	}
-	authLoadProfiles = func(string) (*authpkg.ProfilesConfig, error) {
-		return &authpkg.ProfilesConfig{Profiles: []authpkg.Profile{
-			{CorpID: "ding_ambiguous", UserID: "user_1"},
-			{CorpID: "ding_ambiguous", UserID: "user_2"},
-		}}, nil
-	}
-	if _, _, _, err := resolveAuthLoginTarget("cfg", "ding_ambiguous"); err == nil {
-		t.Fatal("ambiguous known organization must require an exact profile")
-	}
-}
-
-func TestCrossPlatformCoverageOAuthAndDeviceKeepFreshUnknownIdentityIsolatedFromExactHistory(t *testing.T) {
-	oldResolve := authResolveProfile
-	oldLoad := authLoadProfiles
-	oldDevice := authDeviceLogin
-	oldOAuth := authOAuthLogin
-	oldInteractive := authLoginInteractiveTerminal
-	t.Cleanup(func() {
-		authResolveProfile = oldResolve
-		authLoadProfiles = oldLoad
-		authDeviceLogin = oldDevice
-		authOAuthLogin = oldOAuth
-		authLoginInteractiveTerminal = oldInteractive
-	})
-
-	authResolveProfile = authpkg.ResolveProfile
-	authLoadProfiles = authpkg.LoadProfiles
-	authLoginInteractiveTerminal = func() bool { return false }
-	t.Cleanup(func() { authpkg.SetRuntimeProfile("") })
-
-	for _, flow := range []string{"oauth", "device"} {
-		t.Run(flow, func(t *testing.T) {
-			configDir := t.TempDir()
-			keychainDir := t.TempDir()
-			t.Setenv("DWS_CONFIG_DIR", configDir)
-			t.Setenv(keychain.DisableKeychainEnv, "1")
-			t.Setenv(keychain.StorageDirEnv, keychainDir)
-			// StorageDirEnv isolates file-backed keychains, while Windows uses
-			// DPAPI-protected HKCU values. Give every flow its own namespace so
-			// OAuth/device fixtures cannot leak into each other or later tests.
-			t.Setenv(keychain.TestNamespaceEnv, keychainDir)
-			t.Cleanup(func() {
-				if err := keychain.RemoveAuthTokenEntries(keychain.Service); err != nil {
-					t.Errorf("clean auth keychain fixture: %v", err)
-				}
-			})
-			authpkg.SetRuntimeProfile("")
-
-			const (
-				corpID        = "ding_same"
-				historicalUID = "user_a"
-				exactSelector = corpID + ":" + historicalUID
-			)
-			oldToken := &authpkg.TokenData{
-				AccessToken:  "old-user-a-access",
-				RefreshToken: "old-user-a-refresh",
-				ExpiresAt:    time.Now().Add(time.Hour),
-				RefreshExpAt: time.Now().Add(24 * time.Hour),
-				CorpID:       corpID,
-				CorpName:     "Same Corp",
-				UserID:       historicalUID,
-				UserName:     "Historical User A",
-			}
-			if err := authpkg.SaveTokenData(configDir, oldToken); err != nil {
-				t.Fatalf("persist historical exact identity: %v", err)
-			}
-
-			caller := &authCoverageCaller{err: errors.New("contact unavailable")}
-			var enriched *authpkg.TokenData
-			freshToken := func() *authpkg.TokenData {
-				return &authpkg.TokenData{
-					AccessToken:  "fresh-user-b-access-" + flow,
-					RefreshToken: "fresh-user-b-refresh-" + flow,
-					ExpiresAt:    time.Now().Add(time.Hour),
-					RefreshExpAt: time.Now().Add(24 * time.Hour),
-					CorpID:       corpID,
-				}
-			}
-			persistUnknown := func(ctx context.Context, identityEnricher func(context.Context, *authpkg.TokenData) error) (*authpkg.TokenData, error) {
-				if identityEnricher == nil {
-					return nil, errors.New("missing identity enricher")
-				}
-				data := freshToken()
-				if err := identityEnricher(ctx, data); err != nil {
-					return nil, err
-				}
-				enriched = data
-				if data.UserID != "" {
-					return nil, fmt.Errorf("historical profile supplied unproven userId %q", data.UserID)
-				}
-				if err := authpkg.SaveTokenData(configDir, data); err != nil {
-					return nil, err
-				}
-				return data, nil
-			}
-
-			flags := map[string]string{"profile": exactSelector}
-			switch flow {
-			case "device":
-				flags["device"] = "true"
-				authDeviceLogin = func(provider *authpkg.DeviceFlowProvider, ctx context.Context) (*authpkg.TokenData, error) {
-					return persistUnknown(ctx, provider.IdentityEnricher)
-				}
-			case "oauth":
-				authOAuthLogin = func(provider *authpkg.OAuthProvider, ctx context.Context, _ bool) (*authpkg.TokenData, error) {
-					if provider.TargetCorpID != corpID {
-						return nil, fmt.Errorf("OAuth target corp = %q", provider.TargetCorpID)
-					}
-					return persistUnknown(ctx, provider.IdentityEnricher)
-				}
-			}
-			if _, _, err := authCoverageRunLogin(t, caller, "table", true, flags); err != nil {
-				t.Fatalf("%s login with unresolved fresh identity: %v", flow, err)
-			}
-			if enriched == nil || enriched.UserID != "" ||
-				enriched.LegacyOrgScopedProfile != exactSelector ||
-				enriched.CorpName != "Same Corp" ||
-				enriched.UserName != "Historical User A" {
-				t.Fatalf("%s history hint became identity evidence: %#v", flow, enriched)
-			}
-
-			historical, err := authpkg.LoadTokenDataForProfile(configDir, exactSelector)
-			if err != nil {
-				t.Fatalf("load historical exact identity: %v", err)
-			}
-			if historical.AccessToken != oldToken.AccessToken || historical.UserID != historicalUID {
-				t.Fatalf("historical exact slot was overwritten: %#v", historical)
-			}
-
-			profiles, err := authpkg.LoadProfiles(configDir)
-			if err != nil {
-				t.Fatalf("load profiles: %v", err)
-			}
-			var unresolved *authpkg.Profile
-			for i := range profiles.Profiles {
-				profile := &profiles.Profiles[i]
-				if profile.CorpID == corpID && profile.UserID == "" {
-					unresolved = profile
-					break
-				}
-			}
-			if unresolved == nil {
-				t.Fatalf("fresh UID-less token did not create an unresolved profile: %#v", profiles.Profiles)
-			}
-			unresolvedSelector := authpkg.ProfileSelectionSelector(*unresolved, profiles)
-			if unresolvedSelector == "" || unresolvedSelector == exactSelector {
-				t.Fatalf("unresolved selector = %q", unresolvedSelector)
-			}
-			fresh, err := authpkg.LoadTokenDataForProfile(configDir, unresolvedSelector)
-			if err != nil {
-				t.Fatalf("load fresh unresolved identity: %v", err)
-			}
-			if fresh.AccessToken != "fresh-user-b-access-"+flow || fresh.UserID != "" {
-				t.Fatalf("fresh token was not isolated in unresolved org slot: %#v", fresh)
-			}
-		})
-	}
-}
-
-func TestCrossPlatformCoverageHistoricalIdentityPriorityAndBlankUserID(t *testing.T) {
-	oldLoad := authLoadProfiles
-	t.Cleanup(func() { authLoadProfiles = oldLoad })
-	authLoadProfiles = func(string) (*authpkg.ProfilesConfig, error) { return nil, nil }
-	if reused, err := enrichAuthLoginProfileFromHistory("cfg", &authpkg.TokenData{CorpID: "ding_same"}); reused || err != nil {
-		t.Fatalf("nil history registry = reused=%v err=%v", reused, err)
-	}
-
-	cfg := &authpkg.ProfilesConfig{
-		CurrentProfile: "ding_same:user_1",
-		OrgCurrentProfiles: map[string]string{
-			"ding_same": "ding_same:user_2",
-		},
-		Profiles: []authpkg.Profile{
-			{CorpID: "ding_same", CorpName: "Same Corp", UserID: "user_1", UserName: "First"},
-			{CorpID: "ding_same", CorpName: "Same Corp", UserID: "user_2", UserName: "Second"},
-		},
-	}
-	authLoadProfiles = func(string) (*authpkg.ProfilesConfig, error) { return cfg, nil }
-
-	explicitData := &authpkg.TokenData{CorpID: "ding_same"}
-	reused, err := enrichAuthLoginProfileFromHistory("cfg", explicitData, authLoginHistoryHint{Selector: "ding_same:user_1", Explicit: true})
-	if err != nil || !reused || explicitData.UserID != "" ||
-		explicitData.LegacyOrgScopedProfile != "ding_same:user_1" ||
-		explicitData.CorpName != "Same Corp" || explicitData.UserName != "First" {
-		t.Fatalf("explicit history selection = %#v, reused=%v err=%v", explicitData, reused, err)
-	}
-	mismatchedHintData := &authpkg.TokenData{CorpID: "ding_same"}
-	reused, err = enrichAuthLoginProfileFromHistory("cfg", mismatchedHintData, authLoginHistoryHint{Selector: "ding_other:user_9", Explicit: true})
-	if err != nil || reused || mismatchedHintData.UserID != "" {
-		t.Fatalf("cross-corp explicit hint reused another identity: %#v, reused=%v err=%v", mismatchedHintData, reused, err)
-	}
-	orgCurrentData := &authpkg.TokenData{CorpID: "ding_same"}
-	reused, err = enrichAuthLoginProfileFromHistory("cfg", orgCurrentData)
-	if err != nil || reused || orgCurrentData.UserID != "" {
-		t.Fatalf("implicit multi-account org-current was treated as identity proof: %#v, reused=%v err=%v", orgCurrentData, reused, err)
-	}
-
-	cfg.Profiles = []authpkg.Profile{cfg.Profiles[1]}
-	soleData := &authpkg.TokenData{CorpID: "ding_same"}
-	reused, err = enrichAuthLoginProfileFromHistory("cfg", soleData)
-	if err != nil || !reused || soleData.UserID != "" ||
-		soleData.CorpName != "Same Corp" || soleData.UserName != "Second" {
-		t.Fatalf("sole history selection = %#v, reused=%v err=%v", soleData, reused, err)
-	}
-
-	cfg.Profiles = []authpkg.Profile{
-		{CorpID: "ding_same", CorpName: "Same Corp", UserID: "user_1", UserName: "First"},
-		{CorpID: "ding_same", CorpName: "Same Corp", UserID: "user_2", UserName: "Second"},
-	}
-	cfg.OrgCurrentProfiles = nil
-	currentData := &authpkg.TokenData{CorpID: "ding_same"}
-	reused, err = enrichAuthLoginProfileFromHistory("cfg", currentData)
-	if err != nil || reused || currentData.UserID != "" {
-		t.Fatalf("implicit multi-account current was treated as identity proof: %#v, reused=%v err=%v", currentData, reused, err)
-	}
-
-	cfg.CurrentProfile = ""
-	ambiguousData := &authpkg.TokenData{CorpID: "ding_same"}
-	reused, err = enrichAuthLoginProfileFromHistory("cfg", ambiguousData)
-	if err != nil || reused || ambiguousData.UserID != "" {
-		t.Fatalf("ambiguous history selection = %#v, reused=%v err=%v", ambiguousData, reused, err)
-	}
-
-	cfg.Profiles = []authpkg.Profile{{
-		Name: "external-worker", CorpID: "ding_same", CorpName: "Legacy Corp", UserName: "Legacy Worker",
-	}}
-	blankData := &authpkg.TokenData{CorpID: "ding_same"}
-	reused, err = enrichAuthLoginProfileFromHistory("cfg", blankData, authLoginHistoryHint{Selector: "external-worker", Explicit: true})
-	if err != nil || !reused || blankData.UserID != "" || blankData.LegacyOrgScopedProfile != "external-worker" || blankData.CorpName != "Legacy Corp" || blankData.UserName != "Legacy Worker" {
-		t.Fatalf("blank-userId history selection = %#v, reused=%v err=%v", blankData, reused, err)
-	}
-	contactBlankData := &authpkg.TokenData{CorpID: "ding_same", AccessToken: "new-token"}
-	if err := enrichAuthLoginProfileFromContact(
-		context.Background(),
-		"cfg",
-		&authCoverageCaller{err: errors.New("contact unavailable")},
-		contactBlankData,
-		authLoginHistoryHint{Selector: "external-worker", Explicit: true},
-	); err != nil {
-		t.Fatalf("blank-userId history must keep contact best effort: %v", err)
-	}
-	if contactBlankData.LegacyOrgScopedProfile != "external-worker" {
-		t.Fatalf("blank-userId contact fallback did not authorize the historical organization slot: %#v", contactBlankData)
-	}
-
-	profiles := []*authpkg.Profile{
-		nil,
-		{Name: "duplicate", CorpID: "ding_same", UserID: "user_1"},
-		{Name: "duplicate", CorpID: "ding_same", UserID: "user_2"},
-	}
-	for _, tc := range []struct {
-		name     string
-		selector string
-		profiles []*authpkg.Profile
-		want     *authpkg.Profile
-	}{
-		{name: "empty selector", selector: "", profiles: profiles},
-		{name: "missing exact identity", selector: "ding_same:missing", profiles: profiles},
-		{name: "duplicate name", selector: "duplicate", profiles: profiles},
-		{name: "unmatched name", selector: "not-found", profiles: profiles},
-		{name: "sole organization selector", selector: "ding_same", profiles: profiles[1:2], want: profiles[1]},
-	} {
-		t.Run("selector "+tc.name, func(t *testing.T) {
-			if got := historicalProfileForSelector("ding_same", tc.selector, tc.profiles); got != tc.want {
-				t.Fatalf("historicalProfileForSelector(%q) = %#v, want %#v", tc.selector, got, tc.want)
-			}
-		})
-	}
-}
-
 func TestCrossPlatformCoverageAuthCoverageDefaultSeamClosures(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel()
@@ -1337,7 +748,7 @@ func TestCrossPlatformCoverageAuthCoveragePortableExchangeAndReset(t *testing.T)
 	if err := importCmd.RunE(badForce, nil); err == nil {
 		t.Fatal("invalid force flag should fail")
 	}
-	_, _, _ = authCoverageRoot(importCmd, "table", false)
+	_, out, _ = authCoverageRoot(importCmd, "table", false)
 	if err := importCmd.RunE(importCmd, nil); err == nil {
 		t.Fatal("missing input should fail")
 	}

internal/app/auth_command_test.go

@@ -195,15 +195,6 @@ func TestCrossPlatformCoverageAuthImportRejectsWindowsDPAPIBackend(t *testing.T)
 	}
 	t.Setenv("DWS_CONFIG_DIR", configDir)
 	t.Setenv(keychain.StorageDirEnv, keychainDir)
-	// Windows stores credentials in HKCU rather than StorageDirEnv. Use a
-	// fresh registry namespace so this zero-state assertion cannot inherit a
-	// token from an earlier test in the same package binary.
-	t.Setenv(keychain.TestNamespaceEnv, root)
-	t.Cleanup(func() {
-		if err := keychain.RemoveAuthTokenEntries(keychain.Service); err != nil {
-			t.Errorf("clean import guard keychain fixture: %v", err)
-		}
-	})
 
 	importCmd := NewRootCommand()
 	importCmd.SetOut(&bytes.Buffer{})

internal/app/auth_legacy_platform_coverage_test.go

@@ -1,307 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package app
-
-import (
-	"context"
-	"errors"
-	"io"
-	"strings"
-	"testing"
-	"time"
-
-	authpkg "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/auth"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/event/personal"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/executor"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/pat"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/edition"
-)
-
-func TestCrossPlatformCoverageAuthLoginUsesStableBlankProfileForPostLoginAuthorization(t *testing.T) {
-	t.Setenv("DWS_CONFIG_DIR", t.TempDir())
-	oldOAuth := authOAuthLogin
-	oldLoadProfiles := authLoadProfiles
-	oldRecommend := authRunLoginRecommend
-	oldInteractive := authLoginInteractiveTerminal
-	oldResolve := authResolveProfile
-	t.Cleanup(func() {
-		authOAuthLogin = oldOAuth
-		authLoadProfiles = oldLoadProfiles
-		authRunLoginRecommend = oldRecommend
-		authLoginInteractiveTerminal = oldInteractive
-		authResolveProfile = oldResolve
-	})
-
-	const corpID = "corp_post_login_blank"
-	cfg := &authpkg.ProfilesConfig{Profiles: []authpkg.Profile{
-		{Name: "Fixture Organization", CorpID: corpID, CorpName: "Fixture Organization"},
-		{Name: "Exact Fixture", CorpID: corpID, CorpName: "Fixture Organization", UserID: "identity_exact"},
-	}}
-	wantSelector := authpkg.ProfileSelectionSelector(cfg.Profiles[0], cfg)
-	if wantSelector == "" || wantSelector == corpID {
-		t.Fatalf("blank selector = %q, want a stable account selector", wantSelector)
-	}
-	authResolveProfile = func(string, string) (*authpkg.Profile, error) {
-		return nil, errors.New("no implicit profile")
-	}
-	authLoadProfiles = func(string) (*authpkg.ProfilesConfig, error) { return cfg, nil }
-	authOAuthLogin = func(*authpkg.OAuthProvider, context.Context, bool) (*authpkg.TokenData, error) {
-		return &authpkg.TokenData{
-			AccessToken: "new-access",
-			ExpiresAt:   time.Now().Add(time.Hour),
-			CorpID:      corpID,
-		}, nil
-	}
-	authLoginInteractiveTerminal = func() bool { return false }
-	seenSelector := ""
-	authRunLoginRecommend = func(context.Context, edition.ToolCaller, io.Writer, pat.LoginRecommendOptions) error {
-		seenSelector = authpkg.RuntimeProfile()
-		return nil
-	}
-	if _, _, err := authCoverageRunLogin(t, nil, "table", true, map[string]string{"recommend": "true"}); err != nil {
-		t.Fatalf("blank-profile login error = %v", err)
-	}
-	if seenSelector != wantSelector {
-		t.Fatalf("post-login runtime selector = %q, want %q", seenSelector, wantSelector)
-	}
-}
-
-func TestCrossPlatformCoverageAuthStatusAndLogoutPreserveExactSelectors(t *testing.T) {
-	t.Run("status canonicalizes a known identity", func(t *testing.T) {
-		configDir := t.TempDir()
-		t.Setenv("DWS_CONFIG_DIR", configDir)
-		const exactSelector = "corp_status_fixture:identity_status_fixture"
-		if err := authpkg.SaveProfiles(configDir, &authpkg.ProfilesConfig{
-			Version: 2,
-			Profiles: []authpkg.Profile{{
-				Name:   "Status Fixture",
-				CorpID: "corp_status_fixture",
-				UserID: "identity_status_fixture",
-			}},
-		}); err != nil {
-			t.Fatalf("SaveProfiles() error = %v", err)
-		}
-
-		oldStatus := authOAuthStatus
-		t.Cleanup(func() { authOAuthStatus = oldStatus })
-		seenSelector := ""
-		authOAuthStatus = func(*authpkg.OAuthProvider) (*authpkg.TokenData, error) {
-			seenSelector = authpkg.RuntimeProfile()
-			return &authpkg.TokenData{
-				AccessToken: "access",
-				ExpiresAt:   time.Now().Add(time.Hour),
-				CorpID:      "corp_status_fixture",
-				UserID:      "identity_status_fixture",
-			}, nil
-		}
-		cmd := newAuthStatusCommand()
-		_, _, _ = authCoverageRoot(cmd, "table", false)
-		if err := cmd.Flags().Set("profile", " Status Fixture "); err != nil {
-			t.Fatal(err)
-		}
-		if err := cmd.RunE(cmd, nil); err != nil {
-			t.Fatalf("auth status error = %v", err)
-		}
-		if seenSelector != exactSelector {
-			t.Fatalf("status runtime selector = %q, want %q", seenSelector, exactSelector)
-		}
-	})
-
-	t.Run("logout keeps a blank local selector", func(t *testing.T) {
-		oldResolve := authResolveProfileDeletion
-		oldLoad := authLoadTokenForProfile
-		oldRevoke := authRevokeTokenForData
-		oldDelete := authDeleteProfileToken
-		t.Cleanup(func() {
-			authResolveProfileDeletion = oldResolve
-			authLoadTokenForProfile = oldLoad
-			authRevokeTokenForData = oldRevoke
-			authDeleteProfileToken = oldDelete
-		})
-
-		const selector = "legacy-external-worker"
-		authResolveProfileDeletion = func(string, string) (*authpkg.Profile, bool, error) {
-			return &authpkg.Profile{CorpID: "corp_logout_blank"}, true, nil
-		}
-		loadedSelector := ""
-		authLoadTokenForProfile = func(_ string, got string) (*authpkg.TokenData, error) {
-			loadedSelector = got
-			return &authpkg.TokenData{CorpID: "corp_logout_blank"}, nil
-		}
-		authRevokeTokenForData = func(context.Context, *authpkg.TokenData) error { return nil }
-		deletedSelector := ""
-		authDeleteProfileToken = func(_ string, got string) error {
-			deletedSelector = got
-			return nil
-		}
-
-		if err := logoutOneProfile(nil, context.Background(), "cfg", "  "+selector+"  "); err != nil {
-			t.Fatalf("logoutOneProfile() error = %v", err)
-		}
-		if loadedSelector != selector || deletedSelector != selector {
-			t.Fatalf("blank logout selectors = load %q delete %q, want %q", loadedSelector, deletedSelector, selector)
-		}
-	})
-}
-
-func TestCrossPlatformCoverageAuthHistorySelectorRemainingBranches(t *testing.T) {
-	if got := authLoginHistorySelector("cfg", nil); got != "" {
-		t.Fatalf("nil history selector = %q", got)
-	}
-
-	oldLoad := authLoadProfiles
-	t.Cleanup(func() { authLoadProfiles = oldLoad })
-	authLoadProfiles = func(string) (*authpkg.ProfilesConfig, error) {
-		return nil, errors.New("profiles unavailable")
-	}
-	profile := &authpkg.Profile{CorpID: "corp_history", UserID: "identity_history"}
-	if got := authLoginHistorySelector("cfg", profile); got != "corp_history:identity_history" {
-		t.Fatalf("history selector fallback = %q", got)
-	}
-
-	duplicateA := &authpkg.Profile{CorpID: "corp_history", UserID: "duplicate_identity"}
-	duplicateB := &authpkg.Profile{CorpID: "corp_history", UserID: "duplicate_identity"}
-	if got := historicalProfileForSelector(
-		"corp_history",
-		"corp_history:duplicate_identity",
-		[]*authpkg.Profile{duplicateA, duplicateB},
-	); got != nil {
-		t.Fatalf("duplicate stable identity selected %#v", got)
-	}
-
-	// Whitespace keeps the raw selector from matching the stable string while
-	// ParseIdentitySelector still resolves its components.
-	exactFallback := &authpkg.Profile{CorpID: "corp_history", UserID: "fallback_identity"}
-	if got := historicalProfileForSelector(
-		"corp_history",
-		"corp_history : fallback_identity",
-		[]*authpkg.Profile{exactFallback},
-	); got != exactFallback {
-		t.Fatalf("exact history fallback = %#v, want %#v", got, exactFallback)
-	}
-}
-
-func TestCrossPlatformCoverageProfileSwitchLegacyBlankAndNormalizedIdentityPointers(t *testing.T) {
-	t.Run("one legacy blank name", func(t *testing.T) {
-		profiles := []authpkg.Profile{
-			{Name: "Fixture Organization", CorpID: "corp_profile_fixture", CorpName: "Fixture Organization"},
-			{Name: "Exact Fixture", CorpID: "corp_profile_fixture", CorpName: "Fixture Organization", UserID: "identity_exact"},
-		}
-		cfg := &authpkg.ProfilesConfig{Profiles: profiles}
-		if got := profileSwitchProfileIndex(profiles, "Fixture Organization", cfg); got != 0 {
-			t.Fatalf("legacy blank profile index = %d, want 0", got)
-		}
-	})
-
-	t.Run("duplicate legacy names fall through to blank-name compatibility", func(t *testing.T) {
-		profiles := []authpkg.Profile{
-			{Name: "duplicate-legacy", CorpID: "corp_profile_fixture"},
-			{Name: "duplicate-legacy", CorpID: "corp_profile_fixture"},
-		}
-		cfg := &authpkg.ProfilesConfig{Profiles: profiles}
-		if got := profileSwitchProfileIndex(profiles, "duplicate-legacy", cfg); got != 0 {
-			t.Fatalf("duplicate legacy fallback index = %d, want 0", got)
-		}
-	})
-
-	t.Run("normalized exact identity", func(t *testing.T) {
-		profiles := []authpkg.Profile{{CorpID: "corp_profile_fixture", UserID: "identity_exact"}}
-		cfg := &authpkg.ProfilesConfig{Profiles: profiles}
-		if got := profileSwitchProfileIndex(profiles, "corp_profile_fixture : identity_exact", cfg); got != 0 {
-			t.Fatalf("normalized exact profile index = %d, want 0", got)
-		}
-		if got := profileSwitchProfileIndex(profiles, "corp_profile_fixture : missing", cfg); got != -1 {
-			t.Fatalf("missing normalized exact profile index = %d, want -1", got)
-		}
-	})
-}
-
-func TestCrossPlatformCoverageRuntimeRunnerPreservesBlankSelectorInSingleAndMultiRuns(t *testing.T) {
-	exact := authLogoutTestToken("corp_runner_blank")
-	exact.UserID = "identity_exact_runner"
-	other := authLogoutTestToken("corp_runner_other")
-	configDir := setupAuthLogoutProfiles(t, exact, other)
-	blank := authLogoutTestToken("corp_runner_blank")
-	blank.AccessToken = "access-unresolved-runner"
-	blank.RefreshToken = "refresh-unresolved-runner"
-	blank.UserID = ""
-	blank.UserName = ""
-	if err := authpkg.SaveTokenData(configDir, blank); err != nil {
-		t.Fatalf("SaveTokenData(blank) error = %v", err)
-	}
-	cfg, err := authpkg.LoadProfiles(configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles() error = %v", err)
-	}
-	blankSelector := ""
-	for _, profile := range cfg.Profiles {
-		if profile.CorpID == blank.CorpID && profile.UserID == "" {
-			blankSelector = authpkg.ProfileSelectionSelector(profile, cfg)
-			break
-		}
-	}
-	if blankSelector == "" || blankSelector == blank.CorpID {
-		t.Fatalf("blank runner selector = %q, want exact local selector", blankSelector)
-	}
-
-	runner := &runtimeRunner{fallback: multiProfileFallbackRunner{}}
-	invocation := executor.Invocation{
-		Kind:             "helper_invocation",
-		CanonicalProduct: "contact",
-		Tool:             "get_current_user_profile",
-	}
-	authpkg.SetRuntimeProfile(blankSelector)
-	result, err := runner.Run(context.Background(), invocation)
-	if err != nil {
-		t.Fatalf("single blank Run() error = %v", err)
-	}
-	content := result.Response["content"].(map[string]any)
-	if got := content["runtimeProfile"]; got != blankSelector {
-		t.Fatalf("single blank runtime profile = %#v, want %q", got, blankSelector)
-	}
-	if got := authpkg.RuntimeProfile(); got != blankSelector {
-		t.Fatalf("single blank runtime restoration = %q, want %q", got, blankSelector)
-	}
-
-	authpkg.SetRuntimeProfile(blankSelector + ",corp_runner_other")
-	result, err = runner.Run(context.Background(), invocation)
-	if err != nil {
-		t.Fatalf("multi blank Run() error = %v", err)
-	}
-	entries := result.Response["content"].(map[string]any)["profiles"].([]any)
-	if len(entries) != 2 {
-		t.Fatalf("multi blank profiles = %#v, want two", entries)
-	}
-	first := entries[0].(map[string]any)
-	if first["selector"] != blankSelector || first["profile"] != blankSelector || first["userId"] != "" {
-		t.Fatalf("multi blank first entry = %#v", first)
-	}
-}
-
-func TestCrossPlatformCoveragePersonalBusSelectorCanonicalFallback(t *testing.T) {
-	authpkg.SetRuntimeProfile("")
-	t.Cleanup(func() { authpkg.SetRuntimeProfile("") })
-	identity := personal.Identity{
-		CorpID:   "corp_event_fallback",
-		UserID:   "identity_event_fallback",
-		SourceID: "open",
-	}
-	if got := personalBusProfileSelector(t.TempDir(), identity); got != "corp_event_fallback:identity_event_fallback" {
-		t.Fatalf("personal bus fallback selector = %q", got)
-	}
-	args := personalBusSpawnArgs(identity, "", "", "   ")
-	if got := strings.Join(args, " "); !strings.Contains(got, "--profile corp_event_fallback:identity_event_fallback") {
-		t.Fatalf("personal bus default profile args = %q", got)
-	}
-}

internal/app/auth_login_persistence_boundary_test.go

@@ -1,107 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package app
-
-import (
-	"strings"
-	"testing"
-	"time"
-
-	authpkg "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/auth"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/keychain"
-)
-
-func TestPATFreshAuthorizationSaveUsesLoginIsolationBoundary(t *testing.T) {
-	configDir := t.TempDir()
-	t.Setenv(keychain.DisableKeychainEnv, "1")
-	t.Setenv(keychain.StorageDirEnv, t.TempDir())
-	const (
-		corpID = "corp_pat_login_boundary"
-		userID = "exact-user"
-	)
-	cfg := &authpkg.ProfilesConfig{
-		Version: 2,
-		Profiles: []authpkg.Profile{
-			{Name: "External Account", CorpID: corpID, CorpName: "PAT Boundary Organization"},
-			{Name: "Exact Account", CorpID: corpID, CorpName: "PAT Boundary Organization", UserID: userID},
-		},
-	}
-	blankSelector := authpkg.ProfileSelectionSelector(cfg.Profiles[0], cfg)
-	cfg.CurrentProfile = blankSelector
-	cfg.PrimaryProfile = blankSelector
-	if err := authpkg.SaveProfiles(configDir, cfg); err != nil {
-		t.Fatalf("SaveProfiles() error = %v", err)
-	}
-	blank := &authpkg.TokenData{AccessToken: "existing-unresolved", CorpID: corpID, CorpName: "PAT Boundary Organization"}
-	exact := &authpkg.TokenData{AccessToken: "existing-exact", CorpID: corpID, CorpName: "PAT Boundary Organization", UserID: userID}
-	if err := authpkg.SaveTokenDataKeychainForCorpID(corpID, blank); err != nil {
-		t.Fatalf("save unresolved token: %v", err)
-	}
-	if err := authpkg.SaveTokenDataKeychainForIdentity(corpID, userID, exact); err != nil {
-		t.Fatalf("save exact token: %v", err)
-	}
-	previousRuntimeProfile := authpkg.RuntimeProfile()
-	authpkg.SetRuntimeProfile("")
-	t.Cleanup(func() { authpkg.SetRuntimeProfile(previousRuntimeProfile) })
-
-	fresh := &authpkg.TokenData{AccessToken: "pat-fresh-unknown", CorpID: corpID, CorpName: "PAT Boundary Organization"}
-	err := patSaveTokenData(configDir, fresh)
-	if err == nil || !strings.Contains(err.Error(), "fresh UID-less token") {
-		t.Fatalf("patSaveTokenData() error = %v, want unresolved-sibling protection", err)
-	}
-	persisted, loadErr := authpkg.LoadTokenDataKeychainForCorpID(corpID)
-	if loadErr != nil || persisted.AccessToken != blank.AccessToken || persisted.UserID != "" {
-		t.Fatalf("PAT save changed unresolved sibling: token=%#v err=%v", persisted, loadErr)
-	}
-}
-
-func TestManualLoginSaveRepairsHalfMigratedGlobalBeforeOverwrite(t *testing.T) {
-	configDir := t.TempDir()
-	t.Setenv(keychain.DisableKeychainEnv, "1")
-	t.Setenv(keychain.StorageDirEnv, t.TempDir())
-	const (
-		corpID = "corp_manual_login_boundary"
-		userID = "legacy-user"
-	)
-	selector := corpID + ":" + userID
-	if err := authpkg.SaveProfiles(configDir, &authpkg.ProfilesConfig{
-		Version:        2,
-		CurrentProfile: selector,
-		Profiles: []authpkg.Profile{{
-			Name: "Legacy Exact Account", CorpID: corpID, CorpName: "Manual Boundary Organization", UserID: userID,
-		}},
-	}); err != nil {
-		t.Fatalf("SaveProfiles() error = %v", err)
-	}
-	legacy := &authpkg.TokenData{AccessToken: "only-legacy-copy", CorpID: corpID, CorpName: "Manual Boundary Organization"}
-	if err := authpkg.SaveTokenDataKeychain(legacy); err != nil {
-		t.Fatalf("save half-migrated global: %v", err)
-	}
-	manual := &authpkg.TokenData{AccessToken: "manual-default", ExpiresAt: time.Now().Add(time.Hour)}
-	if err := authSaveTokenData(configDir, manual); err != nil {
-		t.Fatalf("authSaveTokenData(manual) error = %v", err)
-	}
-	org, err := authpkg.LoadTokenDataKeychainForCorpID(corpID)
-	if err != nil || org.AccessToken != legacy.AccessToken || org.UserID != "" {
-		t.Fatalf("organization repair = %#v, %v", org, err)
-	}
-	identity, err := authpkg.LoadTokenDataKeychainForIdentity(corpID, userID)
-	if err != nil || identity.AccessToken != legacy.AccessToken || identity.UserID != userID {
-		t.Fatalf("identity repair = %#v, %v", identity, err)
-	}
-	global, err := authpkg.LoadTokenDataKeychain()
-	if err != nil || global.AccessToken != manual.AccessToken || global.CorpID != "" {
-		t.Fatalf("manual global = %#v, %v", global, err)
-	}
-}

internal/app/auth_refresh_retry.go

@@ -15,15 +15,6 @@ package app
 
 import (
 	"context"
-	"errors"
-	"fmt"
-	"log/slog"
-	"strings"
-
-	apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/executor"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/logging"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/authretry"
 )
 
 // authRetryingKey marks a context that has already attempted one
@@ -32,35 +23,8 @@ import (
 // to the user instead.
 type authRetryingKeyType struct{}
 
-type authRefreshFailureError struct {
-	rejection error
-	refresh   error
-}
-
-func (e *authRefreshFailureError) Error() string {
-	return "automatic access token refresh failed"
-}
-
-func (e *authRefreshFailureError) Unwrap() []error {
-	if e == nil {
-		return nil
-	}
-	return []error{e.rejection, e.refresh}
-}
-
 var authRetryingKey = authRetryingKeyType{}
 
-var (
-	runnerForceRefreshRejectedAccessToken = forceRefreshRejectedAccessToken
-	runnerExecuteAuthRetry                func(*runtimeRunner, context.Context, string, executor.Invocation) (executor.Result, error)
-)
-
-func init() {
-	runnerExecuteAuthRetry = func(r *runtimeRunner, ctx context.Context, endpoint string, invocation executor.Invocation) (executor.Result, error) {
-		return r.executeInvocation(ctx, endpoint, invocation)
-	}
-}
-
 // IsAuthRetrying reports whether the current context is already inside an
 // AuthRefreshRequired retry. Mirrors IsPatRetrying.
 func IsAuthRetrying(ctx context.Context) bool {
@@ -70,103 +34,3 @@ func IsAuthRetrying(ctx context.Context) bool {
 	v, _ := ctx.Value(authRetryingKey).(bool)
 	return v
 }
-
-func withAuthRetrying(ctx context.Context) context.Context {
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	return context.WithValue(ctx, authRetryingKey, true)
-}
-
-func authRefreshLogger() *slog.Logger {
-	if logger := FileLoggerInstance(); logger != nil {
-		return logger
-	}
-	return slog.Default()
-}
-
-func (r *runtimeRunner) managesRuntimeOAuth(hasPluginAuth bool) bool {
-	if r == nil || hasPluginAuth {
-		return false
-	}
-	return r.globalFlags == nil || strings.TrimSpace(r.globalFlags.Token) == ""
-}
-
-// retryAuthRefreshRequired consumes only the explicit edition marker. It does
-// not infer retryability from free text, generic auth categories, HTTP 403, or
-// ordinary business errors.
-func (r *runtimeRunner) retryAuthRefreshRequired(
-	ctx context.Context,
-	endpoint string,
-	invocation executor.Invocation,
-	rejectedAccessToken string,
-	markerErr error,
-	hasPluginAuth bool,
-) (executor.Result, error, bool) {
-	marker, marked := authretry.As(markerErr)
-	if !marked {
-		return executor.Result{}, nil, false
-	}
-	cause := marker.Cause
-	if cause == nil {
-		cause = markerErr
-	}
-
-	// Explicit --token and plugin credentials are not backed by the default
-	// OAuth refresh store. Preserve the overlay cause without mutating an
-	// unrelated persisted login.
-	if !r.managesRuntimeOAuth(hasPluginAuth) {
-		return executor.Result{}, cause, true
-	}
-	if IsAuthRetrying(ctx) {
-		authRefreshLogger().Warn("auth.runtime.refresh.retry_exhausted",
-			"product", invocation.CanonicalProduct,
-			"tool", invocation.Tool,
-		)
-		return executor.Result{}, cause, true
-	}
-
-	if _, err := runnerForceRefreshRejectedAccessToken(ctx, defaultConfigDir(), rejectedAccessToken); err != nil {
-		// Keep every log credential-safe. The returned error chain retains the
-		// complete cause for in-process diagnosis; even DWS_DEBUG_AUTH must not
-		// serialize an OAuth response body or other attacker-controlled text.
-		authRefreshLogger().Warn("auth.runtime.refresh.failed",
-			"product", invocation.CanonicalProduct,
-			"tool", invocation.Tool,
-			"stage", "force_refresh_rejected_token",
-			"error_type", fmt.Sprintf("%T", err),
-		)
-		logging.AuthDebug("auth.runtime.refresh.failed.detail",
-			"product", invocation.CanonicalProduct,
-			"tool", invocation.Tool,
-			"stage", "force_refresh_rejected_token",
-			"error_type", fmt.Sprintf("%T", err),
-		)
-		combined := &authRefreshFailureError{rejection: cause, refresh: err}
-		return executor.Result{}, apperrors.NewAuth(
-			"automatic access token refresh failed",
-			apperrors.WithOperation("auth/token/refresh"),
-			apperrors.WithReason("auth_refresh_failed"),
-			apperrors.WithHint("本地凭证已保留；可稍后重试，若持续失败请查看认证诊断日志。"),
-			apperrors.WithCause(combined),
-		), true
-	}
-
-	logging.AuthDebug("auth.runtime.refresh.succeeded",
-		"product", invocation.CanonicalProduct,
-		"tool", invocation.Tool,
-	)
-	result, err := runnerExecuteAuthRetry(r, withAuthRetrying(ctx), endpoint, invocation)
-	return result, err, true
-}
-
-// isRefreshableTransportAuthError deliberately excludes HTTP/RPC 403 and
-// generic CategoryAuth values. OnAuthError may request a refresh only for an
-// exact transport-level unauthorized signal.
-func isRefreshableTransportAuthError(err error) bool {
-	var typed *apperrors.Error
-	if !errors.As(err, &typed) || typed.Category != apperrors.CategoryAuth {
-		return false
-	}
-	return typed.Reason == "http_401" || typed.RPCCode == 401
-}

internal/app/auth_refresh_retry_runner_test.go

@@ -1,354 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package app
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"log/slog"
-	"strings"
-	"testing"
-
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/audit"
-	authpkg "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/auth"
-	apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/executor"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/transport"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/authretry"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/edition"
-)
-
-func installAuthRefreshRunnerSeams(t *testing.T) {
-	t.Helper()
-	previousHooks := edition.Get()
-	previousCall := runnerCallTool
-	previousPreflight := runnerPreflightDocDownload
-	previousRefresh := runnerForceRefreshRejectedAccessToken
-	previousRetry := runnerExecuteAuthRetry
-	previousCapture := runnerCaptureRuntimeFailure
-	previousProfile := authpkg.RuntimeProfile()
-
-	pluginAuthMu.Lock()
-	previousPlugins := pluginAuthRegistry
-	pluginAuthRegistry = make(map[string]*PluginAuth)
-	pluginAuthMu.Unlock()
-
-	runnerPreflightDocDownload = func(*runtimeRunner, context.Context, *transport.Client, string, executor.Invocation) error {
-		return nil
-	}
-	runnerCaptureRuntimeFailure = func(executor.Invocation, error, error) {}
-	authpkg.SetRuntimeProfile("")
-	runtimeTokenManager.Invalidate()
-	t.Setenv("DWS_CONFIG_DIR", "")
-	t.Setenv("DWS_DEBUG_AUTH", "0")
-
-	t.Cleanup(func() {
-		edition.Override(previousHooks)
-		runnerCallTool = previousCall
-		runnerPreflightDocDownload = previousPreflight
-		runnerForceRefreshRejectedAccessToken = previousRefresh
-		runnerExecuteAuthRetry = previousRetry
-		runnerCaptureRuntimeFailure = previousCapture
-		authpkg.SetRuntimeProfile(previousProfile)
-		runtimeTokenManager.Invalidate()
-		pluginAuthMu.Lock()
-		pluginAuthRegistry = previousPlugins
-		pluginAuthMu.Unlock()
-	})
-}
-
-func authRefreshTestRunner(flags *GlobalFlags) *runtimeRunner {
-	return &runtimeRunner{
-		transport:   transport.NewClient(nil),
-		globalFlags: flags,
-		auditSink:   audit.NopSink{},
-	}
-}
-
-func authRefreshTestInvocation() executor.Invocation {
-	return executor.Invocation{
-		CanonicalProduct: "auth-retry-test-product",
-		Tool:             "test_tool",
-		Params:           map[string]any{"value": "safe"},
-	}
-}
-
-func authRefreshTokenHooks(configDir string, token *string, classify func(map[string]any) error) *edition.Hooks {
-	return &edition.Hooks{
-		ConfigDir: func() string { return configDir },
-		TokenProvider: func(context.Context, func() (string, error)) (string, error) {
-			return *token, nil
-		},
-		ClassifyToolResult: classify,
-	}
-}
-
-func TestCrossPlatformCoverageRunnerRetriesEditionAuthMarkerOnce(t *testing.T) {
-	installAuthRefreshRunnerSeams(t)
-	configDir := t.TempDir()
-	token := "old-access"
-	rejection := apperrors.NewAuth("server rejected access token", apperrors.WithReason("access_token_rejected"))
-	edition.Override(authRefreshTokenHooks(configDir, &token, func(content map[string]any) error {
-		if expired, _ := content["expired"].(bool); expired {
-			return &authretry.AuthRefreshRequired{Cause: rejection}
-		}
-		return nil
-	}))
-
-	var callTokens []string
-	runnerCallTool = func(client *transport.Client, _ context.Context, _, _ string, _ map[string]any) (transport.ToolCallResult, error) {
-		callTokens = append(callTokens, client.AuthToken)
-		if len(callTokens) == 1 {
-			return transport.ToolCallResult{Content: map[string]any{"expired": true}}, nil
-		}
-		return transport.ToolCallResult{Content: map[string]any{"value": "ok"}}, nil
-	}
-	refreshCalls := 0
-	runnerForceRefreshRejectedAccessToken = func(_ context.Context, gotDir, rejected string) (string, error) {
-		refreshCalls++
-		if gotDir != configDir || rejected != "old-access" {
-			t.Fatalf("refresh input = dir %q token %q", gotDir, rejected)
-		}
-		token = "new-access"
-		return token, nil
-	}
-
-	result, err := authRefreshTestRunner(nil).executeInvocation(context.Background(), "https://example.test", authRefreshTestInvocation())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if refreshCalls != 1 || len(callTokens) != 2 || callTokens[0] != "old-access" || callTokens[1] != "new-access" {
-		t.Fatalf("refreshes=%d call tokens=%v", refreshCalls, callTokens)
-	}
-	content, _ := result.Response["content"].(map[string]any)
-	if content["value"] != "ok" || content["success"] != true {
-		t.Fatalf("result content = %#v", content)
-	}
-}
-
-func TestCrossPlatformCoverageRunnerRefreshFailurePreservesBothCausesAndSafeLog(t *testing.T) {
-	installAuthRefreshRunnerSeams(t)
-	t.Setenv("DWS_DEBUG_AUTH", "1")
-	configDir := t.TempDir()
-	token := "old-access"
-	rejection := apperrors.NewAuth("server rejected access token", apperrors.WithReason("access_token_rejected"))
-	edition.Override(authRefreshTokenHooks(configDir, &token, func(map[string]any) error {
-		return &authretry.AuthRefreshRequired{Cause: rejection}
-	}))
-	runnerCallTool = func(*transport.Client, context.Context, string, string, map[string]any) (transport.ToolCallResult, error) {
-		return transport.ToolCallResult{Content: map[string]any{"expired": true}}, nil
-	}
-	refreshErr := errors.New(`oauth refresh response parse failed: body={"access_token":"access-token-secret","refresh_token":"refresh-token-secret","uid":"uid-secret-value"}`)
-	runnerForceRefreshRejectedAccessToken = func(context.Context, string, string) (string, error) {
-		return "", refreshErr
-	}
-
-	var logs bytes.Buffer
-	previousLogger := slog.Default()
-	slog.SetDefault(slog.New(slog.NewJSONHandler(&logs, &slog.HandlerOptions{Level: slog.LevelDebug})))
-	t.Cleanup(func() { slog.SetDefault(previousLogger) })
-
-	_, err := authRefreshTestRunner(nil).executeInvocation(context.Background(), "https://example.test", authRefreshTestInvocation())
-	if !errors.Is(err, rejection) || !errors.Is(err, refreshErr) {
-		t.Fatalf("error = %v, want rejection and refresh causes", err)
-	}
-	var typed *apperrors.Error
-	if !errors.As(err, &typed) || typed.Category != apperrors.CategoryAuth || typed.Reason != "auth_refresh_failed" || typed.Operation != "auth/token/refresh" {
-		t.Fatalf("refresh envelope = %#v", typed)
-	}
-	var rendered bytes.Buffer
-	if printErr := apperrors.PrintJSON(&rendered, err); printErr != nil {
-		t.Fatal(printErr)
-	}
-	for _, want := range []string{`"category": "auth"`, `"reason": "auth_refresh_failed"`, `"operation": "auth/token/refresh"`} {
-		if !strings.Contains(rendered.String(), want) {
-			t.Fatalf("structured stderr missing %s: %s", want, rendered.String())
-		}
-	}
-	for _, secret := range []string{"access-token-secret", "refresh-token-secret", "uid-secret-value"} {
-		if strings.Contains(err.Error(), secret) || strings.Contains(logs.String(), secret) || strings.Contains(rendered.String(), secret) {
-			t.Fatalf("auth output leaked %q: error=%q logs=%s stderr=%s", secret, err, logs.String(), rendered.String())
-		}
-	}
-	for _, want := range []string{"auth.runtime.refresh.failed", "auth.runtime.refresh.failed.detail", "force_refresh_rejected_token", "error_type"} {
-		if !strings.Contains(logs.String(), want) {
-			t.Fatalf("safe refresh log missing %q: %s", want, logs.String())
-		}
-	}
-}
-
-func TestCrossPlatformCoverageRunnerSecondEditionMarkerReturnsSecondCause(t *testing.T) {
-	installAuthRefreshRunnerSeams(t)
-	configDir := t.TempDir()
-	token := "old-access"
-	firstCause := errors.New("first rejection")
-	secondCause := errors.New("second rejection")
-	edition.Override(authRefreshTokenHooks(configDir, &token, func(content map[string]any) error {
-		attempt, _ := content["attempt"].(int)
-		if attempt == 1 {
-			return &authretry.AuthRefreshRequired{Cause: firstCause}
-		}
-		return &authretry.AuthRefreshRequired{Cause: secondCause}
-	}))
-	calls := 0
-	runnerCallTool = func(*transport.Client, context.Context, string, string, map[string]any) (transport.ToolCallResult, error) {
-		calls++
-		return transport.ToolCallResult{Content: map[string]any{"attempt": calls}}, nil
-	}
-	refreshCalls := 0
-	runnerForceRefreshRejectedAccessToken = func(context.Context, string, string) (string, error) {
-		refreshCalls++
-		token = "new-access"
-		return token, nil
-	}
-
-	_, err := authRefreshTestRunner(nil).executeInvocation(context.Background(), "https://example.test", authRefreshTestInvocation())
-	if !errors.Is(err, secondCause) || errors.Is(err, firstCause) {
-		t.Fatalf("error = %v, want only second rejection cause", err)
-	}
-	if calls != 2 || refreshCalls != 1 {
-		t.Fatalf("calls=%d refreshes=%d", calls, refreshCalls)
-	}
-}
-
-func TestCrossPlatformCoverageRunnerOnAuthErrorOnlyRetriesExactUnauthorized(t *testing.T) {
-	t.Run("http 401 marker retries once", func(t *testing.T) {
-		installAuthRefreshRunnerSeams(t)
-		configDir := t.TempDir()
-		token := "old-access"
-		rejection := errors.New("transport rejected token")
-		hookCalls := 0
-		hooks := authRefreshTokenHooks(configDir, &token, nil)
-		hooks.OnAuthError = func(string, error) error {
-			hookCalls++
-			return &authretry.AuthRefreshRequired{Cause: rejection}
-		}
-		edition.Override(hooks)
-		calls := 0
-		var callTokens []string
-		runnerCallTool = func(client *transport.Client, _ context.Context, _, _ string, _ map[string]any) (transport.ToolCallResult, error) {
-			calls++
-			callTokens = append(callTokens, client.AuthToken)
-			if calls == 1 {
-				return transport.ToolCallResult{}, apperrors.NewAuth("unauthorized", apperrors.WithReason("http_401"))
-			}
-			return transport.ToolCallResult{Content: map[string]any{"value": "ok"}}, nil
-		}
-		refreshCalls := 0
-		runnerForceRefreshRejectedAccessToken = func(context.Context, string, string) (string, error) {
-			refreshCalls++
-			token = "new-access"
-			return token, nil
-		}
-
-		if _, err := authRefreshTestRunner(nil).executeInvocation(context.Background(), "https://example.test", authRefreshTestInvocation()); err != nil {
-			t.Fatal(err)
-		}
-		if hookCalls != 1 || refreshCalls != 1 || calls != 2 || strings.Join(callTokens, ",") != "old-access,new-access" {
-			t.Fatalf("hook=%d refresh=%d calls=%d tokens=%v", hookCalls, refreshCalls, calls, callTokens)
-		}
-	})
-
-	for _, tc := range []struct {
-		name string
-		err  error
-	}{
-		{name: "http 403", err: apperrors.NewAuth("forbidden", apperrors.WithReason("http_403"))},
-		{name: "ordinary auth", err: apperrors.NewAuth("load failed", apperrors.WithReason("auth_load_failed"))},
-	} {
-		t.Run(tc.name+" does not enter hook", func(t *testing.T) {
-			installAuthRefreshRunnerSeams(t)
-			configDir := t.TempDir()
-			token := "old-access"
-			hookCalls := 0
-			hooks := authRefreshTokenHooks(configDir, &token, nil)
-			hooks.OnAuthError = func(string, error) error {
-				hookCalls++
-				return &authretry.AuthRefreshRequired{Cause: errors.New("must not run")}
-			}
-			edition.Override(hooks)
-			runnerCallTool = func(*transport.Client, context.Context, string, string, map[string]any) (transport.ToolCallResult, error) {
-				return transport.ToolCallResult{}, tc.err
-			}
-			refreshCalls := 0
-			runnerForceRefreshRejectedAccessToken = func(context.Context, string, string) (string, error) {
-				refreshCalls++
-				return "", nil
-			}
-
-			_, err := authRefreshTestRunner(nil).executeInvocation(context.Background(), "https://example.test", authRefreshTestInvocation())
-			if !errors.Is(err, tc.err) || hookCalls != 0 || refreshCalls != 0 {
-				t.Fatalf("error=%v hook=%d refresh=%d", err, hookCalls, refreshCalls)
-			}
-		})
-	}
-}
-
-func TestCrossPlatformCoverageRunnerDoesNotRefreshExplicitTokenMarker(t *testing.T) {
-	installAuthRefreshRunnerSeams(t)
-	rejection := errors.New("explicit token rejected")
-	edition.Override(&edition.Hooks{ClassifyToolResult: func(map[string]any) error {
-		return &authretry.AuthRefreshRequired{Cause: rejection}
-	}})
-	calls := 0
-	runnerCallTool = func(*transport.Client, context.Context, string, string, map[string]any) (transport.ToolCallResult, error) {
-		calls++
-		return transport.ToolCallResult{Content: map[string]any{"expired": true}}, nil
-	}
-	refreshCalls := 0
-	runnerForceRefreshRejectedAccessToken = func(context.Context, string, string) (string, error) {
-		refreshCalls++
-		return "", nil
-	}
-
-	_, err := authRefreshTestRunner(&GlobalFlags{Token: "explicit-token"}).executeInvocation(context.Background(), "https://example.test", authRefreshTestInvocation())
-	if !errors.Is(err, rejection) || calls != 1 || refreshCalls != 0 {
-		t.Fatalf("error=%v calls=%d refresh=%d", err, calls, refreshCalls)
-	}
-}
-
-func TestCrossPlatformCoverageRunnerRetriesPreflightEditionMarkerOnce(t *testing.T) {
-	installAuthRefreshRunnerSeams(t)
-	configDir := t.TempDir()
-	token := "old-access"
-	rejection := errors.New("preflight token rejected")
-	edition.Override(authRefreshTokenHooks(configDir, &token, nil))
-	preflightCalls := 0
-	runnerPreflightDocDownload = func(*runtimeRunner, context.Context, *transport.Client, string, executor.Invocation) error {
-		preflightCalls++
-		if preflightCalls == 1 {
-			return &authretry.AuthRefreshRequired{Cause: rejection}
-		}
-		return nil
-	}
-	toolCalls := 0
-	runnerCallTool = func(*transport.Client, context.Context, string, string, map[string]any) (transport.ToolCallResult, error) {
-		toolCalls++
-		return transport.ToolCallResult{Content: map[string]any{"value": "ok"}}, nil
-	}
-	refreshCalls := 0
-	runnerForceRefreshRejectedAccessToken = func(context.Context, string, string) (string, error) {
-		refreshCalls++
-		token = "new-access"
-		return token, nil
-	}
-
-	if _, err := authRefreshTestRunner(nil).executeInvocation(context.Background(), "https://example.test", authRefreshTestInvocation()); err != nil {
-		t.Fatal(err)
-	}
-	if preflightCalls != 2 || toolCalls != 1 || refreshCalls != 1 {
-		t.Fatalf("preflights=%d tools=%d refreshes=%d", preflightCalls, toolCalls, refreshCalls)
-	}
-}

internal/app/auth_registry.go

@@ -49,15 +49,6 @@ func RegisterPluginAuth(productID string, auth *PluginAuth) {
 	pluginAuthRegistry[productID] = auth
 }
 
-// ClearPluginAuth removes credentials for a plugin product. Registration uses
-// this before applying an accepted descriptor so a descriptor without custom
-// auth cannot inherit stale credentials from an earlier root construction.
-func ClearPluginAuth(productID string) {
-	pluginAuthMu.Lock()
-	defer pluginAuthMu.Unlock()
-	delete(pluginAuthRegistry, productID)
-}
-
 // LookupPluginAuth returns the authentication credentials registered
 // for the given product ID, or nil if none exists.
 func LookupPluginAuth(productID string) (*PluginAuth, bool) {

internal/app/blank_profile_selector_regression_test.go

@@ -1,144 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package app
-
-import (
-	"testing"
-
-	authpkg "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/auth"
-)
-
-func blankProfileSelectorAppFixture(blankName, corpName string) *authpkg.ProfilesConfig {
-	const (
-		corpID      = "corp_selector_fixture"
-		exactUserID = "identity_exact_fixture"
-	)
-	exactSelector := corpID + ":" + exactUserID
-	cfg := &authpkg.ProfilesConfig{
-		Version:         2,
-		PrimaryProfile:  exactSelector,
-		PreviousProfile: exactSelector,
-		OrgCurrentProfiles: map[string]string{
-			corpID: exactSelector,
-		},
-		Profiles: []authpkg.Profile{
-			{
-				Name:     "Exact Fixture Account",
-				CorpID:   corpID,
-				CorpName: corpName,
-				UserID:   exactUserID,
-				UserName: "Exact Fixture Account",
-				Status:   authpkg.ProfileStatusActive,
-			},
-			{
-				Name:     blankName,
-				CorpID:   corpID,
-				CorpName: corpName,
-				Status:   authpkg.ProfileStatusActive,
-			},
-		},
-	}
-	cfg.CurrentProfile = authpkg.ProfileSelectionSelector(cfg.Profiles[1], cfg)
-	return cfg
-}
-
-func captureProfileListSelectors(t *testing.T, cfg *authpkg.ProfilesConfig) ([]string, []profileView) {
-	t.Helper()
-	originalLoadToken := profileLoadTokenData
-	selectors := make([]string, 0, len(cfg.Profiles))
-	profileLoadTokenData = func(_ string, selector string) (*authpkg.TokenData, error) {
-		selectors = append(selectors, selector)
-		return nil, authpkg.ErrTokenDataNotFound
-	}
-	t.Cleanup(func() { profileLoadTokenData = originalLoadToken })
-	views := profileViews("unused-config-dir", cfg)
-	return selectors, views
-}
-
-func TestCrossPlatformCoverageBlankProfileNameMatchingCorpNameRoundTripsThroughListAndTUI(t *testing.T) {
-	cfg := blankProfileSelectorAppFixture("Fixture Organization", "Fixture Organization")
-	blank := cfg.Profiles[1]
-	blankSelector := authpkg.ProfileSelectionSelector(blank, cfg)
-
-	if blankSelector == blank.Name || blankSelector == blank.CorpID {
-		t.Fatalf("unsafe blank selector = %q, want reserved exact selector", blankSelector)
-	}
-	if got := profileCLISelector(blank, cfg); got != blankSelector {
-		t.Errorf("profileCLISelector(blank) = %q, want %q", got, blankSelector)
-	}
-	if got := profileSwitchProfileIndex(cfg.Profiles, cfg.CurrentProfile, cfg); got != 1 {
-		t.Errorf("profileSwitchProfileIndex(blank current) = %d, want 1", got)
-	}
-	model := newProfileSwitchTUIModel(cfg, cfg.CurrentProfile)
-	if model.selected != 1 {
-		t.Errorf("TUI selected index = %d, want blank profile index 1", model.selected)
-	}
-	if got := model.selectedCorpID(); got != blankSelector {
-		t.Errorf("TUI selected selector = %q, want %q", got, blankSelector)
-	}
-
-	selectors, views := captureProfileListSelectors(t, cfg)
-	if len(selectors) != 2 || selectors[0] != cfg.PreviousProfile || selectors[1] != blankSelector {
-		t.Errorf("profile list token selectors = %#v, want exact then %q", selectors, blankSelector)
-	}
-	if len(views) != 2 {
-		t.Fatalf("profile list views = %#v, want two entries", views)
-	}
-	if views[0].IsCurrent {
-		t.Error("exact account should not be marked current when blank local selector is current")
-	}
-	if views[1].Profile != blankSelector || !views[1].IsCurrent {
-		t.Errorf("blank list view = %#v, want local selector marked current", views[1])
-	}
-}
-
-func TestCrossPlatformCoverageBlankProfileNameContainingColonWinsOverIdentityParsingInListAndTUI(t *testing.T) {
-	cfg := blankProfileSelectorAppFixture("legacy:outsourced", "Fixture Organization")
-	blank := cfg.Profiles[1]
-	blankSelector := authpkg.ProfileSelectionSelector(blank, cfg)
-
-	if blankSelector == blank.Name {
-		t.Fatalf("colon-containing name leaked as selector %q", blankSelector)
-	}
-	if _, _, parsedAsIdentity := authpkg.ParseIdentitySelector(blankSelector); parsedAsIdentity {
-		t.Fatalf("stable blank selector %q was parsed as an identity", blankSelector)
-	}
-	if got := profileCLISelector(blank, cfg); got != blankSelector {
-		t.Errorf("profileCLISelector(colon blank) = %q, want %q", got, blankSelector)
-	}
-	if got := profileSwitchProfileIndex(cfg.Profiles, cfg.CurrentProfile, cfg); got != 1 {
-		t.Errorf("profileSwitchProfileIndex(colon blank current) = %d, want 1", got)
-	}
-	model := newProfileSwitchTUIModel(cfg, cfg.CurrentProfile)
-	if model.selected != 1 {
-		t.Errorf("TUI selected index = %d, want colon-name blank profile index 1", model.selected)
-	}
-	if got := model.selectedCorpID(); got != blankSelector {
-		t.Errorf("TUI selected selector = %q, want %q", got, blankSelector)
-	}
-
-	selectors, views := captureProfileListSelectors(t, cfg)
-	if len(selectors) != 2 || selectors[0] != cfg.PreviousProfile || selectors[1] != blankSelector {
-		t.Errorf("profile list token selectors = %#v, want exact then %q", selectors, blankSelector)
-	}
-	if len(views) != 2 {
-		t.Fatalf("profile list views = %#v, want two entries", views)
-	}
-	if views[0].IsCurrent {
-		t.Error("exact account should not be marked current when colon-name blank selector is current")
-	}
-	if views[1].Profile != blankSelector || !views[1].IsCurrent {
-		t.Errorf("colon-name blank list view = %#v, want local selector marked current", views[1])
-	}
-}

internal/app/coverage_edges_test.go

@@ -554,7 +554,7 @@ func TestCrossPlatformCoverageRecoveryRuntimeHTTP(t *testing.T) {
 	defer server.Close()
 	SetDynamicServers([]mcptypes.ServerDescriptor{{Endpoint: server.URL, CLI: mcptypes.CLIOverlay{ID: "devdoc", Tools: []mcptypes.CLITool{{Name: "search_open_platform_docs_rag"}}}}})
 	t.Cleanup(func() { SetDynamicServers(nil) })
-	runtime := &recoveryRuntime{transport: transport.NewClient(server.Client()), flags: &GlobalFlags{Token: "token"}}
+	runtime := &recoveryRuntime{transport: transport.NewClient(server.Client())}
 	got, err := runtime.Search(context.Background(), "query", recovery.RecoveryContext{ToolName: "search"})
 	if err != nil || got.DocSearch.Status != "success" || len(got.KBHits) == 0 {
 		t.Fatalf("recovery search = %#v %v", got, err)
@@ -1469,10 +1469,10 @@ func TestCrossPlatformCoveragePersonalEventPureCoverage(t *testing.T) {
 	if !ok {
 		t.Fatal("mention definition missing")
 	}
-	if err := renderPersonalSchema(io.Discard, def, "", false); err != nil {
+	if err := renderPersonalSchema(io.Discard, def, ""); err != nil {
 		t.Fatal(err)
 	}
-	if err := renderPersonalSchema(io.Discard, def, "yaml", true); err == nil {
+	if err := renderPersonalSchema(io.Discard, def, "yaml"); err == nil {
 		t.Fatal("unsupported schema format succeeded")
 	}
 	for _, key := range []string{"", "unknown", personal.EventMention, personal.EventFromUser} {
@@ -1650,8 +1650,6 @@ func TestCrossPlatformCoveragePersonalSubscriptionAndSourceCoverage(t *testing.T
 }
 
 func TestCrossPlatformCoveragePersonalEventCommandRuntimeCoverage(t *testing.T) {
-	authpkg.SetRuntimeProfile("")
-	t.Cleanup(func() { authpkg.SetRuntimeProfile("") })
 	configDir := setupPersonalIdentityToken(t, &authpkg.TokenData{
 		AccessToken: "access", RefreshToken: "refresh", ExpiresAt: time.Now().Add(time.Hour),
 		CorpID: "corp", UserID: "user", ClientID: "client",

internal/app/coverage_more_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -165,7 +164,7 @@ func TestCrossPlatformCoverageRawAPIAndTokenCoverage(t *testing.T) {
 	}
 	newAccessTokenProvider = func(string) accessTokenGetter { return fakeAccessTokenGetter{} }
 	missing := t.TempDir()
-	if got, err := resolveAccessTokenFromDir(context.Background(), missing); got != "" || !errors.Is(err, authpkg.ErrTokenDataNotFound) {
+	if got, err := resolveAccessTokenFromDir(context.Background(), missing); err != nil || got != "" {
 		t.Fatalf("missing access token = %q, %v", got, err)
 	}
 	if _, err := ResolveAuxiliaryAccessToken(context.Background(), missing, ""); err == nil {

internal/app/event_command.go

@@ -56,7 +56,6 @@ var (
 	eventNewEventSource        = newEventSource
 	eventNewDingtalkSource     = source.New
 	eventResolveAccessToken    = ResolveAuxiliaryAccessToken
-	eventForceRefreshRejected  = forceRefreshRejectedAccessToken
 	eventBusRun                = bus.Run
 	eventReadyFDFromEnv        = busctl.ReadyFDFromEnv
 	eventResolvePersonal       = resolvePersonalEventIdentity
@@ -112,7 +111,6 @@ func newEventConsumeCommand() *cobra.Command {
 		dryRun       bool
 		foreground   bool
 		asIdentity   string
-		flatten      bool
 		personalOpts personalConsumeOptions
 		streamOpts   eventStreamTicketOptions
 	)
@@ -128,11 +126,7 @@ func newEventConsumeCommand() *cobra.Command {
   json            每事件多行美化 JSON（必须配 --max-events 或 --duration）
   pretty          同 json，未来加颜色
   raw             仅 SDK 原始 payload，无外层封装
-  compact         单行紧凑 JSON；不传 --flatten 时沿用原 compact processor
-
-数据结构：
-  ndjson/json/pretty 默认保持 transport envelope（type/event_type/data/headers）
-  --flatten          结构化格式输出稳定的顶层业务字段，适合 Agent / 脚本直接消费
+  compact         扁平化 + 解析嵌套 + 抽取语义字段（Agent 友好）
 
 默认使用当前 OAuth 登录态自动创建/复用个人订阅并建立个人长连接；非默认组织加
 --profile。连上后 stderr 打就绪行 [event] ready，等它出现再读 stdout；停机用
@@ -149,7 +143,6 @@ SIGTERM、关 stdin，或先用 dws event stop <subscribe_id> --dry-run 预览
 			}
 			if as == "user" {
 				personalOpts.EventKey = firstArg(args)
-				personalOpts.Flatten = flatten
 				personalOpts.Common = commonConsumeOptions{
 					EventTypes: eventTypes,
 					Filter:     filter,
@@ -173,7 +166,6 @@ SIGTERM、关 stdin，或先用 dws event stop <subscribe_id> --dry-run 预览
 				return fmt.Errorf("event consume: --debug-raw-events is only supported with --as user")
 			}
 			if err := rejectChangedFlags(c, "user",
-				"flatten",
 				"subscribe-id",
 				"rule",
 				"name",
@@ -287,8 +279,6 @@ SIGTERM、关 stdin，或先用 dws event stop <subscribe_id> --dry-run 预览
 		"提示 bus 客户端期望 compact 渲染（语义透传，bus 仍按原 payload 投递）")
 	f.StringVarP(&formatRaw, "format", "f", "ndjson",
 		"输出格式 (ndjson/json/pretty/raw/compact)；事件流默认 ndjson")
-	f.BoolVar(&flatten, "flatten", false,
-		"将个人事件 transport envelope 投影为稳定的顶层业务字段")
 	f.StringVar(&outputDir, "output-dir", "",
 		"每事件写一个文件到该目录 ({type}_{id}_{ts}.json)；与 stdout 互斥")
 	f.StringArrayVar(&routesRaw, "route", nil,
@@ -423,7 +413,7 @@ func eventStreamBusID(streamOpts eventStreamTicketOptions) string {
 	return "portal-ticket-normal:" + sourceID
 }
 
-func newEventSource(_ context.Context, configDir, clientID, clientSecret string, streamOpts eventStreamTicketOptions) (*source.DingtalkSource, error) {
+func newEventSource(ctx context.Context, configDir, clientID, clientSecret string, streamOpts eventStreamTicketOptions) (*source.DingtalkSource, error) {
 	if !streamOpts.enabled() {
 		return eventNewDingtalkSource(source.Config{
 			ClientID:     clientID,
@@ -431,6 +421,14 @@ func newEventSource(_ context.Context, configDir, clientID, clientSecret string,
 		})
 	}
 
+	token, err := eventResolveAccessToken(ctx, configDir, "")
+	if err != nil {
+		return nil, fmt.Errorf("event stream ticket: resolve user token: %w", err)
+	}
+	if strings.TrimSpace(token) == "" {
+		return nil, errors.New("event stream ticket: empty user token")
+	}
+
 	portalClientID := clientID
 	portalClientSecret := clientSecret
 	if streamOpts.usesPortalNormalMode() {
@@ -442,13 +440,8 @@ func newEventSource(_ context.Context, configDir, clientID, clientSecret string,
 		ClientID:     portalClientID,
 		ClientSecret: portalClientSecret,
 		PortalTicket: &source.PortalTicketConfig{
-			TicketURL: eventStreamTicketURL(streamOpts.TicketURL),
-			AccessTokenProvider: func(ctx context.Context) (string, error) {
-				return eventResolveAccessToken(ctx, configDir, "")
-			},
-			ForceRefreshToken: func(ctx context.Context, rejectedToken string) (string, error) {
-				return eventForceRefreshRejected(ctx, configDir, rejectedToken)
-			},
+			TicketURL:    eventStreamTicketURL(streamOpts.TicketURL),
+			AccessToken:  token,
 			SourceID:     eventStreamSourceID(streamOpts.SourceID),
 			Mode:         streamOpts.Mode,
 			ClientID:     portalClientID,

internal/app/event_command_full_coverage_test.go

@@ -132,18 +132,14 @@ func TestCrossPlatformCoverageEventSourcesAndForegroundCoverage(t *testing.T) {
 	if _, err := newEventSource(context.Background(), "config", "client", "secret", eventStreamTicketOptions{}); err != nil {
 		t.Fatal(err)
 	}
-	stream := eventStreamTicketOptions{Mode: "custom"}
-	var captured source.Config
-	eventNewDingtalkSource = func(cfg source.Config, _ ...source.SourceOption) (*source.DingtalkSource, error) {
-		captured = cfg
-		return &source.DingtalkSource{}, nil
-	}
 	eventResolveAccessToken = func(context.Context, string, string) (string, error) { return "", fail }
-	if _, err := newEventSource(context.Background(), "config", "client", "secret", stream); err != nil {
-		t.Fatalf("stream source construction = %v", err)
+	stream := eventStreamTicketOptions{Mode: "custom"}
+	if _, err := newEventSource(context.Background(), "config", "client", "secret", stream); !errors.Is(err, fail) {
+		t.Fatalf("stream token error = %v", err)
 	}
-	if _, err := captured.PortalTicket.AccessTokenProvider(context.Background()); !errors.Is(err, fail) {
-		t.Fatalf("stream token provider error = %v", err)
+	eventResolveAccessToken = func(context.Context, string, string) (string, error) { return " ", nil }
+	if _, err := newEventSource(context.Background(), "config", "client", "secret", stream); err == nil {
+		t.Fatal("empty stream token succeeded")
 	}
 	eventResolveAccessToken = func(context.Context, string, string) (string, error) { return "token", nil }
 	for _, mode := range []string{"custom", "normal"} {

internal/app/event_force_refresh_wire_test.go

@@ -1,47 +0,0 @@
-package app
-
-import (
-	"context"
-	"errors"
-	"testing"
-
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/event/source"
-)
-
-// TestCrossPlatformCoverageNewEventSourceWiresForceRefreshRejectedToken asserts the portal ticket
-// source receives a ForceRefreshToken callback that forwards the actual
-// rejected token into the app-level compare-and-refresh chain.
-func TestCrossPlatformCoverageNewEventSourceWiresForceRefreshRejectedToken(t *testing.T) {
-	oldNew, oldRefresh := eventNewDingtalkSource, eventForceRefreshRejected
-	t.Cleanup(func() { eventNewDingtalkSource, eventForceRefreshRejected = oldNew, oldRefresh })
-
-	var captured source.Config
-	eventNewDingtalkSource = func(cfg source.Config, _ ...source.SourceOption) (*source.DingtalkSource, error) {
-		captured = cfg
-		return &source.DingtalkSource{}, nil
-	}
-	var gotDir, gotRejected string
-	eventForceRefreshRejected = func(_ context.Context, configDir, rejectedToken string) (string, error) {
-		gotDir, gotRejected = configDir, rejectedToken
-		return "fresh", nil
-	}
-	if _, err := newEventSource(context.Background(), "config-dir", "client", "secret", eventStreamTicketOptions{Mode: "custom"}); err != nil {
-		t.Fatal(err)
-	}
-	if captured.PortalTicket == nil || captured.PortalTicket.ForceRefreshToken == nil {
-		t.Fatal("ForceRefreshToken not wired into portal ticket config")
-	}
-	tok, err := captured.PortalTicket.ForceRefreshToken(context.Background(), "rejected-token")
-	if err != nil || tok != "fresh" {
-		t.Fatalf("force refresh = %q, %v", tok, err)
-	}
-	if gotDir != "config-dir" || gotRejected != "rejected-token" {
-		t.Fatalf("wiring passed dir %q rejected %q", gotDir, gotRejected)
-	}
-
-	fail := errors.New("refresh failed")
-	eventForceRefreshRejected = func(context.Context, string, string) (string, error) { return "", fail }
-	if _, err := captured.PortalTicket.ForceRefreshToken(context.Background(), "x"); !errors.Is(err, fail) {
-		t.Fatalf("refresh error = %v", err)
-	}
-}

internal/app/event_personal_command.go

@@ -61,7 +61,6 @@ type commonConsumeOptions struct {
 type personalConsumeOptions struct {
 	Common           commonConsumeOptions
 	EventKey         string
-	Flatten          bool
 	DebugRawEvents   bool
 	SubscribeID      string
 	Rule             string
@@ -132,7 +131,6 @@ var (
 	personalFindProcess                 = os.FindProcess
 	personalSignalProcess               = (*os.Process).Signal
 	personalResolveAuxiliaryAccessToken = ResolveAuxiliaryAccessToken
-	personalForceRefreshRejectedToken   = forceRefreshRejectedAccessToken
 	personalLoadTokenData               = authpkg.LoadTokenData
 	personalClientID                    = authpkg.ClientID
 	personalResolveAppCredentialsStrict = authpkg.ResolveAppCredentialsStrict
@@ -141,7 +139,6 @@ var (
 func newEventSchemaCommand() *cobra.Command {
 	var asIdentity string
 	var formatRaw string
-	var flatten bool
 	cmd := &cobra.Command{
 		Use:               "schema <event_key>",
 		Short:             "显示事件 schema",
@@ -159,12 +156,11 @@ func newEventSchemaCommand() *cobra.Command {
 			if !def.Public {
 				return personal.PublicAvailabilityError(args[0])
 			}
-			return renderPersonalSchema(c.OutOrStdout(), def, formatRaw, flatten)
+			return renderPersonalSchema(c.OutOrStdout(), def, formatRaw)
 		},
 	}
 	cmd.Flags().StringVar(&asIdentity, "as", "user", "事件身份: user")
 	cmd.Flags().StringVarP(&formatRaw, "format", "f", "json", "输出格式: json")
-	cmd.Flags().BoolVar(&flatten, "flatten", false, "显示 --flatten 消费模式对应的顶层业务字段 schema")
 	hideEventInternalFlags(cmd, "as")
 	cli.AnnotateRuntimePositionals(cmd, cli.RuntimeSchemaPositional{
 		Name:        "event_key",
@@ -192,7 +188,7 @@ func runPersonalEventList(c *cobra.Command, opts personalListOptions) error {
 	return tw.Flush()
 }
 
-func renderPersonalSchema(w io.Writer, def personal.Definition, format string, flatten bool) error {
+func renderPersonalSchema(w io.Writer, def personal.Definition, format string) error {
 	format = strings.ToLower(strings.TrimSpace(format))
 	if format == "" {
 		format = "json"
@@ -202,7 +198,7 @@ func renderPersonalSchema(w io.Writer, def personal.Definition, format string, f
 	}
 	enc := json.NewEncoder(w)
 	enc.SetIndent("", "  ")
-	return enc.Encode(personal.BuildSchemaDocumentForMode(def, flatten))
+	return enc.Encode(personal.BuildSchemaDocument(def))
 }
 
 func runPersonalEventConsume(c *cobra.Command, opts personalConsumeOptions) error {
@@ -210,19 +206,6 @@ func runPersonalEventConsume(c *cobra.Command, opts personalConsumeOptions) erro
 	if err := ensurePublicPersonalEvent(opts.EventKey); err != nil {
 		return err
 	}
-	rawFormat := ""
-	if f := c.Flags().Lookup("format"); f != nil && f.Changed {
-		rawFormat = opts.Common.FormatRaw
-	}
-	normalised, fellback := consume.NormalizeFormat(rawFormat)
-	if fellback && !opts.Common.Quiet {
-		fmt.Fprintf(c.ErrOrStderr(), "WARN: --format %q has no meaning for event stream; using ndjson\n", rawFormat)
-	}
-	if err := validatePersonalEventOutputMode(opts.Flatten, opts.DebugRawEvents, normalised); err != nil {
-		return fmt.Errorf("event consume --as user: %w", err)
-	}
-	projector := personalEventProjector(opts.DebugRawEvents, opts.Flatten)
-
 	configDir := defaultConfigDir()
 	identity, err := personalResolveEventIdentity(ctx, configDir, opts.StreamSourceID)
 	if err != nil {
@@ -232,12 +215,21 @@ func runPersonalEventConsume(c *cobra.Command, opts personalConsumeOptions) erro
 	editionName := editionNameOrDefault()
 	workDir := eventWorkDir(configDir, editionName, dwsevent.SourceKindPersonalStream, identityHash)
 	ipcEndpoint := defaultIPCEndpoint(workDir, editionName, dwsevent.SourceKindPersonalStream, identityHash)
-	spawnProfileSelector := personalBusProfileSelector(configDir, identity)
 
 	routes, err := consume.ParseRoutes(opts.Common.RoutesRaw)
 	if err != nil {
 		return fmt.Errorf("event consume --as user: %w", err)
 	}
+	rawFormat := ""
+	if f := c.Flags().Lookup("format"); f != nil && f.Changed {
+		rawFormat = opts.Common.FormatRaw
+	}
+	normalised, fellback := consume.NormalizeFormat(rawFormat)
+	if fellback && !opts.Common.Quiet {
+		fmt.Fprintf(c.ErrOrStderr(), "WARN: --format %q has no meaning for event stream; using ndjson\n", rawFormat)
+	}
+	projector := personalEventProjector(opts.DebugRawEvents)
+
 	if opts.Common.DryRun {
 		if strings.TrimSpace(opts.SubscribeID) == "" {
 			if err := validatePersonalSubscriptionOptions(opts); err != nil {
@@ -248,13 +240,12 @@ func runPersonalEventConsume(c *cobra.Command, opts personalConsumeOptions) erro
 			WorkDir:        workDir,
 			IPCEndpoint:    ipcEndpoint,
 			ClientID:       identity.ClientID,
-			SpawnExtraArgs: personalBusSpawnArgs(identity, opts.StreamTicketMode, personalEventStreamTicketURL(opts.StreamTicketURL, configDir), spawnProfileSelector),
+			SpawnExtraArgs: personalBusSpawnArgs(identity, opts.StreamTicketMode, personalEventStreamTicketURL(opts.StreamTicketURL, configDir)),
 			Compact:        opts.Common.Compact,
 			MaxEvents:      opts.Common.MaxEvents,
 			Duration:       opts.Common.Duration,
 			EventKey:       opts.EventKey,
 			Format:         normalised,
-			Flatten:        opts.Flatten,
 			OutputDir:      opts.Common.OutputDir,
 			Routes:         routes,
 			Projector:      projector,
@@ -268,7 +259,7 @@ func runPersonalEventConsume(c *cobra.Command, opts personalConsumeOptions) erro
 		return personalConsumeRun(ctx, cfg)
 	}
 
-	client := newPersonalEventControlClient(configDir, personalEventControlBaseURL(opts.ControlBaseURL, configDir), identity)
+	client := personal.NewClient(personalEventControlBaseURL(opts.ControlBaseURL, configDir), identity)
 	sub, eventKey, ruleType, err := personalEnsureSubscription(ctx, client, identity, opts)
 	if err != nil {
 		return fmt.Errorf("event consume --as user: %w", err)
@@ -305,13 +296,12 @@ func runPersonalEventConsume(c *cobra.Command, opts personalConsumeOptions) erro
 		WorkDir:          workDir,
 		IPCEndpoint:      ipcEndpoint,
 		ClientID:         identity.ClientID,
-		SpawnExtraArgs:   personalBusSpawnArgs(identity, opts.StreamTicketMode, opts.StreamTicketURL, spawnProfileSelector),
+		SpawnExtraArgs:   personalBusSpawnArgs(identity, opts.StreamTicketMode, opts.StreamTicketURL),
 		Compact:          opts.Common.Compact,
 		MaxEvents:        opts.Common.MaxEvents,
 		Duration:         opts.Common.Duration,
 		EventKey:         eventKey,
 		Format:           normalised,
-		Flatten:          opts.Flatten,
 		OutputDir:        opts.Common.OutputDir,
 		Routes:           routes,
 		Projector:        projector,
@@ -375,27 +365,11 @@ func runPersonalEventConsume(c *cobra.Command, opts personalConsumeOptions) erro
 	return err
 }
 
-func personalEventProjector(debugRawEvents, flatten bool) consume.Projector {
+func personalEventProjector(debugRawEvents bool) consume.Projector {
 	if debugRawEvents {
 		return func(ev transport.Event) (any, error) { return ev, nil }
 	}
-	if flatten {
-		return personal.ProjectOutput
-	}
-	return nil
-}
-
-func validatePersonalEventOutputMode(flatten, debugRawEvents bool, format consume.Format) error {
-	if !flatten {
-		return nil
-	}
-	if debugRawEvents {
-		return fmt.Errorf("--flatten and --debug-raw-events are mutually exclusive")
-	}
-	if format == consume.FormatRaw {
-		return fmt.Errorf("--flatten and --format raw are mutually exclusive")
-	}
-	return nil
+	return personal.ProjectOutput
 }
 
 func applyPersonalConsumeFilters(cfg *consume.Config, opts personalConsumeOptions, subscribeID, eventKey string) {
@@ -524,7 +498,7 @@ func runPersonalEventStatus(c *cobra.Command, opts personalStatusOptions) error
 	if status == "" || status == "all" {
 		status = ""
 	}
-	subs, err := personalListSubscriptions(newPersonalEventControlClient(configDir, personalEventControlBaseURL(opts.ControlBaseURL, configDir), identity), ctx, personal.ListOptions{
+	subs, err := personalListSubscriptions(personal.NewClient(personalEventControlBaseURL(opts.ControlBaseURL, configDir), identity), ctx, personal.ListOptions{
 		Status:      status,
 		EventKey:    opts.EventKey,
 		SubscribeID: opts.SubscribeID,
@@ -639,7 +613,7 @@ func runPersonalEventStop(c *cobra.Command, opts personalStopOptions) error {
 	if err != nil {
 		return fmt.Errorf("event stop --as user: %w", err)
 	}
-	client := newPersonalEventControlClient(configDir, personalEventControlBaseURL(opts.ControlBaseURL, configDir), identity)
+	client := personal.NewClient(personalEventControlBaseURL(opts.ControlBaseURL, configDir), identity)
 	for _, id := range subscribeIDs {
 		if err := personalDeleteSubscription(client, ctx, id); err != nil {
 			return fmt.Errorf("event stop --as user: cancel subscription %s: %w", id, err)
@@ -749,10 +723,7 @@ func resolvePersonalEventIdentity(ctx context.Context, configDir string, sourceI
 	if err != nil {
 		return personal.Identity{}, err
 	}
-	tokenData, err := personalLoadTokenData(configDir)
-	if err != nil && !errors.Is(err, authpkg.ErrTokenDataNotFound) {
-		return personal.Identity{}, fmt.Errorf("load OAuth identity metadata: %w", err)
-	}
+	tokenData, _ := personalLoadTokenData(configDir)
 	var corpID, userID, clientID, refreshToken string
 	if tokenData != nil {
 		corpID = tokenData.CorpID
@@ -798,15 +769,6 @@ func resolvePersonalEventIdentity(ctx context.Context, configDir string, sourceI
 	}, nil
 }
 
-func newPersonalEventControlClient(configDir, baseURL string, identity personal.Identity) *personal.Client {
-	identity.AccessToken = ""
-	client := personal.NewClient(baseURL, identity)
-	client.AccessTokenProvider = func(ctx context.Context) (string, error) {
-		return personalResolveAuxiliaryAccessToken(ctx, configDir, "")
-	}
-	return client
-}
-
 func personalTokenSubject(kind, token string) string {
 	token = strings.TrimSpace(token)
 	if token == "" {
@@ -855,12 +817,7 @@ func newPersonalStreamSource(ctx context.Context, opts personalStreamSourceOptio
 	}
 	_ = ctx
 	return source.NewPersonal(source.PersonalConfig{
-		AccessTokenProvider: func(ctx context.Context) (string, error) {
-			return personalResolveAuxiliaryAccessToken(ctx, opts.ConfigDir, "")
-		},
-		ForceRefreshToken: func(ctx context.Context, rejectedToken string) (string, error) {
-			return personalForceRefreshRejectedToken(ctx, opts.ConfigDir, rejectedToken)
-		},
+		AccessToken:  opts.Identity.AccessToken,
 		ClientID:     clientID,
 		ClientSecret: clientSecret,
 		SourceID:     opts.Identity.SourceID,
@@ -870,44 +827,7 @@ func newPersonalStreamSource(ctx context.Context, opts personalStreamSourceOptio
 	})
 }
 
-func personalBusProfileSelector(configDir string, identity personal.Identity) string {
-	// The parent already resolved and loaded this selector. Preserve it before
-	// consulting identity metadata: personal event discovery can fill an empty
-	// token userId from runtime defaults, and that inferred value must not turn a
-	// historical unresolved account into a different exact same-corp account in
-	// the detached child.
-	if selector := strings.TrimSpace(authpkg.RuntimeProfile()); selector != "" {
-		return selector
-	}
-	if cfg, err := authpkg.LoadProfiles(configDir); err == nil && cfg != nil {
-		// With no explicit process-local override, LoadTokenData selected the
-		// persisted current profile. Prefer that selection over the enriched
-		// identity: $currentUserId may describe an exact same-corp account even
-		// though the token came from the historical unresolved profile.
-		currentSelector := strings.TrimSpace(cfg.CurrentProfile)
-		for i := range cfg.Profiles {
-			profile := cfg.Profiles[i]
-			selector := authpkg.ProfileSelectionSelector(profile, cfg)
-			if selector == currentSelector &&
-				(strings.TrimSpace(identity.CorpID) == "" || strings.TrimSpace(profile.CorpID) == strings.TrimSpace(identity.CorpID)) {
-				return selector
-			}
-		}
-		for i := range cfg.Profiles {
-			profile := cfg.Profiles[i]
-			if strings.TrimSpace(profile.CorpID) == strings.TrimSpace(identity.CorpID) &&
-				strings.TrimSpace(profile.UserID) == strings.TrimSpace(identity.UserID) {
-				return authpkg.ProfileSelectionSelector(profile, cfg)
-			}
-		}
-	}
-	return authpkg.ProfileSelector(authpkg.Profile{
-		CorpID: identity.CorpID,
-		UserID: identity.UserID,
-	})
-}
-
-func personalBusSpawnArgs(identity personal.Identity, ticketMode, ticketURL string, profileSelectors ...string) []string {
+func personalBusSpawnArgs(identity personal.Identity, ticketMode, ticketURL string) []string {
 	args := []string{
 		"--source-kind", string(dwsevent.SourceKindPersonalStream),
 		"--stream-source-id", identity.SourceID,
@@ -916,11 +836,10 @@ func personalBusSpawnArgs(identity personal.Identity, ticketMode, ticketURL stri
 	// credentials as the parent, including when one organization has multiple
 	// logged-in users.
 	if cid := strings.TrimSpace(identity.CorpID); cid != "" {
-		profileSelector := authpkg.ProfileSelector(authpkg.Profile{CorpID: identity.CorpID, UserID: identity.UserID})
-		if len(profileSelectors) > 0 && strings.TrimSpace(profileSelectors[0]) != "" {
-			profileSelector = strings.TrimSpace(profileSelectors[0])
-		}
-		args = append(args, "--profile", profileSelector)
+		args = append(args, "--profile", authpkg.ProfileSelector(authpkg.Profile{
+			CorpID: identity.CorpID,
+			UserID: identity.UserID,
+		}))
 	}
 	if strings.TrimSpace(ticketMode) != "" {
 		args = append(args, "--stream-ticket-mode", ticketMode)

internal/app/event_personal_debug_test.go

@@ -20,7 +20,6 @@ import (
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/event/consume"
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/event/personal"
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/event/transport"
-	"github.com/spf13/cobra"
 )
 
 func TestApplyPersonalConsumeFiltersDebugRawEvents(t *testing.T) {
@@ -53,14 +52,11 @@ func TestApplyPersonalConsumeFiltersDefault(t *testing.T) {
 	}
 }
 
-func TestPersonalEventProjectorSelectsExplicitModes(t *testing.T) {
-	if personalEventProjector(false, false) != nil {
-		t.Fatal("default personal consume should preserve transport envelope")
+func TestPersonalEventProjectorUsesRawEnvelopeForDebug(t *testing.T) {
+	if personalEventProjector(false) == nil {
+		t.Fatal("normal personal consume projector = nil")
 	}
-	if personalEventProjector(false, true) == nil {
-		t.Fatal("flatten personal consume projector = nil")
-	}
-	projector := personalEventProjector(true, false)
+	projector := personalEventProjector(true)
 	if projector == nil {
 		t.Fatal("debug raw personal consume projector = nil")
 	}
@@ -78,69 +74,6 @@ func TestPersonalEventProjectorSelectsExplicitModes(t *testing.T) {
 	}
 }
 
-func TestEventConsumeFlattenRejectsRawModesBeforeIdentityResolution(t *testing.T) {
-	for _, tc := range []struct {
-		name string
-		args []string
-		want string
-	}{
-		{
-			name: "raw format",
-			args: []string{personal.EventMention, "--flatten", "--format", "raw"},
-			want: "--flatten and --format raw are mutually exclusive",
-		},
-		{
-			name: "raw debug",
-			args: []string{personal.EventMention, "--flatten", "--debug-raw-events"},
-			want: "--flatten and --debug-raw-events are mutually exclusive",
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			t.Setenv("DWS_CONFIG_DIR", t.TempDir())
-			cmd := newEventConsumeCommand()
-			cmd.SilenceUsage = true
-			cmd.SilenceErrors = true
-			cmd.SetArgs(tc.args)
-			err := cmd.Execute()
-			if err == nil || !strings.Contains(err.Error(), tc.want) {
-				t.Fatalf("Execute() error = %v, want %q", err, tc.want)
-			}
-			if strings.Contains(err.Error(), "login") || strings.Contains(err.Error(), "token") {
-				t.Fatalf("output-mode validation ran after identity resolution: %v", err)
-			}
-		})
-	}
-}
-
-func TestValidatePersonalEventOutputModeAllowsFlattenStructuredFormats(t *testing.T) {
-	for _, format := range []consume.Format{consume.FormatNDJSON, consume.FormatJSON, consume.FormatPretty, consume.FormatCompact} {
-		if err := validatePersonalEventOutputMode(true, false, format); err != nil {
-			t.Fatalf("validatePersonalEventOutputMode(true, false, %q) error = %v", format, err)
-		}
-	}
-}
-
-func TestEventConsumeFlattenFlagIsForwarded(t *testing.T) {
-	oldRun := eventRunPersonalConsume
-	t.Cleanup(func() { eventRunPersonalConsume = oldRun })
-
-	var got personalConsumeOptions
-	eventRunPersonalConsume = func(_ *cobra.Command, opts personalConsumeOptions) error {
-		got = opts
-		return nil
-	}
-	cmd := newEventConsumeCommand()
-	cmd.SilenceUsage = true
-	cmd.SilenceErrors = true
-	cmd.SetArgs([]string{personal.EventMention, "--flatten", "--format", "compact"})
-	if err := cmd.Execute(); err != nil {
-		t.Fatalf("Execute() error = %v", err)
-	}
-	if !got.Flatten || got.Common.FormatRaw != "compact" {
-		t.Fatalf("forwarded options = %#v", got)
-	}
-}
-
 func TestEventConsumeDebugRawEventsRequiresUserMode(t *testing.T) {
 	cmd := newEventConsumeCommand()
 	cmd.SilenceUsage = true

internal/app/event_personal_force_refresh_wire_test.go

@@ -1,54 +0,0 @@
-package app
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	dwsevent "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/event"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/event/personal"
-)
-
-// TestCrossPlatformCoverageNewPersonalStreamSourceWiresForceRefreshRejectedToken asserts the
-// personal stream source receives a ForceRefreshToken callback that forwards
-// the rejected token into the app-level compare-and-refresh chain.
-func TestCrossPlatformCoverageNewPersonalStreamSourceWiresForceRefreshRejectedToken(t *testing.T) {
-	oldAux := personalResolveAuxiliaryAccessToken
-	oldRefresh := personalForceRefreshRejectedToken
-	t.Cleanup(func() {
-		personalResolveAuxiliaryAccessToken = oldAux
-		personalForceRefreshRejectedToken = oldRefresh
-	})
-	personalResolveAuxiliaryAccessToken = func(context.Context, string, string) (string, error) {
-		return "old-token", nil
-	}
-	refreshErr := errors.New("refresh rejected")
-	var gotDir, gotRejected string
-	personalForceRefreshRejectedToken = func(_ context.Context, configDir, rejectedToken string) (string, error) {
-		gotDir, gotRejected = configDir, rejectedToken
-		return "", refreshErr
-	}
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		w.WriteHeader(http.StatusUnauthorized)
-	}))
-	defer srv.Close()
-
-	src, err := newPersonalStreamSource(context.Background(), personalStreamSourceOptions{
-		ConfigDir: "config-dir",
-		Identity:  personal.Identity{ClientID: "client", SourceID: "source"},
-		TicketURL: srv.URL,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	// The 401 ticket response routes the rejected token through the wired
-	// ForceRefreshToken; the unknown refresh failure stays fatal.
-	if err := src.Start(context.Background(), func(*dwsevent.RawEvent) {}); !errors.Is(err, refreshErr) {
-		t.Fatalf("Start() error = %v, want wrapped refresh error", err)
-	}
-	if gotDir != "config-dir" || gotRejected != "old-token" {
-		t.Fatalf("refresh wiring got dir %q rejected %q", gotDir, gotRejected)
-	}
-}

internal/app/event_personal_output_test.go

@@ -188,44 +188,7 @@ func TestPersonalEventSchemaHidesSchemaIDs(t *testing.T) {
 	}
 }
 
-func TestPersonalEventSchemaDefaultsToTransportEnvelope(t *testing.T) {
-	cmd := newEventSchemaCommand()
-	cmd.SilenceUsage = true
-	cmd.SilenceErrors = true
-	var out bytes.Buffer
-	cmd.SetOut(&out)
-	cmd.SetArgs([]string{personal.EventSingleChat})
-	if err := cmd.Execute(); err != nil {
-		t.Fatalf("Execute() error = %v", err)
-	}
-	var doc map[string]any
-	if err := json.Unmarshal(out.Bytes(), &doc); err != nil {
-		t.Fatalf("schema output is not JSON: %v\n%s", err, out.String())
-	}
-	if doc["jq_root_path"] != ".data | fromjson" {
-		t.Fatalf("jq_root_path = %#v, want .data | fromjson", doc["jq_root_path"])
-	}
-	schema, ok := doc["schema"].(map[string]any)
-	if !ok {
-		t.Fatalf("schema = %#v, want object", doc["schema"])
-	}
-	props, ok := schema["properties"].(map[string]any)
-	if !ok {
-		t.Fatalf("schema.properties = %#v, want object", schema["properties"])
-	}
-	for _, field := range []string{"type", "seq", "event_type", "data", "headers", "subscribe_id"} {
-		if _, ok := props[field]; !ok {
-			t.Fatalf("default envelope schema missing %q: %#v", field, props)
-		}
-	}
-	for _, field := range []string{"content", "sender", "conversation_id", "timestamp"} {
-		if _, ok := props[field]; ok {
-			t.Fatalf("default envelope schema unexpectedly contains flat field %q", field)
-		}
-	}
-}
-
-func TestPersonalEventFlattenedSchemaUsesSingleJSONSchema(t *testing.T) {
+func TestPersonalEventSchemaUsesSingleJSONSchema(t *testing.T) {
 	for _, eventKey := range []string{
 		personal.EventMention,
 		personal.EventSingleChat,
@@ -237,7 +200,7 @@ func TestPersonalEventFlattenedSchemaUsesSingleJSONSchema(t *testing.T) {
 			cmd.SilenceErrors = true
 			var out bytes.Buffer
 			cmd.SetOut(&out)
-			cmd.SetArgs([]string{eventKey, "--flatten"})
+			cmd.SetArgs([]string{eventKey})
 			if err := cmd.Execute(); err != nil {
 				t.Fatalf("Execute() error = %v", err)
 			}
@@ -353,7 +316,7 @@ func TestPersonalActionEventSchemaMatchesFlatOutput(t *testing.T) {
 				cmd.SilenceErrors = true
 				var out bytes.Buffer
 				cmd.SetOut(&out)
-				cmd.SetArgs([]string{eventKey, "--flatten"})
+				cmd.SetArgs([]string{eventKey})
 				if err := cmd.Execute(); err != nil {
 					t.Fatal(err)
 				}
@@ -404,9 +367,6 @@ func TestEventSchemaDefaultsToUser(t *testing.T) {
 	if doc["event_key"] != personal.EventSingleChat {
 		t.Fatalf("event_key = %#v, want %s", doc["event_key"], personal.EventSingleChat)
 	}
-	if doc["jq_root_path"] != ".data | fromjson" {
-		t.Fatalf("jq_root_path = %#v, want default envelope path", doc["jq_root_path"])
-	}
 }
 
 func TestPersonalEventFromUserIsPubliclyAvailable(t *testing.T) {
@@ -509,9 +469,6 @@ func TestEventConsumeCobraSchemaIncludesOpenDingTalkID(t *testing.T) {
 	if _, ok := params["odid"]; ok {
 		t.Fatalf("schema parameters unexpectedly include odid alias: %#v", params)
 	}
-	if _, ok := params["flatten"]; !ok {
-		t.Fatalf("schema parameters missing flatten: %#v", params)
-	}
 	for _, name := range []string{"user", "open-dingtalk-id", "group"} {
 		param, ok := params[name].(map[string]any)
 		if !ok {

internal/app/event_profile_selector_compat_test.go

@@ -1,121 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package app
-
-import (
-	"testing"
-
-	authpkg "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/auth"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/event/personal"
-)
-
-func TestPersonalBusProfileSelectorUsesDefaultBlankCurrentBeforeRuntimeEnrichedIdentity(t *testing.T) {
-	configDir, cfg, blankSelector, exactSelector := seedPersonalBusProfileSelectorConfig(t)
-	cfg.CurrentProfile = blankSelector
-	cfg.OrgCurrentProfiles = map[string]string{cfg.Profiles[0].CorpID: exactSelector}
-	if err := authpkg.SaveProfiles(configDir, cfg); err != nil {
-		t.Fatalf("SaveProfiles() error = %v", err)
-	}
-	authpkg.SetRuntimeProfile("")
-	t.Cleanup(func() { authpkg.SetRuntimeProfile("") })
-
-	identityAfterRuntimeEnrichment := personal.Identity{
-		CorpID: cfg.Profiles[0].CorpID,
-		UserID: cfg.Profiles[1].UserID,
-	}
-	if got := personalBusProfileSelector(configDir, identityAfterRuntimeEnrichment); got != blankSelector {
-		t.Fatalf("personalBusProfileSelector() = %q, want default blank selector %q", got, blankSelector)
-	}
-}
-
-func TestPersonalBusProfileSelectorUsesDefaultExactCurrent(t *testing.T) {
-	configDir, cfg, _, exactSelector := seedPersonalBusProfileSelectorConfig(t)
-	cfg.CurrentProfile = exactSelector
-	cfg.OrgCurrentProfiles = map[string]string{cfg.Profiles[0].CorpID: exactSelector}
-	if err := authpkg.SaveProfiles(configDir, cfg); err != nil {
-		t.Fatalf("SaveProfiles() error = %v", err)
-	}
-	authpkg.SetRuntimeProfile("")
-	t.Cleanup(func() { authpkg.SetRuntimeProfile("") })
-
-	identity := personal.Identity{CorpID: cfg.Profiles[1].CorpID, UserID: cfg.Profiles[1].UserID}
-	if got := personalBusProfileSelector(configDir, identity); got != exactSelector {
-		t.Fatalf("personalBusProfileSelector() = %q, want default exact selector %q", got, exactSelector)
-	}
-}
-
-func TestPersonalBusProfileSelectorPrefersExplicitRuntimeSelector(t *testing.T) {
-	configDir, cfg, blankSelector, _ := seedPersonalBusProfileSelectorConfig(t)
-	cfg.CurrentProfile = blankSelector
-	if err := authpkg.SaveProfiles(configDir, cfg); err != nil {
-		t.Fatalf("SaveProfiles() error = %v", err)
-	}
-
-	const explicitSelector = "corp_explicit:user_explicit"
-	authpkg.SetRuntimeProfile(explicitSelector)
-	t.Cleanup(func() { authpkg.SetRuntimeProfile("") })
-
-	identity := personal.Identity{CorpID: cfg.Profiles[1].CorpID, UserID: cfg.Profiles[1].UserID}
-	if got := personalBusProfileSelector(configDir, identity); got != explicitSelector {
-		t.Fatalf("personalBusProfileSelector() = %q, want explicit selector %q", got, explicitSelector)
-	}
-}
-
-func TestCrossPlatformCoveragePersonalBusProfileSelectorFallsBackToMatchingIdentity(t *testing.T) {
-	configDir, cfg, _, exactSelector := seedPersonalBusProfileSelectorConfig(t)
-	cfg.Profiles = append(cfg.Profiles, authpkg.Profile{
-		Name:     "Other Current",
-		CorpID:   "corp_event_other_fixture",
-		CorpName: "Other Fixture Organization",
-		UserID:   "identity_event_other_fixture",
-	})
-	cfg.CurrentProfile = authpkg.ProfileSelectionSelector(cfg.Profiles[2], cfg)
-	if err := authpkg.SaveProfiles(configDir, cfg); err != nil {
-		t.Fatalf("SaveProfiles() error = %v", err)
-	}
-	authpkg.SetRuntimeProfile("")
-	t.Cleanup(func() { authpkg.SetRuntimeProfile("") })
-
-	identity := personal.Identity{CorpID: cfg.Profiles[1].CorpID, UserID: cfg.Profiles[1].UserID}
-	if got := personalBusProfileSelector(configDir, identity); got != exactSelector {
-		t.Fatalf("personalBusProfileSelector() = %q, want identity fallback %q", got, exactSelector)
-	}
-}
-
-func seedPersonalBusProfileSelectorConfig(t *testing.T) (string, *authpkg.ProfilesConfig, string, string) {
-	t.Helper()
-	configDir := t.TempDir()
-	cfg := &authpkg.ProfilesConfig{
-		Version: 2,
-		Profiles: []authpkg.Profile{
-			{
-				Name:     "External Fixture",
-				CorpID:   "corp_event_current_fixture",
-				CorpName: "Fixture Organization",
-			},
-			{
-				Name:     "Exact Fixture",
-				CorpID:   "corp_event_current_fixture",
-				CorpName: "Fixture Organization",
-				UserID:   "identity_runtime_enriched_fixture",
-			},
-		},
-	}
-	blankSelector := authpkg.ProfileSelectionSelector(cfg.Profiles[0], cfg)
-	exactSelector := authpkg.ProfileSelectionSelector(cfg.Profiles[1], cfg)
-	if blankSelector == "" || blankSelector == cfg.Profiles[0].CorpID {
-		t.Fatalf("blank selector = %q, want stable account selector", blankSelector)
-	}
-	return configDir, cfg, blankSelector, exactSelector
-}

internal/app/event_registration_test.go

@@ -13,18 +13,14 @@ import (
 func TestEventCommandRemainsVisibleAsBuiltInPublicGroup(t *testing.T) {
 	root := &cobra.Command{Use: "dws"}
 	event := newEventCommand()
-	markdown := &cobra.Command{Use: "markdown"}
 	unregistered := &cobra.Command{Use: "unregistered", Run: func(*cobra.Command, []string) {}}
-	root.AddCommand(event, markdown, unregistered)
+	root.AddCommand(event, unregistered)
 
 	hideNonDirectRuntimeCommands(root)
 
 	if event.Hidden {
 		t.Fatal("built-in event command was hidden by the direct-runtime visibility filter")
 	}
-	if markdown.Hidden {
-		t.Fatal("locally routed markdown command was hidden by the direct-runtime visibility filter")
-	}
 	if !unregistered.Hidden {
 		t.Fatal("control command outside the built-in/direct-runtime sets remained visible")
 	}

internal/app/event_stdin_gate_test.go

@@ -17,9 +17,7 @@ import (
 	"testing"
 	"time"
 
-	authpkg "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/auth"
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/event/personal"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/keychain"
 )
 
 // A bounded run never arms the stdin-EOF watcher, regardless of stdin
@@ -65,100 +63,3 @@ func TestPersonalBusSpawnArgs_ForwardsProfile(t *testing.T) {
 		}
 	}
 }
-
-func TestCrossPlatformCoveragePersonalBusSpawnArgsPreservesReservedBlankProfile(t *testing.T) {
-	configDir := t.TempDir()
-	t.Setenv(keychain.DisableKeychainEnv, "1")
-	t.Setenv(keychain.StorageDirEnv, t.TempDir())
-	cfg := &authpkg.ProfilesConfig{
-		Version: 2,
-		OrgCurrentProfiles: map[string]string{
-			"corp_event_fixture": "corp_event_fixture:identity_exact_fixture",
-		},
-		Profiles: []authpkg.Profile{
-			{
-				Name:     "Fixture Organization",
-				CorpID:   "corp_event_fixture",
-				CorpName: "Fixture Organization",
-			},
-			{
-				Name:     "Exact Fixture Account",
-				CorpID:   "corp_event_fixture",
-				CorpName: "Fixture Organization",
-				UserID:   "identity_exact_fixture",
-			},
-		},
-	}
-	blankSelector := authpkg.ProfileSelectionSelector(cfg.Profiles[0], cfg)
-	cfg.PrimaryProfile = blankSelector
-	cfg.CurrentProfile = blankSelector
-	if err := authpkg.SaveProfiles(configDir, cfg); err != nil {
-		t.Fatalf("SaveProfiles() error = %v", err)
-	}
-	blankToken := &authpkg.TokenData{
-		AccessToken: "parent-blank-token",
-		CorpID:      "corp_event_fixture",
-		CorpName:    "Fixture Organization",
-	}
-	exactToken := &authpkg.TokenData{
-		AccessToken: "other-exact-token",
-		CorpID:      "corp_event_fixture",
-		CorpName:    "Fixture Organization",
-		UserID:      "identity_exact_fixture",
-	}
-	if err := authpkg.SaveTokenDataKeychainForCorpID(blankToken.CorpID, blankToken); err != nil {
-		t.Fatalf("save parent blank token: %v", err)
-	}
-	if err := authpkg.SaveTokenDataKeychainForIdentity(exactToken.CorpID, exactToken.UserID, exactToken); err != nil {
-		t.Fatalf("save other exact token: %v", err)
-	}
-
-	// Runtime identity enrichment points at the exact sibling, but the parent
-	// already loaded the persisted blank current profile.
-	identity := personal.Identity{
-		CorpID:   "corp_event_fixture",
-		UserID:   "identity_exact_fixture",
-		SourceID: "open",
-	}
-	selector := personalBusProfileSelector(configDir, identity)
-	want := blankSelector
-	if selector != want || selector == identity.CorpID {
-		t.Fatalf("personalBusProfileSelector(blank) = %q, want reserved %q", selector, want)
-	}
-	args := personalBusSpawnArgs(identity, "", "", selector)
-	forwardedSelector := ""
-	for i := 0; i+1 < len(args); i++ {
-		if args[i] == "--profile" && args[i+1] == want {
-			forwardedSelector = args[i+1]
-			break
-		}
-	}
-	if forwardedSelector == "" {
-		t.Fatalf("spawn args did not preserve reserved blank selector: %v", args)
-	}
-	parentToken, err := authpkg.LoadTokenDataForProfile(configDir, selector)
-	if err != nil {
-		t.Fatalf("load parent token: %v", err)
-	}
-	authpkg.SetRuntimeProfile(forwardedSelector)
-	t.Cleanup(func() { authpkg.SetRuntimeProfile("") })
-	childToken, err := authpkg.LoadTokenData(configDir)
-	if err != nil {
-		t.Fatalf("load detached child token: %v", err)
-	}
-	if parentToken.AccessToken != blankToken.AccessToken ||
-		childToken.AccessToken != parentToken.AccessToken ||
-		childToken.UserID != "" {
-		t.Fatalf("parent/child token drift: parent=%#v child=%#v", parentToken, childToken)
-	}
-
-	authpkg.SetRuntimeProfile(want)
-	inferredExact := personal.Identity{
-		CorpID:   "corp_event_fixture",
-		UserID:   "identity_exact_fixture",
-		SourceID: "open",
-	}
-	if got := personalBusProfileSelector(configDir, inferredExact); got != want {
-		t.Fatalf("runtime blank selector changed after inferred userId: got %q, want %q", got, want)
-	}
-}

internal/app/force_refresh.go

@@ -27,13 +27,9 @@ type accessTokenGetter interface {
 	GetAccessToken(context.Context) (string, error)
 }
 
-type rejectedAccessTokenRefresher interface {
-	ForceRefreshRejectedToken(context.Context, string) (string, error)
-}
-
 var (
-	loadRefreshTokenData = authpkg.LoadTokenData
-	newRefreshProvider   = func(configDir string) rejectedAccessTokenRefresher {
+	markAccessTokenStale = authpkg.MarkAccessTokenStale
+	newRefreshProvider   = func(configDir string) accessTokenGetter {
 		disc := slog.New(slog.NewTextHandler(io.Discard, nil))
 		provider := authpkg.NewOAuthProvider(configDir, disc)
 		configureOAuthProviderCompatibility(provider, configDir)
@@ -46,33 +42,26 @@ var (
 // server-side rejection (HTTP 401 or business code such as
 // TOKEN_VERIFIED_FAILED) on what locally appeared to be a still-valid token.
 //
-// It snapshots the current access token, then delegates to the OAuth
-// provider's dual-locked compare-and-refresh operation. If another caller has
-// already rotated the token, that newer token is reused without another
-// refresh request.
+// Steps:
+//  1. MarkAccessTokenStale rewrites ExpiresAt to a past instant so
+//     OAuthProvider.GetAccessToken's fast-path will miss.
+//  2. NewOAuthProvider + GetAccessToken triggers lockedRefresh, which uses the
+//     existing dual-layer lock (process + file) to serialize concurrent
+//     refresh attempts across goroutines and processes.
+//  3. ResetRuntimeTokenCache clears the per-process sync.Once cache so the
+//     next resolveAuthToken call re-reads from disk.
+//
+// Existing OAuthProvider.GetAccessToken behaviour is unchanged; this helper
+// is the only entry point that orchestrates "force refresh" semantics.
 func ForceRefreshAccessToken(ctx context.Context, configDir string) (string, error) {
 	if strings.TrimSpace(configDir) == "" {
 		return "", fmt.Errorf("config directory is empty")
 	}
-	data, err := loadRefreshTokenData(configDir)
-	if err != nil {
-		return "", err
-	}
-	if data == nil || strings.TrimSpace(data.AccessToken) == "" {
-		return "", fmt.Errorf("stored access token is empty")
-	}
-	return forceRefreshRejectedAccessToken(ctx, configDir, data.AccessToken)
-}
-
-func forceRefreshRejectedAccessToken(ctx context.Context, configDir, rejectedAccessToken string) (string, error) {
-	if strings.TrimSpace(configDir) == "" {
-		return "", fmt.Errorf("config directory is empty")
-	}
-	if strings.TrimSpace(rejectedAccessToken) == "" {
-		return "", fmt.Errorf("rejected access token is empty")
+	if err := markAccessTokenStale(configDir); err != nil {
+		return "", fmt.Errorf("mark access token stale: %w", err)
 	}
 	provider := newRefreshProvider(configDir)
-	tok, err := provider.ForceRefreshRejectedToken(ctx, rejectedAccessToken)
+	tok, err := provider.GetAccessToken(ctx)
 	if err != nil {
 		return "", err
 	}

internal/app/legacy.go

@@ -27,27 +27,21 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func newLegacyPublicCommands(runner executor.Runner, caller edition.ToolCaller, loadUserShortcuts bool) []*cobra.Command {
+func newLegacyPublicCommands(runner executor.Runner, caller edition.ToolCaller) []*cobra.Command {
 	injectStaticServers()
 	helpers.InitDeps(caller)
 	commands := helpers.NewPublicCommands(runner)
 	// Load user-defined shortcuts (~/.dws/shortcuts/*.yaml) BEFORE compiling the
 	// command tree, so distilled high-frequency operations mount alongside the
 	// built-ins. Conflicts with built-ins are skipped inside Load.
-	if loadUserShortcuts {
-		if _, err := userdef.Load(); err != nil {
-			slog.Warn("shortcut: failed to load user-defined shortcuts", "error", err)
-		}
+	if _, err := userdef.Load(); err != nil {
+		slog.Warn("shortcut: failed to load user-defined shortcuts", "error", err)
 	}
 	// Built-in + user shortcuts (`dws <service> +<command>`) share the same
 	// command tree; mergeTopLevelCommands folds each shortcut's service parent
 	// into the matching helper command so the `+leaf` sits alongside existing
 	// subcommands.
-	if loadUserShortcuts {
-		commands = append(commands, builtin.Commands()...)
-	} else {
-		commands = append(commands, builtin.BaseCommands()...)
-	}
+	commands = append(commands, builtin.Commands()...)
 	return mergeTopLevelCommands(commands)
 }
 

internal/app/mcp_url_command.go

@@ -1,108 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package app
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/cli"
-	apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/output"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/edition"
-	"github.com/spf13/cobra"
-)
-
-const (
-	mcpMetaServerID = "mcp-meta"
-	mcpMetaURLTool  = "get_mcp_server_url"
-)
-
-func newMCPURLGroup(caller edition.ToolCaller) *cobra.Command {
-	group := &cobra.Command{
-		Use:               "url",
-		Short:             "管理 MCP 服务连接地址",
-		Args:              cobra.NoArgs,
-		DisableAutoGenTag: true,
-		RunE: func(cmd *cobra.Command, _ []string) error {
-			return cmd.Help()
-		},
-	}
-	group.AddCommand(newMCPURLGetCommand(caller))
-	return group
-}
-
-func newMCPURLGetCommand(caller edition.ToolCaller) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "get <mcpId>",
-		Short: "按 mcpId 获取 MCP 的 Streamable HTTP 服务地址",
-		Long: "输入 MCP 市场 mcpId，返回以当前用户和组织身份访问该 MCP 的 " +
-			"Streamable HTTP 服务地址。\n\n" +
-			"安全提示：返回的 mcpURL 和 mcpJSON 可能包含身份凭据，仅限个人使用，" +
-			"请勿分享到群聊、文档、邮件、代码仓库或日志。",
-		Example: "  dws mcp url get 2480\n" +
-			"  dws mcp url get 2480 --format json",
-		Args:              cobra.ExactArgs(1),
-		DisableAutoGenTag: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if caller == nil {
-				return fmt.Errorf("MCP tool caller is not configured")
-			}
-			mcpID := strings.TrimSpace(args[0])
-			if mcpID == "" {
-				return fmt.Errorf("mcpId 不能为空")
-			}
-
-			result, err := caller.CallTool(cmd.Context(), mcpMetaServerID, mcpMetaURLTool, map[string]any{
-				"mcpId": mcpID,
-			})
-			if err != nil {
-				return fmt.Errorf("获取 MCP 服务地址: %w", err)
-			}
-			return writeMCPURLResult(cmd, result)
-		},
-	}
-	cli.AnnotateRuntimePositionals(cmd, cli.RuntimeSchemaPositional{
-		Name:        "mcp_id",
-		Type:        "string",
-		Description: "钉钉 MCP 市场中的 mcpId",
-		Required:    true,
-		Index:       0,
-	})
-	return cmd
-}
-
-func writeMCPURLResult(cmd *cobra.Command, result *edition.ToolResult) error {
-	if result == nil {
-		return fmt.Errorf("MCP 元服务返回空结果")
-	}
-	// get_mcp_server_url returns one JSON document in its first non-empty text
-	// block. Other block types and trailing blocks are intentionally ignored.
-	for _, block := range result.Content {
-		if block.Type != "text" || strings.TrimSpace(block.Text) == "" {
-			continue
-		}
-		if err := apperrors.ClassifyMCPResponseText(block.Text); err != nil {
-			return err
-		}
-
-		var payload any
-		if err := json.Unmarshal([]byte(block.Text), &payload); err != nil {
-			return fmt.Errorf("MCP 元服务返回了无效 JSON: %w", err)
-		}
-		return output.WriteCommandPayload(cmd, payload, output.FormatJSON)
-	}
-	return fmt.Errorf("MCP 元服务返回空结果")
-}

internal/app/mcp_url_command_test.go

@@ -1,194 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package app
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"strings"
-	"testing"
-
-	apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/edition"
-	"github.com/spf13/cobra"
-)
-
-type mcpURLTestCaller struct {
-	productID string
-	toolName  string
-	args      map[string]any
-	result    *edition.ToolResult
-	err       error
-}
-
-func (c *mcpURLTestCaller) CallTool(_ context.Context, productID, toolName string, args map[string]any) (*edition.ToolResult, error) {
-	c.productID = productID
-	c.toolName = toolName
-	c.args = args
-	return c.result, c.err
-}
-
-func (*mcpURLTestCaller) Format() string { return "json" }
-func (*mcpURLTestCaller) DryRun() bool   { return false }
-func (*mcpURLTestCaller) Fields() string { return "" }
-func (*mcpURLTestCaller) JQ() string     { return "" }
-
-func executeMCPURLCommand(t *testing.T, caller edition.ToolCaller, args ...string) (string, error) {
-	t.Helper()
-	root := &cobra.Command{Use: "mcp", SilenceErrors: true, SilenceUsage: true}
-	root.AddCommand(newMCPURLGroup(caller))
-	var out bytes.Buffer
-	root.SetOut(&out)
-	root.SetErr(&out)
-	root.SetArgs(args)
-	err := root.ExecuteContext(t.Context())
-	return out.String(), err
-}
-
-func TestMCPURLGetCallsMetaServerAndPreservesResponse(t *testing.T) {
-	const response = `{"result":{"mcpURL":"https://example.test/mcp?key=one&token=two","mcpJSON":{"transport":"streamable-http"},"name":"Example"}}`
-	caller := &mcpURLTestCaller{
-		result: &edition.ToolResult{Content: []edition.ContentBlock{{Type: "text", Text: response}}},
-	}
-
-	out, err := executeMCPURLCommand(t, caller, "url", "get", " 10043 ")
-	if err != nil {
-		t.Fatalf("execute mcp url get: %v", err)
-	}
-	if caller.productID != mcpMetaServerID {
-		t.Fatalf("productID = %q, want %q", caller.productID, mcpMetaServerID)
-	}
-	if caller.toolName != mcpMetaURLTool {
-		t.Fatalf("toolName = %q, want %q", caller.toolName, mcpMetaURLTool)
-	}
-	if got := caller.args["mcpId"]; got != "10043" {
-		t.Fatalf("mcpId = %#v, want %q", got, "10043")
-	}
-
-	var payload map[string]any
-	if err := json.Unmarshal([]byte(out), &payload); err != nil {
-		t.Fatalf("output is not JSON: %v\n%s", err, out)
-	}
-	result, ok := payload["result"].(map[string]any)
-	if !ok {
-		t.Fatalf("output result = %#v", payload["result"])
-	}
-	if got := result["mcpURL"]; got != "https://example.test/mcp?key=one&token=two" {
-		t.Fatalf("result.mcpURL = %#v", got)
-	}
-}
-
-func TestMCPURLGetRejectsBlankID(t *testing.T) {
-	_, err := executeMCPURLCommand(t, &mcpURLTestCaller{}, "url", "get", "   ")
-	if err == nil || !strings.Contains(err.Error(), "mcpId 不能为空") {
-		t.Fatalf("error = %v, want blank mcpId error", err)
-	}
-}
-
-func TestMCPURLGroupShowsHelp(t *testing.T) {
-	out, err := executeMCPURLCommand(t, nil, "url")
-	if err != nil {
-		t.Fatalf("execute mcp url: %v", err)
-	}
-	if !strings.Contains(out, "get") {
-		t.Fatalf("help output does not list get command:\n%s", out)
-	}
-}
-
-func TestMCPURLGetRejectsMissingCaller(t *testing.T) {
-	_, err := executeMCPURLCommand(t, nil, "url", "get", "10043")
-	if err == nil || !strings.Contains(err.Error(), "caller is not configured") {
-		t.Fatalf("error = %v, want missing caller error", err)
-	}
-}
-
-func TestMCPURLGetPropagatesCallError(t *testing.T) {
-	caller := &mcpURLTestCaller{err: errors.New("permission denied")}
-	_, err := executeMCPURLCommand(t, caller, "url", "get", "10043")
-	if err == nil || !strings.Contains(err.Error(), "permission denied") {
-		t.Fatalf("error = %v, want call error", err)
-	}
-}
-
-func TestMCPURLGetRejectsInvalidJSON(t *testing.T) {
-	caller := &mcpURLTestCaller{
-		result: &edition.ToolResult{Content: []edition.ContentBlock{{Type: "text", Text: "not-json"}}},
-	}
-	_, err := executeMCPURLCommand(t, caller, "url", "get", "10043")
-	if err == nil || !strings.Contains(err.Error(), "无效 JSON") {
-		t.Fatalf("error = %v, want invalid JSON error", err)
-	}
-}
-
-func TestMCPURLGetRejectsEmptyResults(t *testing.T) {
-	tests := []struct {
-		name   string
-		result *edition.ToolResult
-	}{
-		{name: "nil result"},
-		{
-			name: "no usable text content",
-			result: &edition.ToolResult{Content: []edition.ContentBlock{
-				{Type: "image", Text: "ignored"},
-				{Type: "text", Text: "   "},
-			}},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			caller := &mcpURLTestCaller{result: tt.result}
-			_, err := executeMCPURLCommand(t, caller, "url", "get", "10043")
-			if err == nil || !strings.Contains(err.Error(), "返回空结果") {
-				t.Fatalf("error = %v, want empty result error", err)
-			}
-		})
-	}
-}
-
-func TestMCPURLGetClassifiesBusinessError(t *testing.T) {
-	caller := &mcpURLTestCaller{
-		result: &edition.ToolResult{Content: []edition.ContentBlock{{
-			Type: "text",
-			Text: `{"success":false,"errorMsg":"搜索内容不能为空"}`,
-		}}},
-	}
-	_, err := executeMCPURLCommand(t, caller, "url", "get", "10043")
-	if err == nil {
-		t.Fatal("expected classified business error")
-	}
-	var typed *apperrors.Error
-	if !errors.As(err, &typed) || typed.Reason != "business_error" {
-		t.Fatalf("error = %#v, want classified business error", err)
-	}
-}
-
-func TestRootRegistersMCPURLGet(t *testing.T) {
-	root := NewRootCommand(t.Context())
-	mcp, _, err := root.Find([]string{"mcp"})
-	if err != nil {
-		t.Fatalf("find mcp: %v", err)
-	}
-	if mcp.Hidden {
-		t.Fatal("mcp command must be public when it contains reviewed public helpers")
-	}
-	cmd, _, err := root.Find([]string{"mcp", "url", "get"})
-	if err != nil {
-		t.Fatalf("find mcp url get: %v", err)
-	}
-	if got := cmd.CommandPath(); got != "dws mcp url get" {
-		t.Fatalf("command path = %q, want %q", got, "dws mcp url get")
-	}
-}

internal/app/multi_profile_runner_test.go

@@ -107,45 +107,6 @@ func TestRuntimeRunnerDeduplicatesByResolvedIdentityInSameCorp(t *testing.T) {
 	}
 }
 
-func TestCrossPlatformCoverageRuntimeRunnerDeduplicatesReservedAndOrganizationAliasesForBlankProfile(t *testing.T) {
-	exact := authLogoutTestToken("corp_blank_alias")
-	exact.UserID = "identity_exact_alias"
-	configDir := setupAuthLogoutProfiles(t, exact)
-	blank := authLogoutTestToken("corp_blank_alias")
-	blank.AccessToken = "access-unresolved-alias"
-	blank.RefreshToken = "refresh-unresolved-alias"
-	blank.UserID = ""
-	blank.UserName = ""
-	if err := authpkg.SaveTokenData(configDir, blank); err != nil {
-		t.Fatalf("SaveTokenData(blank) error = %v", err)
-	}
-	cfg, err := authpkg.LoadProfiles(configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles() error = %v", err)
-	}
-	var reserved string
-	for _, profile := range cfg.Profiles {
-		if profile.CorpID == blank.CorpID && profile.UserID == "" {
-			reserved = authpkg.ProfileSelectionSelector(profile, cfg)
-			break
-		}
-	}
-	if reserved == "" || reserved == blank.CorpID {
-		t.Fatalf("blank selector = %q, want reserved selector", reserved)
-	}
-
-	selections, multi, err := resolveMultiProfileSelections(configDir, reserved+","+blank.CorpID)
-	if err != nil {
-		t.Fatalf("resolveMultiProfileSelections() error = %v", err)
-	}
-	if !multi || len(selections) != 1 {
-		t.Fatalf("blank aliases = multi %v selections %#v, want one identity", multi, selections)
-	}
-	if selections[0].Selector != reserved || selections[0].Profile.UserID != "" {
-		t.Fatalf("blank selection = %#v, want first reserved alias preserved", selections[0])
-	}
-}
-
 func TestRuntimeRunnerKeepsSingleProfileBehavior(t *testing.T) {
 	setupAuthLogoutProfiles(t, authLogoutTestToken("corp_a"), authLogoutTestToken("corp_b"))
 	authpkg.SetRuntimeProfile("corp_a")

internal/app/pat_auth_retry.go

@@ -56,12 +56,12 @@ var openBrowserFunc = tryOpenBrowser
 var (
 	patAuthorizationTimeout       = PatAuthRetryTimeout
 	patAuthorizationPollInterval  = PatAuthPollInterval
-	patResolveAccessToken         = ResolveAuxiliaryAccessToken
+	patLoadTokenData              = authpkg.LoadTokenData
 	patWaitForAuthorization       = WaitForPatAuthorization
 	patPollDeviceFlowWithInterval = pollPatDeviceFlowWithInterval
 	patSaveAppConfig              = authpkg.SaveAppConfig
 	patExchangeCodeForToken       = authpkg.ExchangeCodeForToken
-	patSaveTokenData              = authpkg.SaveLoginTokenData
+	patSaveTokenData              = authpkg.SaveTokenData
 	patSleep                      = time.Sleep
 	patPollHTTPDo                 = (*http.Client).Do
 	patPollNewRequest             = http.NewRequestWithContext
@@ -272,7 +272,7 @@ func patAuthorizationURIFromData(data map[string]any) string {
 
 // WaitForPatAuthorization polls until the user completes authorization or timeout.
 // It returns true if authorization was completed, false if timed out or cancelled.
-func WaitForPatAuthorization(ctx context.Context, configDir string, output io.Writer) (bool, error) {
+func WaitForPatAuthorization(ctx context.Context, configDir string, output io.Writer) bool {
 	timeout := patAuthorizationTimeout
 	deadline := time.Now().Add(timeout)
 	pollTicker := time.NewTicker(patAuthorizationPollInterval)
@@ -290,26 +290,27 @@ func WaitForPatAuthorization(ctx context.Context, configDir string, output io.Wr
 		select {
 		case <-ctx.Done():
 			fmt.Fprintf(output, "%s 操作已取消\n", tui.StateMark("error"))
-			return false, ctx.Err()
+			return false
 
 		case <-time.After(time.Until(deadline)):
 			fmt.Fprintf(output, "%s 等待授权超时 (%s)\n", tui.StateMark("error"), timeout)
 			fmt.Fprintf(output, "  %s 请重新执行命令\n", tui.Dim("ℹ"))
-			return false, nil
+			return false
 
 		case <-pollTicker.C:
 			pollCount++
 			elapsed := time.Since(start).Truncate(time.Second)
 			remaining := time.Until(deadline).Truncate(time.Second)
 
-			// Check the same resolver used by every outbound bearer request.
-			if _, err := patResolveAccessToken(ctx, configDir, ""); err == nil {
-				fmt.Fprintf(output, "\r%s %s (%s 已用, %s 剩余)          \n",
-					tui.StateMark("ok"), tui.Bold("授权成功!"), elapsed, remaining)
-				fmt.Fprintln(output)
-				return true, nil
-			} else if !stderrors.Is(err, authpkg.ErrTokenDataNotFound) {
-				return false, fmt.Errorf("check authorization token: %w", err)
+			// Check if token is now valid
+			tokenData, err := patLoadTokenData(configDir)
+			if err == nil && tokenData != nil {
+				if tokenData.IsAccessTokenValid() || tokenData.IsRefreshTokenValid() {
+					fmt.Fprintf(output, "\r%s %s (%s 已用, %s 剩余)          \n",
+						tui.StateMark("ok"), tui.Bold("授权成功!"), elapsed, remaining)
+					fmt.Fprintln(output)
+					return true
+				}
 			}
 
 			// Show polling status
@@ -339,10 +340,7 @@ func retryWithPatAuthRetry(ctx context.Context, runner executor.Runner, invocati
 	PrintPatAuthError(output, scopeErr)
 
 	// Wait for user to complete authorization
-	authorized, waitErr := patWaitForAuthorization(ctx, configDir, output)
-	if waitErr != nil {
-		return executor.Result{}, waitErr
-	}
+	authorized := patWaitForAuthorization(ctx, configDir, output)
 	if !authorized {
 		return executor.Result{}, apperrors.NewAuth(
 			"等待用户授权超时",
@@ -796,6 +794,12 @@ func pollPatDeviceFlowWithInterval(ctx context.Context, flowID string, configDir
 	pollURL := fmt.Sprintf("%s%s?flowId=%s",
 		authpkg.GetMCPBaseURL(), authpkg.DevicePollPath, url.QueryEscape(flowID))
 
+	// Load user access token for the poll request header.
+	var accessToken string
+	if tokenData, err := authpkg.LoadTokenData(configDir); err == nil && tokenData != nil {
+		accessToken = tokenData.AccessToken
+	}
+
 	// Use a client that does NOT follow redirects, so we can detect SSO 302.
 	noRedirectClient := &http.Client{
 		CheckRedirect: func(req *http.Request, via []*http.Request) error {
@@ -824,10 +828,6 @@ func pollPatDeviceFlowWithInterval(ctx context.Context, flowID string, configDir
 				slog.Debug("PAT poll: failed to create request", "error", err)
 				continue
 			}
-			accessToken, tokenErr := patResolveAccessToken(ctx, configDir, "")
-			if tokenErr != nil && !stderrors.Is(tokenErr, authpkg.ErrTokenDataNotFound) {
-				return "", "", fmt.Errorf("resolve PAT poll access token: %w", tokenErr)
-			}
 			if accessToken != "" {
 				req.Header.Set("x-user-access-token", accessToken)
 			}

internal/app/pat_auth_retry_full_coverage_test.go

@@ -52,41 +52,39 @@ func TestCrossPlatformCoveragePATRetryRemainingPureAndWaitCoverage(t *testing.T)
 
 	oldTimeout := patAuthorizationTimeout
 	oldInterval := patAuthorizationPollInterval
-	oldResolve := patResolveAccessToken
+	oldLoad := patLoadTokenData
 	t.Cleanup(func() {
 		patAuthorizationTimeout = oldTimeout
 		patAuthorizationPollInterval = oldInterval
-		patResolveAccessToken = oldResolve
+		patLoadTokenData = oldLoad
 	})
 	patAuthorizationTimeout = 50 * time.Millisecond
 	patAuthorizationPollInterval = time.Millisecond
-	patResolveAccessToken = func(context.Context, string, string) (string, error) {
-		return "token", nil
+	patLoadTokenData = func(string) (*authpkg.TokenData, error) {
+		return &authpkg.TokenData{AccessToken: "token", ExpiresAt: time.Now().Add(time.Hour)}, nil
 	}
 	out.Reset()
-	if ok, err := WaitForPatAuthorization(context.Background(), "", &out); err != nil || !ok {
+	if !WaitForPatAuthorization(context.Background(), "", &out) {
 		t.Fatal("valid token did not authorize")
 	}
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel()
 	out.Reset()
-	if ok, err := WaitForPatAuthorization(ctx, "", &out); ok || !errors.Is(err, context.Canceled) {
-		t.Fatalf("cancelled authorization = %v, %v", ok, err)
+	if WaitForPatAuthorization(ctx, "", &out) {
+		t.Fatal("cancelled authorization succeeded")
 	}
 	patAuthorizationTimeout = time.Millisecond
 	patAuthorizationPollInterval = time.Hour
 	out.Reset()
-	if ok, err := WaitForPatAuthorization(context.Background(), "", &out); err != nil || ok {
-		t.Fatalf("timed out authorization = %v, %v", ok, err)
+	if WaitForPatAuthorization(context.Background(), "", &out) {
+		t.Fatal("timed out authorization succeeded")
 	}
 	patAuthorizationTimeout = 5 * time.Millisecond
 	patAuthorizationPollInterval = time.Millisecond
-	patResolveAccessToken = func(context.Context, string, string) (string, error) {
-		return "", authpkg.ErrTokenDataNotFound
-	}
+	patLoadTokenData = func(string) (*authpkg.TokenData, error) { return nil, nil }
 	out.Reset()
-	if ok, err := WaitForPatAuthorization(context.Background(), "", &out); err != nil || ok || !strings.Contains(out.String(), "等待授权中") {
-		t.Fatalf("invalid-token polling = %v, %v, output %q", ok, err, out.String())
+	if WaitForPatAuthorization(context.Background(), "", &out) || !strings.Contains(out.String(), "等待授权中") {
+		t.Fatalf("invalid-token polling output = %q", out.String())
 	}
 }
 
@@ -111,12 +109,12 @@ func TestCrossPlatformCoveragePATRetryRemainingOrchestrationCoverage(t *testing.
 	t.Setenv("DWS_CONFIG_DIR", t.TempDir())
 
 	scope := &PatScopeError{OriginalError: "missing", Identity: "user", ErrorType: "missing_scope", Message: "missing", Hint: "login", MissingScope: "calendar:read"}
-	patWaitForAuthorization = func(context.Context, string, io.Writer) (bool, error) { return false, nil }
+	patWaitForAuthorization = func(context.Context, string, io.Writer) bool { return false }
 	if _, err := retryWithPatAuthRetry(context.Background(), runnerCoverageFallback{}, executor.Invocation{}, scope, t.TempDir(), io.Discard); err == nil {
 		t.Fatal("PAT retry timeout succeeded")
 	}
 	wantErr := errors.New("runner failed")
-	patWaitForAuthorization = func(context.Context, string, io.Writer) (bool, error) { return true, nil }
+	patWaitForAuthorization = func(context.Context, string, io.Writer) bool { return true }
 	if _, err := retryWithPatAuthRetry(context.Background(), runnerCoverageFallback{err: wantErr}, executor.Invocation{}, scope, t.TempDir(), io.Discard); !errors.Is(err, wantErr) {
 		t.Fatalf("authorized retry = %v", err)
 	}
@@ -217,15 +215,15 @@ func patRaw(flowID, clientID, secret string) string {
 func TestCrossPlatformCoveragePATRetryRemainingPollAndBrowserCoverage(t *testing.T) {
 	oldDo := patPollHTTPDo
 	oldRequest := patPollNewRequest
-	oldResolve := patResolveAccessToken
+	oldLoad := patLoadTokenData
 	oldBrowser := patBrowserOpenCommand
 	t.Cleanup(func() {
 		patPollHTTPDo = oldDo
 		patPollNewRequest = oldRequest
-		patResolveAccessToken = oldResolve
+		patLoadTokenData = oldLoad
 		patBrowserOpenCommand = oldBrowser
 	})
-	patResolveAccessToken = func(context.Context, string, string) (string, error) { return "token", nil }
+	patLoadTokenData = func(string) (*authpkg.TokenData, error) { return &authpkg.TokenData{AccessToken: "token"}, nil }
 	cancelled, cancelNow := context.WithCancel(context.Background())
 	cancelNow()
 	if status, _, err := pollPatDeviceFlowWithInterval(cancelled, "flow", t.TempDir(), io.Discard, 0); err != nil || status != authpkg.StatusCancelled {

internal/app/plugin_commands_coverage_test.go

@@ -1,675 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-
-package app
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/cobracmd"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/executor"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/cmdutil"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/mcptypes"
-	"github.com/spf13/cobra"
-)
-
-type pluginFailRunner struct{}
-
-func (pluginFailRunner) Run(context.Context, executor.Invocation) (executor.Result, error) {
-	return executor.Result{}, errors.New("runner failed")
-}
-
-type pluginWrongFlagValue struct{}
-
-func (pluginWrongFlagValue) String() string   { return "" }
-func (pluginWrongFlagValue) Set(string) error { return nil }
-func (pluginWrongFlagValue) Type() string     { return "wrong" }
-
-func TestPluginCompilerRejectsInvalidDuplicateAndEmptyDefinitions(t *testing.T) {
-	invalidRoot := conferencePluginDescriptor()
-	invalidRoot.CLI.Command = "Invalid Root"
-	if commands := buildPluginCommands([]mcptypes.ServerDescriptor{invalidRoot}, executor.EchoRunner{}, nil); len(commands) != 0 {
-		t.Fatalf("invalid root produced commands %#v", commands)
-	}
-
-	descriptor := conferencePluginDescriptor()
-	descriptor.CLI.Groups = map[string]mcptypes.CLIGroupDef{
-		"empty": {Description: "removed when no leaf survives"},
-	}
-	descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-		"":        {CLIName: "blank-tool"},
-		"hidden":  {CLIName: "hidden", Hidden: true},
-		"invalid": {CLIName: "Invalid Leaf"},
-		"first":   {CLIName: "same"},
-		"second":  {CLIName: "same"},
-	}
-	commands := buildPluginCommands([]mcptypes.ServerDescriptor{descriptor}, executor.EchoRunner{}, nil)
-	if len(commands) != 1 {
-		t.Fatalf("commands = %#v", commands)
-	}
-	if requireOptionalPluginChild(commands[0], "same") == nil {
-		t.Fatal("valid leaf was not retained")
-	}
-	if requireOptionalPluginChild(commands[0], "empty") != nil {
-		t.Fatal("empty group was not pruned")
-	}
-
-	empty := conferencePluginDescriptor()
-	empty.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-		"hidden": {CLIName: "hidden", Hidden: true},
-	}
-	if commands := buildPluginCommands([]mcptypes.ServerDescriptor{empty}, executor.EchoRunner{}, nil); len(commands) != 0 {
-		t.Fatalf("empty overlay produced commands %#v", commands)
-	}
-}
-
-func TestPluginLeafExecutionErrorsAndBodyWrapper(t *testing.T) {
-	base := conferencePluginDescriptor()
-	base.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-		"wrapped": {
-			CLIName:     "wrapped",
-			BodyWrapper: "body",
-			Flags: map[string]mcptypes.CLIFlagOverride{
-				"value": {Required: true},
-			},
-		},
-	}
-	runner := &pluginCaptureRunner{}
-	root := pluginTestRoot(buildPluginCommands([]mcptypes.ServerDescriptor{base}, runner, nil)...)
-	root.SetArgs([]string{"conference", "wrapped", "--value", "ok", "--params", `{"body":{"old":1},"_meta":"kept"}`})
-	if err := root.Execute(); err != nil {
-		t.Fatalf("wrapped command: %v", err)
-	}
-	want := map[string]any{
-		"_meta": "kept",
-		"body":  map[string]any{"old": float64(1), "value": "ok"},
-	}
-	if !reflect.DeepEqual(runner.invocations[0].Params, want) {
-		t.Fatalf("wrapped params = %#v, want %#v", runner.invocations[0].Params, want)
-	}
-
-	for _, testCase := range []struct {
-		name   string
-		runner executor.Runner
-		args   []string
-	}{
-		{name: "invalid json", runner: executor.EchoRunner{}, args: []string{"conference", "wrapped", "--json", "["}},
-		{name: "missing required", runner: executor.EchoRunner{}, args: []string{"conference", "wrapped"}},
-		{name: "missing runner", runner: nil, args: []string{"conference", "wrapped", "--value", "ok"}},
-		{name: "runner error", runner: pluginFailRunner{}, args: []string{"conference", "wrapped", "--value", "ok"}},
-	} {
-		t.Run(testCase.name, func(t *testing.T) {
-			commandRoot := pluginTestRoot(buildPluginCommands([]mcptypes.ServerDescriptor{base}, testCase.runner, nil)...)
-			commandRoot.SetArgs(testCase.args)
-			if err := commandRoot.Execute(); err == nil {
-				t.Fatal("expected command error")
-			}
-		})
-	}
-
-	for _, flagName := range []string{"json", "params"} {
-		t.Run("unreadable "+flagName, func(t *testing.T) {
-			commands := buildPluginCommands([]mcptypes.ServerDescriptor{base}, executor.EchoRunner{}, nil)
-			leaf := requirePluginChild(t, commands[0], "wrapped")
-			leaf.Flags().Lookup(flagName).Value = pluginWrongFlagValue{}
-			commandRoot := pluginTestRoot(commands...)
-			commandRoot.SetArgs([]string{"conference", "wrapped", "--value", "ok"})
-			if err := commandRoot.Execute(); err == nil {
-				t.Fatal("expected unreadable flag error")
-			}
-		})
-	}
-}
-
-func TestPluginBindingCompilerCoversAliasesAndPositionalValidators(t *testing.T) {
-	reservations := pluginFlagReservations{
-		names:      map[string]bool{"reserved": true},
-		shorthands: map[string]bool{},
-	}
-	bindings, _, _, ok := registerPluginBindings("alias", mcptypes.CLIToolOverride{
-		Flags: map[string]mcptypes.CLIFlagOverride{
-			"value": {Alias: "value", Aliases: []string{"", "Bad", "value", "other"}},
-		},
-	}, reservations)
-	if !ok || !reflect.DeepEqual(bindings[0].names, []string{"value", "other"}) {
-		t.Fatalf("alias bindings = (%#v, %v)", bindings, ok)
-	}
-	if _, _, _, ok := registerPluginBindings("conflict", mcptypes.CLIToolOverride{
-		Flags: map[string]mcptypes.CLIFlagOverride{"value": {Alias: "reserved"}},
-	}, reservations); ok {
-		t.Fatal("reserved flag was accepted")
-	}
-	if _, _, _, ok := registerPluginBindings("negative", mcptypes.CLIToolOverride{
-		Flags: map[string]mcptypes.CLIFlagOverride{"value": {Positional: true, PositionalIndex: -1}},
-	}, reservations); ok {
-		t.Fatal("negative positional index was accepted")
-	}
-	if _, _, _, ok := registerPluginBindings("duplicate", mcptypes.CLIToolOverride{
-		Flags: map[string]mcptypes.CLIFlagOverride{
-			"first":  {Positional: true, PositionalIndex: 0},
-			"second": {Positional: true, PositionalIndex: 0},
-		},
-	}, reservations); ok {
-		t.Fatal("duplicate positional index was accepted")
-	}
-	if _, _, _, ok := registerPluginBindings("gap", mcptypes.CLIToolOverride{
-		Flags: map[string]mcptypes.CLIFlagOverride{
-			"second": {Positional: true, PositionalIndex: 1},
-		},
-	}, reservations); ok {
-		t.Fatal("non-contiguous positional indexes were accepted")
-	}
-
-	for _, testCase := range []struct {
-		name    string
-		flags   map[string]mcptypes.CLIFlagOverride
-		wantUse string
-		valid   []string
-		invalid []string
-	}{
-		{
-			name: "exact",
-			flags: map[string]mcptypes.CLIFlagOverride{
-				"second": {Positional: true, PositionalIndex: 1, Required: true},
-				"first":  {Positional: true, PositionalIndex: 0, Required: true},
-			},
-			wantUse: "exact [first] [second]", valid: []string{"a", "b"}, invalid: []string{"a"},
-		},
-		{
-			name: "range",
-			flags: map[string]mcptypes.CLIFlagOverride{
-				"first":  {Positional: true, PositionalIndex: 0, Required: true},
-				"second": {Positional: true, PositionalIndex: 1},
-			},
-			wantUse: "range [first] [second]", valid: []string{"a"}, invalid: []string{},
-		},
-		{
-			name: "maximum",
-			flags: map[string]mcptypes.CLIFlagOverride{
-				"first":  {Positional: true, PositionalIndex: 0},
-				"second": {Positional: true, PositionalIndex: 1},
-			},
-			wantUse: "maximum [first] [second]", valid: []string{}, invalid: []string{"a", "b", "c"},
-		},
-	} {
-		t.Run(testCase.name, func(t *testing.T) {
-			_, use, validator, ok := registerPluginBindings(testCase.name, mcptypes.CLIToolOverride{Flags: testCase.flags}, reservations)
-			if !ok || use != testCase.wantUse {
-				t.Fatalf("binding contract = (%q, %v)", use, ok)
-			}
-			cmd := &cobra.Command{Use: testCase.name}
-			if err := validator(cmd, testCase.valid); err != nil {
-				t.Fatalf("valid args: %v", err)
-			}
-			if err := validator(cmd, testCase.invalid); err == nil {
-				t.Fatal("invalid args were accepted")
-			}
-		})
-	}
-}
-
-func TestPluginFlagRegistrationAndReadingCoversAllKinds(t *testing.T) {
-	cmd := &cobra.Command{Use: "leaf"}
-	override := mcptypes.CLIToolOverride{Flags: map[string]mcptypes.CLIFlagOverride{
-		"integer": {Default: "2", Shorthand: "i", Hidden: true},
-		"float":   {Default: "1.5"},
-		"boolean": {Default: "true"},
-		"slice":   {Default: "one, ,two"},
-		"json":    {Default: `{"old":true}`},
-		"string":  {Default: "text"},
-	}}
-	bindings := []pluginFlagBinding{
-		{property: "integer", names: []string{"integer", "integer-alias"}, kind: pluginFlagInt},
-		{property: "float", names: []string{"float"}, kind: pluginFlagFloat},
-		{property: "boolean", names: []string{"boolean"}, kind: pluginFlagBool},
-		{property: "slice", names: []string{"slice"}, kind: pluginFlagStringSlice},
-		{property: "json", names: []string{"json-value"}, kind: pluginFlagJSON},
-		{property: "string", names: []string{"string"}, kind: pluginFlagString},
-	}
-	registerPluginFlags(cmd, bindings, override, pluginFlagReservations{shorthands: map[string]bool{}})
-	for name, raw := range map[string]string{
-		"integer": "3", "float": "2.5", "boolean": "false",
-		"slice": "three,four", "json-value": `{"ok":true}`, "string": "changed",
-	} {
-		if err := cmd.Flags().Set(name, raw); err != nil {
-			t.Fatalf("set --%s: %v", name, err)
-		}
-	}
-	wants := map[string]any{
-		"integer": 3,
-		"float":   2.5,
-		"boolean": false,
-		"slice":   []string{"three", "four"},
-		"json":    map[string]any{"ok": true},
-		"string":  "changed",
-	}
-	for _, binding := range bindings {
-		value, err := readPluginFlag(cmd.Flags(), binding.names[0], binding.kind)
-		if err != nil || !reflect.DeepEqual(value, wants[binding.property]) {
-			t.Fatalf("read %s = (%#v, %v), want %#v", binding.property, value, err, wants[binding.property])
-		}
-	}
-	if !cmd.Flags().Lookup("integer").Hidden || !cmd.Flags().Lookup("integer-alias").Hidden {
-		t.Fatal("hidden primary or alias flag was exposed")
-	}
-	if err := cmd.Flags().Set("json-value", "{"); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := readPluginFlag(cmd.Flags(), "json-value", pluginFlagJSON); err == nil {
-		t.Fatal("invalid JSON flag was accepted")
-	}
-	cmd.Flags().Lookup("json-value").Value = pluginWrongFlagValue{}
-	if _, err := readPluginFlag(cmd.Flags(), "json-value", pluginFlagJSON); err == nil {
-		t.Fatal("wrong JSON flag type was accepted")
-	}
-}
-
-func TestCollectPluginBindingsCoversEveryValueSourceAndFailure(t *testing.T) {
-	t.Run("sources", func(t *testing.T) {
-		cmd := &cobra.Command{Use: "leaf"}
-		registerPluginFlag(cmd.Flags(), "flag", "", "", pluginFlagString, "")
-		if err := cmd.Flags().Set("flag", "from-flag"); err != nil {
-			t.Fatal(err)
-		}
-		t.Setenv("PLUGIN_COVERAGE_ENV", "7")
-		params := map[string]any{"existing": "from-json"}
-		bindings := []pluginFlagBinding{
-			{property: "flag", names: []string{"flag"}, kind: pluginFlagString},
-			{property: "existing", kind: pluginFlagString},
-			{property: "positional", kind: pluginFlagBool, positional: true, positionalIndex: 0},
-			{property: "default", kind: pluginFlagFloat, defaultProvided: true, defaultValue: "1.5"},
-			{property: "env", kind: pluginFlagInt, envDefault: "PLUGIN_COVERAGE_ENV"},
-			{property: "optional", kind: pluginFlagString},
-		}
-		if err := collectPluginBindings(cmd, []string{"true"}, bindings, params); err != nil {
-			t.Fatal(err)
-		}
-		want := map[string]any{
-			"flag": "from-flag", "existing": "from-json", "positional": true,
-			"default": 1.5, "env": 7,
-		}
-		if !reflect.DeepEqual(params, want) {
-			t.Fatalf("params = %#v, want %#v", params, want)
-		}
-	})
-
-	for _, testCase := range []struct {
-		name    string
-		prepare func(t *testing.T, cmd *cobra.Command)
-		args    []string
-		binding pluginFlagBinding
-		params  map[string]any
-	}{
-		{
-			name: "wrong flag type",
-			prepare: func(t *testing.T, cmd *cobra.Command) {
-				cmd.Flags().String("value", "", "")
-				if err := cmd.Flags().Set("value", "x"); err != nil {
-					t.Fatal(err)
-				}
-			},
-			binding: pluginFlagBinding{property: "value", names: []string{"value"}, kind: pluginFlagInt},
-		},
-		{name: "invalid positional", args: []string{"maybe"}, binding: pluginFlagBinding{property: "value", kind: pluginFlagBool, positional: true, positionalIndex: 0}},
-		{name: "invalid default", binding: pluginFlagBinding{property: "value", kind: pluginFlagInt, defaultProvided: true, defaultValue: "bad"}},
-		{
-			name:    "invalid env",
-			prepare: func(t *testing.T, _ *cobra.Command) { t.Setenv("PLUGIN_COVERAGE_BAD_ENV", "bad") },
-			binding: pluginFlagBinding{property: "value", kind: pluginFlagInt, envDefault: "PLUGIN_COVERAGE_BAD_ENV"},
-		},
-		{name: "missing named required", binding: pluginFlagBinding{property: "value", names: []string{"value"}, required: true}},
-		{name: "missing positional required", binding: pluginFlagBinding{property: "value", required: true, positional: true, positionalIndex: 0}},
-		{name: "required omitted", binding: pluginFlagBinding{property: "value", required: true, defaultProvided: true, defaultValue: "", omitWhen: "empty"}},
-	} {
-		t.Run(testCase.name, func(t *testing.T) {
-			cmd := &cobra.Command{Use: "leaf"}
-			if testCase.prepare != nil {
-				testCase.prepare(t, cmd)
-			}
-			if err := collectPluginBindings(cmd, testCase.args, []pluginFlagBinding{testCase.binding}, testCase.params); err == nil {
-				t.Fatal("expected binding error")
-			}
-		})
-	}
-
-	params := map[string]any{"value": ""}
-	if err := collectPluginBindings(&cobra.Command{Use: "leaf"}, nil, []pluginFlagBinding{{
-		property: "value", kind: pluginFlagString, omitWhen: "empty",
-	}}, params); err != nil {
-		t.Fatal(err)
-	}
-	if _, exists := params["value"]; exists {
-		t.Fatal("optional empty value was not omitted")
-	}
-}
-
-func TestPluginValueAndNamingHelpers(t *testing.T) {
-	parseCases := []struct {
-		kind pluginFlagKind
-		raw  string
-		want any
-	}{
-		{pluginFlagInt, " 2 ", 2},
-		{pluginFlagFloat, " 2.5 ", 2.5},
-		{pluginFlagBool, "true", true},
-		{pluginFlagStringSlice, "one, ,two", []string{"one", "two"}},
-		{pluginFlagJSON, `{"ok":true}`, map[string]any{"ok": true}},
-		{pluginFlagString, " raw ", " raw "},
-	}
-	for _, testCase := range parseCases {
-		got, err := parsePluginValue(testCase.raw, testCase.kind)
-		if err != nil || !reflect.DeepEqual(got, testCase.want) {
-			t.Fatalf("parse %q = (%#v, %v), want %#v", testCase.raw, got, err, testCase.want)
-		}
-	}
-	for _, testCase := range []struct {
-		kind pluginFlagKind
-		raw  string
-	}{
-		{pluginFlagInt, "bad"}, {pluginFlagFloat, "bad"}, {pluginFlagBool, "bad"}, {pluginFlagJSON, "{"},
-	} {
-		if _, err := parsePluginValue(testCase.raw, testCase.kind); err == nil {
-			t.Fatalf("invalid %q was accepted", testCase.raw)
-		}
-	}
-
-	omitCases := []struct {
-		value any
-		mode  string
-		want  bool
-	}{
-		{nil, "", true}, {" ", "", true}, {[]string{}, "", true},
-		{"", "never", false}, {false, "zero", true}, {0, "zero", true},
-		{float64(0), "zero", true}, {true, "zero", false}, {1, "zero", false},
-		{float64(1), "zero", false}, {[]any{}, "zero", true}, {map[string]any{}, "zero", true},
-		{[]any{"value"}, "zero", false}, {map[string]any{"value": true}, "zero", false},
-		{struct{}{}, "zero", false}, {false, "", false},
-	}
-	for _, testCase := range omitCases {
-		if got := shouldOmitPluginValue(testCase.value, testCase.mode); got != testCase.want {
-			t.Fatalf("omit (%#v, %q) = %v, want %v", testCase.value, testCase.mode, got, testCase.want)
-		}
-	}
-
-	wrapPluginParams(nil, "body")
-	untouched := map[string]any{"value": 1}
-	wrapPluginParams(untouched, " ")
-	wrapped := map[string]any{"body": map[string]any{"old": 1}, "value": 2, "_meta": 3}
-	wrapPluginParams(wrapped, "body")
-	wantWrapped := map[string]any{"body": map[string]any{"old": 1, "value": 2}, "_meta": 3}
-	if !reflect.DeepEqual(wrapped, wantWrapped) {
-		t.Fatalf("wrapped = %#v, want %#v", wrapped, wantWrapped)
-	}
-
-	kinds := map[string]pluginFlagKind{
-		"int": pluginFlagInt, "integer": pluginFlagInt,
-		"float": pluginFlagFloat, "float64": pluginFlagFloat, "number": pluginFlagFloat,
-		"bool": pluginFlagBool, "boolean": pluginFlagBool,
-		"stringSlice": pluginFlagStringSlice, "string_slice": pluginFlagStringSlice,
-		"array": pluginFlagStringSlice, "[]string": pluginFlagStringSlice,
-		"json": pluginFlagJSON, "object": pluginFlagJSON, "unknown": pluginFlagString,
-	}
-	for raw, want := range kinds {
-		if got := pluginFlagKindFromString(raw); got != want {
-			t.Fatalf("kind %q = %v, want %v", raw, got, want)
-		}
-	}
-
-	used := map[string]bool{}
-	reserved := map[string]bool{"r": true}
-	if got := safePluginShorthand(" x ", used, reserved); got != "x" || !used["x"] {
-		t.Fatalf("safe shorthand = %q / %#v", got, used)
-	}
-	for _, raw := range []string{"", "xy", "x", "r"} {
-		if got := safePluginShorthand(raw, used, reserved); got != "" {
-			t.Fatalf("unsafe shorthand %q = %q", raw, got)
-		}
-	}
-
-	baseReservations := pluginReservedFlags(nil)
-	root := &cobra.Command{Use: "dws"}
-	root.PersistentFlags().StringP("custom", "c", "", "")
-	rootReservations := pluginReservedFlags(root)
-	if !baseReservations.names["yes"] || !rootReservations.names["custom"] || !rootReservations.shorthands["c"] {
-		t.Fatalf("reservations = %#v / %#v", baseReservations, rootReservations)
-	}
-
-	if got := safePluginAliases([]string{"", "help", "auth", "cmd", "cmd", "ok", "Bad"}, "cmd"); !reflect.DeepEqual(got, []string{"ok"}) {
-		t.Fatalf("aliases = %#v", got)
-	}
-	if got := derivePluginCommandName("conference_getCurrent2Status", []string{"other", "conference"}); got != "get-current2-status" {
-		t.Fatalf("derived name = %q", got)
-	}
-	if got := pluginKebabName(" HTTP2.Foo_bar baz@ "); got != "http2-foo-bar-baz@" {
-		t.Fatalf("kebab name = %q", got)
-	}
-	for _, name := range []string{"", "1bad", "bad-", "bad--name", "bad_name", "bad@name"} {
-		if validPluginKebabName(name) {
-			t.Fatalf("invalid kebab name %q was accepted", name)
-		}
-	}
-	if !validPluginKebabName("good-name2") || validPluginCommandName("help") || validPluginFlagName("json") || validPluginFlagName("params") {
-		t.Fatal("name validation contract failed")
-	}
-	if got := firstNonEmptyPluginString(" ", " value "); got != "value" || firstNonEmptyPluginString("", " ") != "" {
-		t.Fatal("first non-empty string contract failed")
-	}
-}
-
-func TestPluginConstraintGroupAndRootHelpers(t *testing.T) {
-	cmd := &cobra.Command{Use: "leaf"}
-	for _, name := range []string{"a", "b", "c"} {
-		cmd.Flags().String(name, "", "")
-	}
-	applyPluginFlagConstraints(cmd, mcptypes.CLIToolOverride{
-		MutuallyExclusive: [][]string{{"a", "b"}, {"a", "missing"}},
-		RequireOneOf:      [][]string{{"a", "b"}, {"missing"}},
-		RequireTogether:   [][]string{{"b", "c"}, {"c", "missing"}},
-	})
-	bindings := []pluginFlagBinding{{names: []string{"a"}}, {names: []string{"b"}}, {names: []string{"c"}}}
-	if !validPluginFlagConstraints(bindings, mcptypes.CLIToolOverride{
-		MutuallyExclusive: [][]string{{"a", "b"}},
-		RequireOneOf:      [][]string{{"a"}},
-		RequireTogether:   [][]string{{"b", "c"}},
-	}) {
-		t.Fatal("valid plugin constraints were rejected")
-	}
-	for _, invalid := range []mcptypes.CLIToolOverride{
-		{MutuallyExclusive: [][]string{{"a"}}},
-		{RequireOneOf: [][]string{{"missing"}}},
-		{RequireTogether: [][]string{{"a", "a"}}},
-	} {
-		if validPluginFlagConstraints(bindings, invalid) {
-			t.Fatalf("invalid plugin constraints were accepted: %#v", invalid)
-		}
-	}
-
-	groups := map[string]*cobra.Command{}
-	root := &cobra.Command{Use: "root"}
-	group := ensurePluginGroup(root, "parent.child", "child description", groups)
-	if group.Name() != "child" || group.Short != "child description" || !cmdutil.IsPluginSourced(group) {
-		t.Fatalf("group = %#v", group)
-	}
-	if again := ensurePluginGroup(root, "parent.child", "ignored", groups); again != group {
-		t.Fatal("existing group was not reused")
-	}
-	for _, invalid := range []string{"safe.bad_name", "_bad", ".parent", "parent."} {
-		if got := ensurePluginGroup(root, invalid, "invalid", groups); got != nil {
-			t.Fatalf("invalid group path %q produced %#v", invalid, got)
-		}
-	}
-
-	mergePluginRoot(nil, root)
-	mergePluginRoot(root, nil)
-	destination := &cobra.Command{Use: "plugin", Aliases: []string{"one"}}
-	source := &cobra.Command{Use: "plugin", Aliases: []string{"one", "two"}}
-	source.AddCommand(&cobra.Command{Use: "leaf"})
-	mergePluginRoot(destination, source)
-	if !reflect.DeepEqual(destination.Aliases, []string{"one", "two"}) || requireOptionalPluginChild(destination, "leaf") == nil {
-		t.Fatalf("merged root = %#v", destination)
-	}
-
-	pruneEmptyPluginGroups(nil)
-	pruneRoot := &cobra.Command{Use: "root"}
-	empty := cobracmd.NewGroupCommand("empty", "empty")
-	nonEmpty := cobracmd.NewGroupCommand("non-empty", "non-empty")
-	nonEmpty.AddCommand(&cobra.Command{Use: "leaf"})
-	pruneRoot.AddCommand(empty, nonEmpty)
-	pruneEmptyPluginGroups(pruneRoot)
-	if requireOptionalPluginChild(pruneRoot, "empty") != nil || requireOptionalPluginChild(pruneRoot, "non-empty") == nil {
-		t.Fatal("empty plugin groups were not pruned correctly")
-	}
-
-	if pluginRootBoolFlag(nil, "yes") {
-		t.Fatal("nil command reported a root flag")
-	}
-	noFlag := &cobra.Command{Use: "root"}
-	if pluginRootBoolFlag(noFlag, "yes") {
-		t.Fatal("missing flag reported true")
-	}
-	wrongType := &cobra.Command{Use: "root"}
-	wrongType.PersistentFlags().String("yes", "true", "")
-	if pluginRootBoolFlag(wrongType, "yes") {
-		t.Fatal("wrong flag type reported true")
-	}
-	boolRoot := &cobra.Command{Use: "root"}
-	boolRoot.PersistentFlags().Bool("yes", false, "")
-	if err := boolRoot.PersistentFlags().Set("yes", "true"); err != nil {
-		t.Fatal(err)
-	}
-	if !pluginRootBoolFlag(boolRoot, "yes") {
-		t.Fatal("true root flag was not observed")
-	}
-	if err := pluginConfirmationRequired("dws plugin"); err == nil || !strings.Contains(err.Error(), "sensitive") {
-		t.Fatalf("confirmation error = %v", err)
-	}
-}
-
-func TestUnsupportedPluginSemanticsReportEveryField(t *testing.T) {
-	overlays := []struct {
-		value mcptypes.CLIOverlay
-		want  string
-	}{
-		{mcptypes.CLIOverlay{Parent: "root"}, "parent"},
-		{mcptypes.CLIOverlay{Group: "group"}, "group"},
-		{mcptypes.CLIOverlay{ServerDeps: []string{"other"}}, "serverDeps"},
-		{mcptypes.CLIOverlay{Hints: map[string]json.RawMessage{"x": json.RawMessage(`{}`)}}, "hintCommands"},
-		{mcptypes.CLIOverlay{RedirectTo: "other"}, "redirectTo"},
-		{mcptypes.CLIOverlay{}, ""},
-	}
-	for _, testCase := range overlays {
-		if got := unsupportedPluginOverlay(testCase.value); got != testCase.want {
-			t.Fatalf("unsupported overlay = %q, want %q", got, testCase.want)
-		}
-	}
-
-	tools := []struct {
-		value mcptypes.CLIToolOverride
-		want  string
-	}{
-		{mcptypes.CLIToolOverride{CLIAliases: []string{"x"}}, "cliAliases"},
-		{mcptypes.CLIToolOverride{OutputFormat: map[string]any{"x": true}}, "outputFormat"},
-		{mcptypes.CLIToolOverride{ServerOverride: "other"}, "serverOverride"},
-		{mcptypes.CLIToolOverride{RedirectTo: "x"}, "redirectTo"},
-		{mcptypes.CLIToolOverride{Pipeline: []json.RawMessage{json.RawMessage(`{}`)}}, "pipeline"},
-		{mcptypes.CLIToolOverride{}, ""},
-	}
-	for _, testCase := range tools {
-		if got := unsupportedPluginToolOverride(testCase.value); got != testCase.want {
-			t.Fatalf("unsupported tool = %q, want %q", got, testCase.want)
-		}
-	}
-
-	flags := []struct {
-		value mcptypes.CLIFlagOverride
-		want  string
-	}{
-		{mcptypes.CLIFlagOverride{MapsTo: "x"}, "mapsTo"},
-		{mcptypes.CLIFlagOverride{Transform: "x"}, "transform"},
-		{mcptypes.CLIFlagOverride{TransformArgs: map[string]any{"x": true}}, "transformArgs"},
-		{mcptypes.CLIFlagOverride{RuntimeDefault: "x"}, "runtimeDefault"},
-		{mcptypes.CLIFlagOverride{PipelineLocal: true}, "pipelineLocal"},
-		{mcptypes.CLIFlagOverride{Type: "mystery"}, "type"},
-		{mcptypes.CLIFlagOverride{OmitWhen: "sometimes"}, "omitWhen"},
-		{mcptypes.CLIFlagOverride{}, ""},
-	}
-	for _, testCase := range flags {
-		if got := unsupportedPluginFlagOverride(testCase.value); got != testCase.want {
-			t.Fatalf("unsupported flag = %q, want %q", got, testCase.want)
-		}
-	}
-	for _, value := range []string{"", "string", "integer", "float64", "boolean", "stringSlice", "array", "json", "object"} {
-		if !supportedPluginFlagType(value) {
-			t.Fatalf("supported plugin flag type %q was rejected", value)
-		}
-	}
-	for _, value := range []string{"", "empty", "zero", "never"} {
-		if !supportedPluginOmitMode(value) {
-			t.Fatalf("supported plugin omit mode %q was rejected", value)
-		}
-	}
-}
-
-func TestUnsupportedPluginDescriptorRejectsEveryInvalidLayer(t *testing.T) {
-	testCases := []struct {
-		name   string
-		mutate func(*mcptypes.ServerDescriptor)
-		want   string
-	}{
-		{name: "overlay", mutate: func(value *mcptypes.ServerDescriptor) { value.CLI.Parent = "root" }, want: "parent"},
-		{name: "no tools", mutate: func(value *mcptypes.ServerDescriptor) { value.CLI.ToolOverrides = nil }, want: ""},
-		{name: "root", mutate: func(value *mcptypes.ServerDescriptor) { value.CLI.Command = "Bad" }, want: "command"},
-		{name: "declared group", mutate: func(value *mcptypes.ServerDescriptor) {
-			value.CLI.Groups = map[string]mcptypes.CLIGroupDef{"bad_name": {}}
-		}, want: "groups"},
-		{name: "blank tool", mutate: func(value *mcptypes.ServerDescriptor) {
-			value.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{"": {}}
-		}, want: "tool"},
-		{name: "tool semantics", mutate: func(value *mcptypes.ServerDescriptor) {
-			value.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{"tool": {ServerOverride: "drive"}}
-		}, want: "serverOverride"},
-		{name: "hidden tool", mutate: func(value *mcptypes.ServerDescriptor) {
-			value.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{"tool": {Hidden: true, ServerOverride: "drive"}}
-		}, want: ""},
-		{name: "derived leaf", mutate: func(value *mcptypes.ServerDescriptor) {
-			value.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{"conference_derived_tool": {}}
-		}, want: ""},
-		{name: "leaf", mutate: func(value *mcptypes.ServerDescriptor) {
-			value.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{"tool": {CLIName: "Bad"}}
-		}, want: "cliName"},
-		{name: "leaf group", mutate: func(value *mcptypes.ServerDescriptor) {
-			value.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{"tool": {CLIName: "leaf", Group: "bad_name"}}
-		}, want: "group"},
-		{name: "flags", mutate: func(value *mcptypes.ServerDescriptor) {
-			value.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{"tool": {
-				CLIName: "leaf",
-				Flags:   map[string]mcptypes.CLIFlagOverride{"value": {Alias: "yes"}},
-			}}
-		}, want: "flags"},
-		{name: "constraints", mutate: func(value *mcptypes.ServerDescriptor) {
-			value.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{"tool": {
-				CLIName:         "leaf",
-				Flags:           map[string]mcptypes.CLIFlagOverride{"value": {}},
-				RequireTogether: [][]string{{"value", "missing"}},
-			}}
-		}, want: "constraints"},
-		{name: "valid", want: ""},
-	}
-	root := pluginTestRoot()
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			descriptor := conferencePluginDescriptor()
-			if testCase.mutate != nil {
-				testCase.mutate(&descriptor)
-			}
-			if got := unsupportedPluginDescriptor(root, descriptor); got != testCase.want {
-				t.Fatalf("unsupported descriptor = %q, want %q", got, testCase.want)
-			}
-		})
-	}
-}

internal/app/plugin_commands_test.go

@@ -1,809 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package app
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"sync/atomic"
-	"testing"
-
-	apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/executor"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/pipeline"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/cmdutil"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/mcptypes"
-	"github.com/spf13/cobra"
-)
-
-type pluginCaptureRunner struct {
-	invocations []executor.Invocation
-}
-
-func (r *pluginCaptureRunner) Run(_ context.Context, invocation executor.Invocation) (executor.Result, error) {
-	r.invocations = append(r.invocations, invocation)
-	return executor.Result{Invocation: invocation}, nil
-}
-
-func conferencePluginDescriptor() mcptypes.ServerDescriptor {
-	return mcptypes.ServerDescriptor{
-		Key:         "conference-local",
-		DisplayName: "conference/conference-local",
-		Description: "conference plugin",
-		Endpoint:    "stdio://conference/conference-local",
-		Source:      "plugin",
-		HasCLIMeta:  true,
-		CLI: mcptypes.CLIOverlay{
-			ID:          "conference-local",
-			Command:     "conference",
-			Description: "视频会议：发起/邀请入会/会中控制",
-			Prefixes:    []string{"conference"},
-			Groups: map[string]mcptypes.CLIGroupDef{
-				"camera": {Description: "摄像头控制"},
-				"mic":    {Description: "麦克风控制"},
-				"share":  {Description: "屏幕共享"},
-			},
-			ToolOverrides: map[string]mcptypes.CLIToolOverride{
-				"create_conference": {
-					CLIName:     "start",
-					Description: "发起即时会议",
-					Flags: map[string]mcptypes.CLIFlagOverride{
-						"title": {Description: "会议标题"},
-					},
-				},
-				"get_conference_status": {
-					CLIName:     "status",
-					Description: "查询当前会议状态",
-				},
-				"ai_end_meeting_for_all": {
-					CLIName:     "end",
-					Description: "结束会议（所有人）",
-					IsSensitive: true,
-				},
-				"ai_open_camera": {
-					CLIName:     "open",
-					Group:       "camera",
-					Description: "打开摄像头",
-				},
-				"ai_mute_mic": {
-					CLIName:     "mute",
-					Group:       "mic",
-					Description: "静音自己",
-				},
-				"ai_share_desktop": {
-					CLIName:     "start",
-					Group:       "share",
-					Description: "开始共享桌面",
-					Flags: map[string]mcptypes.CLIFlagOverride{
-						"capture_speaker": {Description: "是否共享电脑音频"},
-					},
-				},
-			},
-		},
-	}
-}
-
-func pluginTestRoot(commands ...*cobra.Command) *cobra.Command {
-	root := &cobra.Command{
-		Use:           "dws",
-		SilenceErrors: true,
-		SilenceUsage:  true,
-	}
-	root.PersistentFlags().Bool("dry-run", false, "")
-	root.PersistentFlags().Bool("yes", false, "")
-	root.PersistentFlags().StringP("format", "f", "json", "")
-	root.SetOut(io.Discard)
-	root.SetErr(io.Discard)
-	root.AddCommand(commands...)
-	return root
-}
-
-func requirePluginChild(t *testing.T, parent *cobra.Command, names ...string) *cobra.Command {
-	t.Helper()
-	current := parent
-	for _, name := range names {
-		var next *cobra.Command
-		for _, child := range current.Commands() {
-			if child.Name() == name {
-				next = child
-				break
-			}
-		}
-		if next == nil {
-			t.Fatalf("missing plugin command %q below %q", name, current.CommandPath())
-		}
-		current = next
-	}
-	return current
-}
-
-func TestPluginOverlayBuildsConferenceTreeAndDispatchesOriginalProperties(t *testing.T) {
-	runner := &pluginCaptureRunner{}
-	commands := buildPluginCommands([]mcptypes.ServerDescriptor{conferencePluginDescriptor()}, runner, nil)
-	if len(commands) != 1 {
-		t.Fatalf("plugin roots = %d, want 1", len(commands))
-	}
-	conference := commands[0]
-	if conference.Name() != "conference" || conference.Short != "视频会议：发起/邀请入会/会中控制" {
-		t.Fatalf("conference root = %q / %q", conference.Name(), conference.Short)
-	}
-	if !cmdutil.IsPluginSourced(conference) {
-		t.Fatal("conference root is missing plugin provenance")
-	}
-	if got := requirePluginChild(t, conference, "camera").Short; got != "摄像头控制" {
-		t.Fatalf("camera group short = %q", got)
-	}
-	if got := requirePluginChild(t, conference, "camera", "open").Short; got != "打开摄像头" {
-		t.Fatalf("camera open short = %q", got)
-	}
-	requirePluginChild(t, conference, "mic", "mute")
-	requirePluginChild(t, conference, "status")
-	share := requirePluginChild(t, conference, "share", "start")
-	flag := share.Flags().Lookup("capture-speaker")
-	if flag == nil || flag.Usage != "是否共享电脑音频" {
-		t.Fatalf("capture-speaker flag = %#v", flag)
-	}
-
-	root := pluginTestRoot(commands...)
-	root.SetArgs([]string{
-		"conference", "start",
-		"--json", `{"from_json":"kept","title":"json"}`,
-		"--params", `{"from_params":2,"title":"params"}`,
-		"--title", "验证会议",
-		"--dry-run",
-	})
-	if err := root.Execute(); err != nil {
-		t.Fatalf("conference start: %v", err)
-	}
-	if len(runner.invocations) != 1 {
-		t.Fatalf("runner calls = %d, want 1", len(runner.invocations))
-	}
-	invocation := runner.invocations[0]
-	if invocation.Kind != "compat_invocation" ||
-		invocation.CanonicalProduct != "conference-local" ||
-		invocation.Tool != "create_conference" ||
-		!invocation.DryRun {
-		t.Fatalf("conference invocation = %#v", invocation)
-	}
-	wantParams := map[string]any{
-		"from_json":   "kept",
-		"from_params": float64(2),
-		"title":       "验证会议",
-	}
-	if !reflect.DeepEqual(invocation.Params, wantParams) {
-		t.Fatalf("conference params = %#v, want %#v", invocation.Params, wantParams)
-	}
-
-	precedenceRunner := &pluginCaptureRunner{}
-	precedenceRoot := pluginTestRoot(buildPluginCommands(
-		[]mcptypes.ServerDescriptor{conferencePluginDescriptor()},
-		precedenceRunner,
-		nil,
-	)...)
-	precedenceRoot.SetArgs([]string{
-		"conference", "start",
-		"--json", `{"title":"json"}`,
-		"--params", `{"title":"params"}`,
-		"--dry-run",
-	})
-	if err := precedenceRoot.Execute(); err != nil {
-		t.Fatalf("conference payload precedence: %v", err)
-	}
-	if got := precedenceRunner.invocations[0].Params["title"]; got != "params" {
-		t.Fatalf("conference payload title = %#v, want --params value", got)
-	}
-}
-
-func TestPluginOverlayTypedFlags(t *testing.T) {
-	descriptor := conferencePluginDescriptor()
-	descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-		"typed_tool": {
-			CLIName: "typed",
-			Flags: map[string]mcptypes.CLIFlagOverride{
-				"conversationId": {Required: true, Description: "conversation"},
-				"enabled":        {Type: "bool"},
-				"limit":          {Type: "int"},
-				"tags":           {Type: "stringSlice"},
-			},
-		},
-	}
-	runner := &pluginCaptureRunner{}
-	root := pluginTestRoot(buildPluginCommands([]mcptypes.ServerDescriptor{descriptor}, runner, nil)...)
-	root.SetArgs([]string{
-		"conference", "typed",
-		"--conversation-id", "cid",
-		"--enabled=false",
-		"--limit", "3",
-		"--tags", "one,two",
-		"--dry-run",
-	})
-	if err := root.Execute(); err != nil {
-		t.Fatalf("typed plugin command: %v", err)
-	}
-	if len(runner.invocations) != 1 {
-		t.Fatalf("runner calls = %d", len(runner.invocations))
-	}
-	invocation := runner.invocations[0]
-	if invocation.CanonicalProduct != "conference-local" {
-		t.Fatalf("canonical product = %q", invocation.CanonicalProduct)
-	}
-	want := map[string]any{
-		"conversationId": "cid",
-		"enabled":        false,
-		"limit":          3,
-		"tags":           []string{"one", "two"},
-	}
-	if !reflect.DeepEqual(invocation.Params, want) {
-		t.Fatalf("typed params = %#v, want %#v", invocation.Params, want)
-	}
-}
-
-func TestPluginSensitiveCommandRequiresConfirmation(t *testing.T) {
-	for _, testCase := range []struct {
-		name      string
-		args      []string
-		wantCalls int
-		wantDry   bool
-		wantError bool
-	}{
-		{name: "blocked", args: []string{"conference", "end"}, wantError: true},
-		{name: "preview", args: []string{"conference", "end", "--dry-run"}, wantCalls: 1, wantDry: true},
-		{name: "confirmed", args: []string{"conference", "end", "--yes"}, wantCalls: 1},
-	} {
-		t.Run(testCase.name, func(t *testing.T) {
-			runner := &pluginCaptureRunner{}
-			root := pluginTestRoot(buildPluginCommands(
-				[]mcptypes.ServerDescriptor{conferencePluginDescriptor()}, runner, nil)...)
-			root.SetArgs(testCase.args)
-			err := root.Execute()
-			if testCase.wantError {
-				var appErr *apperrors.Error
-				if !errors.As(err, &appErr) ||
-					appErr.Category != apperrors.CategoryValidation ||
-					appErr.Reason != "confirmation_required" {
-					t.Fatalf("sensitive error = %#v", err)
-				}
-			} else if err != nil {
-				t.Fatalf("sensitive command: %v", err)
-			}
-			if len(runner.invocations) != testCase.wantCalls {
-				t.Fatalf("runner calls = %d, want %d", len(runner.invocations), testCase.wantCalls)
-			}
-			if testCase.wantCalls == 1 && runner.invocations[0].DryRun != testCase.wantDry {
-				t.Fatalf("dry-run = %v, want %v", runner.invocations[0].DryRun, testCase.wantDry)
-			}
-		})
-	}
-}
-
-func TestPluginOverlayMergesServersWithoutProbingHTTP(t *testing.T) {
-	isolatePluginRuntime(t)
-	var calls atomic.Int32
-	server := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {
-		calls.Add(1)
-	}))
-	defer server.Close()
-
-	first := conferencePluginDescriptor()
-	first.Endpoint = server.URL
-	first.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-		"one": {CLIName: "one"},
-	}
-	second := first
-	second.Key = "conference-extra"
-	second.DisplayName = "conference/conference-extra"
-	second.Endpoint = server.URL + "/extra"
-	second.CLI.ID = "conference-extra"
-	second.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-		"two": {CLIName: "two"},
-	}
-	registerPluginHTTPServer(first)
-	registerPluginHTTPServer(second)
-	runner := &pluginCaptureRunner{}
-	commands := buildPluginCommands([]mcptypes.ServerDescriptor{second, first}, runner, nil)
-	if len(commands) != 1 {
-		t.Fatalf("merged roots = %d, want 1", len(commands))
-	}
-	requirePluginChild(t, commands[0], "one")
-	requirePluginChild(t, commands[0], "two")
-	root := pluginTestRoot(commands...)
-	root.SetArgs([]string{"conference", "--help"})
-	if err := root.Execute(); err != nil {
-		t.Fatalf("conference help: %v", err)
-	}
-	if got := calls.Load(); got != 0 {
-		t.Fatalf("HTTP calls while building help = %d, want 0", got)
-	}
-	for _, command := range []string{"one", "two"} {
-		root.SetArgs([]string{"conference", command, "--dry-run"})
-		if err := root.Execute(); err != nil {
-			t.Fatalf("conference %s: %v", command, err)
-		}
-	}
-	if len(runner.invocations) != 2 ||
-		runner.invocations[0].CanonicalProduct != "conference-local" ||
-		runner.invocations[1].CanonicalProduct != "conference-extra" {
-		t.Fatalf("merged routes = %#v", runner.invocations)
-	}
-}
-
-func TestPluginCanReplaceHiddenFallbackButNotVisibleDistributionCommand(t *testing.T) {
-	root := &cobra.Command{Use: "dws"}
-	fallback := &cobra.Command{Use: "conference", Hidden: true}
-	fallback.AddCommand(&cobra.Command{Use: "meeting"})
-	distribution := &cobra.Command{Use: "drive"}
-	root.AddCommand(fallback, distribution)
-
-	conference := buildPluginCommands(
-		[]mcptypes.ServerDescriptor{conferencePluginDescriptor()},
-		executor.EchoRunner{},
-		nil,
-	)[0]
-	drive := &cobra.Command{Use: "drive"}
-	cmdutil.MarkPluginSource(drive)
-	addPluginCommandsSafe(root, []*cobra.Command{conference, drive})
-
-	gotConference := requirePluginChild(t, root, "conference")
-	if gotConference == fallback || gotConference.Hidden {
-		t.Fatalf("conference fallback was not replaced: %#v", gotConference)
-	}
-	requirePluginChild(t, gotConference, "status")
-	if gotDrive := requirePluginChild(t, root, "drive"); gotDrive != distribution {
-		t.Fatal("visible distribution command was replaced by a plugin")
-	}
-}
-
-func TestConflictingPluginDescriptorCannotReplaceDistributionEndpoint(t *testing.T) {
-	isolatePluginRuntime(t)
-	configDir := t.TempDir()
-	t.Setenv("DWS_CONFIG_DIR", configDir)
-	pluginDir := filepath.Join(configDir, "plugins", "user", "drive-hijack")
-	if err := os.MkdirAll(pluginDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	manifest := `{
-		"name":"drive-hijack",
-		"version":"1.0.0",
-		"mcpServers":{
-			"drive":{
-				"type":"streamable-http",
-				"endpoint":"https://plugin.invalid/mcp",
-				"cli":{
-					"id":"drive-service",
-					"command":"drive-hijack",
-					"toolOverrides":{"plugin_tool":{"cliName":"plugin-tool"}}
-				}
-			}
-		}
-	}`
-	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.json"), []byte(manifest), 0o600); err != nil {
-		t.Fatal(err)
-	}
-
-	AppendDynamicServer(mcptypes.ServerDescriptor{
-		Key:      "drive",
-		Endpoint: "https://distribution.invalid/mcp",
-		CLI:      mcptypes.CLIOverlay{ID: "drive-service", Command: "drive"},
-	})
-	root := &cobra.Command{Use: "dws"}
-	root.AddCommand(&cobra.Command{Use: "drive"})
-	if commands := loadPlugins(root, nil, executor.EchoRunner{}); len(commands) != 0 {
-		t.Fatalf("conflicting plugin commands = %#v", commands)
-	}
-	if endpoint, ok := directRuntimeEndpoint("drive-service", "plugin_tool"); !ok ||
-		endpoint != "https://distribution.invalid/mcp" {
-		t.Fatalf("drive endpoint after rejected plugin = (%q, %v)", endpoint, ok)
-	}
-}
-
-func TestSchemaSourceRootDoesNotLoadRuntimePlugins(t *testing.T) {
-	isolatePluginRuntime(t)
-	previous := rootLoadPlugins
-	t.Cleanup(func() { rootLoadPlugins = previous })
-	var calls atomic.Int32
-	rootLoadPlugins = func(*cobra.Command, *pipeline.Engine, executor.Runner) []*cobra.Command {
-		calls.Add(1)
-		AppendDynamicServer(conferencePluginDescriptor())
-		return buildPluginCommands(
-			[]mcptypes.ServerDescriptor{conferencePluginDescriptor()},
-			executor.EchoRunner{},
-			nil,
-		)
-	}
-
-	base := NewSchemaSourceRootCommand()
-	if calls.Load() != 0 {
-		t.Fatalf("Schema source root loaded plugins %d times", calls.Load())
-	}
-	baseConference := requirePluginChild(t, base, "conference")
-	if !baseConference.Hidden || requireOptionalPluginChild(baseConference, "status") != nil {
-		t.Fatal("Schema source root contains installed conference plugin commands")
-	}
-
-	runtime := NewRootCommand()
-	if calls.Load() != 1 {
-		t.Fatalf("runtime root plugin loads = %d, want 1", calls.Load())
-	}
-	runtimeConference := requirePluginChild(t, runtime, "conference")
-	if runtimeConference.Hidden {
-		t.Fatal("runtime conference plugin is hidden")
-	}
-	requirePluginChild(t, runtimeConference, "status")
-}
-
-func requireOptionalPluginChild(parent *cobra.Command, name string) *cobra.Command {
-	for _, child := range parent.Commands() {
-		if child.Name() == name {
-			return child
-		}
-	}
-	return nil
-}
-
-func TestPluginDerivedNamesAndReservedAliases(t *testing.T) {
-	descriptor := conferencePluginDescriptor()
-	descriptor.CLI.Aliases = []string{"auth", "conf", "conf"}
-	descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-		"conference_getCurrentStatus": {},
-	}
-	commands := buildPluginCommands([]mcptypes.ServerDescriptor{descriptor}, executor.EchoRunner{}, nil)
-	if len(commands) != 1 || !reflect.DeepEqual(commands[0].Aliases, []string{"conf"}) {
-		t.Fatalf("plugin aliases = %#v", commands)
-	}
-	if requireOptionalPluginChild(commands[0], "get-current-status") == nil {
-		var names []string
-		for _, command := range commands[0].Commands() {
-			names = append(names, command.Name())
-		}
-		t.Fatalf("derived command missing, got %s", strings.Join(names, ", "))
-	}
-}
-
-func TestPluginFlagsCannotShadowHostControls(t *testing.T) {
-	host := pluginTestRoot()
-	host.PersistentFlags().StringP("host-extra", "x", "", "")
-	reservations := pluginReservedFlags(host)
-	for name := range reservations.names {
-		t.Run(name, func(t *testing.T) {
-			descriptor := conferencePluginDescriptor()
-			descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-				"unsafe": {
-					CLIName:     "unsafe",
-					IsSensitive: true,
-					Flags: map[string]mcptypes.CLIFlagOverride{
-						"value": {Alias: name},
-					},
-				},
-			}
-			if commands := buildPluginCommands(
-				[]mcptypes.ServerDescriptor{descriptor},
-				executor.EchoRunner{},
-				host,
-			); len(commands) != 0 {
-				t.Fatalf("reserved host flag %q produced commands %#v", name, commands)
-			}
-		})
-	}
-}
-
-func TestPluginShorthandsCannotShadowHostOrHelp(t *testing.T) {
-	host := pluginTestRoot()
-	host.PersistentFlags().StringP("host-extra", "x", "", "")
-	descriptor := conferencePluginDescriptor()
-	descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-		"safe": {
-			CLIName: "safe",
-			Flags: map[string]mcptypes.CLIFlagOverride{
-				"alpha":   {Shorthand: "f"},
-				"bravo":   {Shorthand: "h"},
-				"charlie": {Shorthand: "o"},
-				"delta":   {Shorthand: "v"},
-				"echo":    {Shorthand: "x"},
-				"foxtrot": {Shorthand: "y"},
-			},
-		},
-	}
-	runner := &pluginCaptureRunner{}
-	commands := buildPluginCommands(
-		[]mcptypes.ServerDescriptor{descriptor},
-		runner,
-		host,
-	)
-	if len(commands) != 1 {
-		t.Fatalf("plugin commands = %#v", commands)
-	}
-	host.AddCommand(commands...)
-	leaf := requirePluginChild(t, commands[0], "safe")
-	for _, name := range []string{"alpha", "bravo", "charlie", "delta", "echo", "foxtrot"} {
-		if shorthand := leaf.Flags().Lookup(name).Shorthand; shorthand != "" {
-			t.Fatalf("--%s shorthand = %q, want empty", name, shorthand)
-		}
-	}
-	host.SetArgs([]string{"conference", "safe", "-h"})
-	if err := host.Execute(); err != nil {
-		t.Fatalf("plugin help: %v", err)
-	}
-	if len(runner.invocations) != 0 {
-		t.Fatalf("help executed plugin: %#v", runner.invocations)
-	}
-}
-
-func TestPluginPayloadPrecedenceRequiredAndTypedPositionals(t *testing.T) {
-	descriptor := conferencePluginDescriptor()
-	descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-		"payload": {
-			CLIName: "payload",
-			Flags: map[string]mcptypes.CLIFlagOverride{
-				"title":   {Required: true},
-				"mode":    {Default: "fallback"},
-				"enabled": {Positional: true, PositionalIndex: 0, Alias: "enabled-value", Required: true, Type: "bool"},
-			},
-		},
-	}
-
-	for _, testCase := range []struct {
-		name        string
-		args        []string
-		wantEnabled bool
-	}{
-		{
-			name: "flag satisfies dual positional",
-			args: []string{
-				"conference", "payload",
-				"--params", `{"title":"from-json","mode":"from-json"}`,
-				"--enabled-value=true",
-				"--dry-run",
-			},
-			wantEnabled: true,
-		},
-		{
-			name: "json beats positional",
-			args: []string{
-				"conference", "payload", "true",
-				"--params", `{"title":"from-json","mode":"from-json","enabled":false}`,
-				"--dry-run",
-			},
-			wantEnabled: false,
-		},
-	} {
-		t.Run(testCase.name, func(t *testing.T) {
-			runner := &pluginCaptureRunner{}
-			root := pluginTestRoot(buildPluginCommands(
-				[]mcptypes.ServerDescriptor{descriptor},
-				runner,
-				nil,
-			)...)
-			root.SetArgs(testCase.args)
-			if err := root.Execute(); err != nil {
-				t.Fatalf("payload command: %v", err)
-			}
-			if len(runner.invocations) != 1 {
-				t.Fatalf("runner calls = %d", len(runner.invocations))
-			}
-			params := runner.invocations[0].Params
-			if params["title"] != "from-json" ||
-				params["mode"] != "from-json" ||
-				params["enabled"] != testCase.wantEnabled {
-				t.Fatalf("payload params = %#v", params)
-			}
-		})
-	}
-}
-
-func TestPluginDescriptorWinnerKeepsRouteAuthAndClientAtomic(t *testing.T) {
-	isolatePluginRuntime(t)
-	configDir := t.TempDir()
-	t.Setenv("DWS_CONFIG_DIR", configDir)
-
-	writeManifest := func(name, manifest string) {
-		t.Helper()
-		directory := filepath.Join(configDir, "plugins", "user", name)
-		if err := os.MkdirAll(directory, 0o755); err != nil {
-			t.Fatal(err)
-		}
-		if err := os.WriteFile(filepath.Join(directory, "plugin.json"), []byte(manifest), 0o600); err != nil {
-			t.Fatal(err)
-		}
-	}
-	writeManifest("alpha-plugin", `{
-		"name":"alpha-plugin",
-		"version":"1.0.0",
-		"mcpServers":{
-			"alpha":{
-				"type":"streamable-http",
-				"endpoint":"https://alpha.invalid/mcp",
-				"headers":{"Authorization":"Bearer alpha-secret"},
-				"cli":{
-					"id":"shared-plugin-id",
-					"command":"alpha-command",
-					"toolOverrides":{"alpha_tool":{"cliName":"alpha"}}
-				}
-			},
-			"alpha-extra":{
-				"type":"streamable-http",
-				"endpoint":"https://alpha-extra.invalid/mcp",
-				"cli":{
-					"id":"alpha-extra-id",
-					"command":"alpha-command",
-					"toolOverrides":{"extra_tool":{"cliName":"extra"}}
-				}
-			}
-		}
-	}`)
-	writeManifest("beta-plugin", `{
-		"name":"beta-plugin",
-		"version":"1.0.0",
-		"mcpServers":{
-			"beta":{
-				"type":"stdio",
-				"command":"bin/beta",
-				"cli":{
-					"id":"shared-plugin-id",
-					"command":"beta-command",
-					"toolOverrides":{"beta_tool":{"cliName":"beta"}}
-				}
-			}
-		}
-	}`)
-
-	root := pluginTestRoot()
-	commands := loadPlugins(root, nil, executor.EchoRunner{})
-	if len(commands) != 1 || commands[0].Name() != "alpha-command" {
-		t.Fatalf("plugin winner commands = %#v", commands)
-	}
-	requirePluginChild(t, commands[0], "alpha")
-	requirePluginChild(t, commands[0], "extra")
-	endpoint, ok := directRuntimeEndpoint("shared-plugin-id", "alpha_tool")
-	if !ok || endpoint != "https://alpha.invalid/mcp" {
-		t.Fatalf("winner endpoint = (%q, %v)", endpoint, ok)
-	}
-	extraEndpoint, ok := directRuntimeEndpoint("alpha-extra-id", "extra_tool")
-	if !ok || extraEndpoint != "https://alpha-extra.invalid/mcp" {
-		t.Fatalf("merged server endpoint = (%q, %v)", extraEndpoint, ok)
-	}
-	auth, ok := LookupPluginAuth("shared-plugin-id")
-	if !ok || auth.Token != "alpha-secret" {
-		t.Fatalf("winner auth = (%#v, %v)", auth, ok)
-	}
-	if _, ok := LookupStdioClient("beta-plugin/beta"); ok {
-		t.Fatal("losing stdio client was registered")
-	}
-}
-
-func TestUnsupportedPluginOverlaySemanticsFailClosed(t *testing.T) {
-	for _, mutate := range []func(*mcptypes.ServerDescriptor){
-		func(descriptor *mcptypes.ServerDescriptor) {
-			descriptor.CLI.RedirectTo = "drive"
-		},
-		func(descriptor *mcptypes.ServerDescriptor) {
-			descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-				"unsafe": {
-					CLIName: "unsafe",
-					Flags: map[string]mcptypes.CLIFlagOverride{
-						"source": {MapsTo: "target"},
-					},
-				},
-			}
-		},
-		func(descriptor *mcptypes.ServerDescriptor) {
-			descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-				"unsafe": {
-					CLIName:  "unsafe",
-					Pipeline: []json.RawMessage{json.RawMessage(`{"tool":"one"}`)},
-				},
-			}
-		},
-		func(descriptor *mcptypes.ServerDescriptor) {
-			descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-				"unsafe": {CLIName: "unsafe", ServerOverride: "drive"},
-			}
-		},
-		func(descriptor *mcptypes.ServerDescriptor) {
-			descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-				"unsafe": {
-					CLIName: "unsafe",
-					Flags: map[string]mcptypes.CLIFlagOverride{
-						"Body.query": {},
-					},
-				},
-			}
-		},
-		func(descriptor *mcptypes.ServerDescriptor) {
-			descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-				"unsafe": {CLIName: "unsafe", Group: "safe.bad_name"},
-			}
-		},
-		func(descriptor *mcptypes.ServerDescriptor) {
-			descriptor.CLI.ToolOverrides = map[string]mcptypes.CLIToolOverride{
-				"unsafe": {
-					CLIName:         "unsafe",
-					Flags:           map[string]mcptypes.CLIFlagOverride{"value": {}},
-					RequireTogether: [][]string{{"value", "missing"}},
-				},
-			}
-		},
-	} {
-		descriptor := conferencePluginDescriptor()
-		mutate(&descriptor)
-		if commands := buildPluginCommands(
-			[]mcptypes.ServerDescriptor{descriptor},
-			executor.EchoRunner{},
-			nil,
-		); len(commands) != 0 {
-			t.Fatalf("unsupported overlay produced commands %#v", commands)
-		}
-	}
-}
-
-func TestUnsupportedPluginDescriptorsDoNotRegisterRuntimeState(t *testing.T) {
-	isolatePluginRuntime(t)
-	configDir := t.TempDir()
-	t.Setenv("DWS_CONFIG_DIR", configDir)
-
-	writeManifest := func(name, manifest string) {
-		t.Helper()
-		directory := filepath.Join(configDir, "plugins", "user", name)
-		if err := os.MkdirAll(directory, 0o755); err != nil {
-			t.Fatal(err)
-		}
-		if err := os.WriteFile(filepath.Join(directory, "plugin.json"), []byte(manifest), 0o600); err != nil {
-			t.Fatal(err)
-		}
-	}
-	writeManifest("unsafe-http", `{
-		"name":"unsafe-http",
-		"version":"1.0.0",
-		"mcpServers":{"unsafe":{
-			"type":"streamable-http",
-			"endpoint":"https://unsafe.invalid/mcp",
-			"headers":{"Authorization":"Bearer unsafe-secret"},
-			"cli":{"id":"unsafe-http-id","command":"unsafe-http","toolOverrides":{
-				"unsafe_tool":{"cliName":"run","serverOverride":"drive"}
-			}}
-		}}
-	}`)
-	writeManifest("unsafe-stdio", `{
-		"name":"unsafe-stdio",
-		"version":"1.0.0",
-		"mcpServers":{"unsafe":{
-			"type":"stdio",
-			"command":"bin/unsafe",
-			"cli":{"id":"unsafe-stdio-id","command":"unsafe-stdio","toolOverrides":{
-				"unsafe_tool":{"cliName":"run","flags":{"value":{"mapsTo":"target"}}}
-			}}
-		}}
-	}`)
-
-	root := pluginTestRoot()
-	if commands := loadPlugins(root, nil, executor.EchoRunner{}); len(commands) != 0 {
-		t.Fatalf("unsupported plugin descriptors produced commands %#v", commands)
-	}
-	if endpoint, ok := directRuntimeEndpoint("unsafe-http-id", "unsafe_tool"); ok {
-		t.Fatalf("unsupported HTTP descriptor registered endpoint %q", endpoint)
-	}
-	if _, ok := LookupPluginAuth("unsafe-http-id"); ok {
-		t.Fatal("unsupported HTTP descriptor registered plugin auth")
-	}
-	if _, ok := LookupStdioClient("unsafe-stdio/unsafe"); ok {
-		t.Fatal("unsupported stdio descriptor registered a client")
-	}
-}

internal/app/plugin_input_schema.go

@@ -1,239 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package app
-
-import (
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/cli"
-	apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/transport"
-)
-
-func pluginToolInputSchema(
-	tools transport.ToolsListResult,
-	toolName string,
-) (map[string]any, bool) {
-	for _, tool := range tools.Tools {
-		if strings.TrimSpace(tool.Name) == strings.TrimSpace(toolName) {
-			return tool.InputSchema, true
-		}
-	}
-	return nil, false
-}
-
-func normalizePluginInputParams(
-	params map[string]any,
-	schema map[string]any,
-) (map[string]any, error) {
-	schema = canonicalPluginInputSchema(schema)
-	normalized := make(map[string]any, len(params))
-	for key, value := range params {
-		normalized[key] = value
-	}
-	if _, err := coercePluginSchemaValue(normalized, schema); err != nil {
-		return nil, cliInputValidationError(err)
-	}
-	if err := cli.ValidateInputSchema(normalized, schema); err != nil {
-		return nil, err
-	}
-	return normalized, nil
-}
-
-func canonicalPluginInputSchema(schema map[string]any) map[string]any {
-	if len(schema) == 0 {
-		return schema
-	}
-	cloned := make(map[string]any, len(schema))
-	for key, value := range schema {
-		cloned[key] = clonePluginSchemaValue(key, value)
-	}
-	return cloned
-}
-
-func clonePluginSchemaValue(key string, value any) any {
-	switch typed := value.(type) {
-	case map[string]any:
-		cloned := make(map[string]any, len(typed))
-		for childKey, childValue := range typed {
-			cloned[childKey] = clonePluginSchemaValue(childKey, childValue)
-		}
-		return cloned
-	case []any:
-		cloned := make([]any, len(typed))
-		for index, item := range typed {
-			cloned[index] = clonePluginSchemaValue(key, item)
-		}
-		return cloned
-	case []string:
-		cloned := make([]string, len(typed))
-		for index, item := range typed {
-			if key == "type" {
-				item = canonicalPluginSchemaType(item)
-			}
-			cloned[index] = item
-		}
-		return cloned
-	case string:
-		if key == "type" {
-			return canonicalPluginSchemaType(typed)
-		}
-		return typed
-	default:
-		return value
-	}
-}
-
-func canonicalPluginSchemaType(value string) string {
-	switch strings.ToLower(strings.TrimSpace(value)) {
-	case "bool":
-		return "boolean"
-	case "int":
-		return "integer"
-	case "float":
-		return "number"
-	default:
-		return value
-	}
-}
-
-func cliInputValidationError(err error) error {
-	if err == nil {
-		return nil
-	}
-	return apperrors.NewValidation(
-		fmt.Sprintf("input schema normalization failed: %v", err),
-		apperrors.WithReason("plugin_input_schema_invalid"),
-	)
-}
-
-func coercePluginSchemaValue(value any, schema map[string]any) (any, error) {
-	target := singlePluginSchemaType(schema)
-	if raw, ok := value.(string); ok {
-		trimmed := strings.TrimSpace(raw)
-		switch target {
-		case "bool", "boolean":
-			parsed, err := strconv.ParseBool(trimmed)
-			if err != nil {
-				return nil, fmt.Errorf("cannot convert %q to boolean: %w", raw, err)
-			}
-			value = parsed
-		case "int", "integer":
-			parsed, err := strconv.Atoi(trimmed)
-			if err != nil {
-				return nil, fmt.Errorf("cannot convert %q to integer: %w", raw, err)
-			}
-			value = parsed
-		case "float", "number":
-			parsed, err := strconv.ParseFloat(trimmed, 64)
-			if err != nil {
-				return nil, fmt.Errorf("cannot convert %q to number: %w", raw, err)
-			}
-			value = parsed
-		case "object":
-			var parsed map[string]any
-			if err := json.Unmarshal([]byte(trimmed), &parsed); err != nil {
-				return nil, fmt.Errorf("cannot convert plugin parameter to object: %w", err)
-			}
-			if parsed == nil {
-				return nil, fmt.Errorf("cannot convert plugin parameter to object: expected a JSON object")
-			}
-			value = parsed
-		case "array":
-			var parsed []any
-			if strings.HasPrefix(trimmed, "[") {
-				if err := json.Unmarshal([]byte(trimmed), &parsed); err != nil {
-					return nil, fmt.Errorf("cannot convert plugin parameter to array: %w", err)
-				}
-			} else if trimmed != "" {
-				for _, item := range strings.Split(trimmed, ",") {
-					if item = strings.TrimSpace(item); item != "" {
-						parsed = append(parsed, item)
-					}
-				}
-			}
-			value = parsed
-		}
-	}
-
-	switch typed := value.(type) {
-	case map[string]any:
-		properties, _ := schema["properties"].(map[string]any)
-		for key, propertyValue := range typed {
-			propertySchema, _ := properties[key].(map[string]any)
-			if len(propertySchema) == 0 {
-				continue
-			}
-			coerced, err := coercePluginSchemaValue(propertyValue, propertySchema)
-			if err != nil {
-				return nil, fmt.Errorf("%s: %w", key, err)
-			}
-			typed[key] = coerced
-		}
-		return typed, nil
-	case []string:
-		items := make([]any, len(typed))
-		for index, item := range typed {
-			items[index] = item
-		}
-		value = items
-	}
-
-	if items, ok := value.([]any); ok {
-		itemSchema, _ := schema["items"].(map[string]any)
-		if len(itemSchema) == 0 {
-			return items, nil
-		}
-		for index, item := range items {
-			coerced, err := coercePluginSchemaValue(item, itemSchema)
-			if err != nil {
-				return nil, fmt.Errorf("item %d: %w", index, err)
-			}
-			items[index] = coerced
-		}
-		return items, nil
-	}
-	return value, nil
-}
-
-func singlePluginSchemaType(schema map[string]any) string {
-	var types []string
-	switch typed := schema["type"].(type) {
-	case string:
-		types = []string{typed}
-	case []string:
-		types = typed
-	case []any:
-		for _, value := range typed {
-			if text, ok := value.(string); ok {
-				types = append(types, text)
-			}
-		}
-	}
-	var target string
-	for _, candidate := range types {
-		candidate = strings.TrimSpace(candidate)
-		if candidate == "" || candidate == "null" {
-			continue
-		}
-		if target != "" && target != candidate {
-			return ""
-		}
-		target = candidate
-	}
-	return target
-}

internal/app/plugin_input_schema_coverage_test.go

@@ -1,229 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0
-
-package app
-
-import (
-	"errors"
-	"reflect"
-	"strings"
-	"testing"
-
-	apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/transport"
-)
-
-func TestPluginToolInputSchemaMatchesTrimmedName(t *testing.T) {
-	want := map[string]any{"type": "object"}
-	tools := transport.ToolsListResult{Tools: []transport.ToolDescriptor{
-		{Name: "other", InputSchema: map[string]any{"type": "string"}},
-		{Name: "  create_conference  ", InputSchema: want},
-	}}
-
-	got, ok := pluginToolInputSchema(tools, " create_conference ")
-	if !ok || !reflect.DeepEqual(got, want) {
-		t.Fatalf("pluginToolInputSchema() = (%#v, %v), want (%#v, true)", got, ok, want)
-	}
-	if got, ok := pluginToolInputSchema(tools, "missing"); ok || got != nil {
-		t.Fatalf("missing pluginToolInputSchema() = (%#v, %v), want (nil, false)", got, ok)
-	}
-}
-
-func TestNormalizePluginInputParamsCoercesNestedValues(t *testing.T) {
-	schema := map[string]any{
-		"type":     "object",
-		"required": []string{"enabled"},
-		"properties": map[string]any{
-			"enabled": map[string]any{"type": []any{"null", "bool"}},
-			"count":   map[string]any{"type": "int"},
-			"ratio":   map[string]any{"type": "float"},
-			"settings": map[string]any{
-				"type": "object",
-				"properties": map[string]any{
-					"active": map[string]any{"type": "bool"},
-				},
-			},
-			"ids": map[string]any{
-				"type":  []string{"array", "null"},
-				"items": map[string]any{"type": "int"},
-			},
-			"labels": map[string]any{
-				"type":  "array",
-				"items": map[string]any{"type": "string"},
-			},
-			"booleans": map[string]any{
-				"type":  "array",
-				"items": map[string]any{"type": "bool"},
-			},
-			"ambiguous": map[string]any{"type": []string{"string", "int"}},
-		},
-	}
-	params := map[string]any{
-		"enabled":   " true ",
-		"count":     " 7 ",
-		"ratio":     " 2.5 ",
-		"settings":  `{"active":"false"}`,
-		"ids":       `["1", "2"]`,
-		"labels":    "alpha, , beta",
-		"booleans":  []string{"true", "false"},
-		"ambiguous": "9",
-	}
-
-	got, err := normalizePluginInputParams(params, schema)
-	if err != nil {
-		t.Fatalf("normalizePluginInputParams() error = %v", err)
-	}
-	want := map[string]any{
-		"enabled":   true,
-		"count":     7,
-		"ratio":     2.5,
-		"settings":  map[string]any{"active": false},
-		"ids":       []any{1, 2},
-		"labels":    []any{"alpha", "beta"},
-		"booleans":  []any{true, false},
-		"ambiguous": "9",
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("normalizePluginInputParams() = %#v, want %#v", got, want)
-	}
-
-	properties := schema["properties"].(map[string]any)
-	if gotType := properties["enabled"].(map[string]any)["type"].([]any)[1]; gotType != "bool" {
-		t.Fatalf("normalization mutated source schema type to %#v", gotType)
-	}
-	if gotValue := params["enabled"]; gotValue != " true " {
-		t.Fatalf("normalization mutated source params to %#v", gotValue)
-	}
-}
-
-func TestNormalizePluginInputParamsReportsConversionPath(t *testing.T) {
-	tests := []struct {
-		name        string
-		value       any
-		fieldSchema map[string]any
-		wantText    string
-	}{
-		{name: "boolean", value: "sometimes", fieldSchema: map[string]any{"type": "bool"}, wantText: "cannot convert"},
-		{name: "integer", value: "1.5", fieldSchema: map[string]any{"type": "int"}, wantText: "integer"},
-		{name: "number", value: "many", fieldSchema: map[string]any{"type": "float"}, wantText: "number"},
-		{name: "object", value: "{", fieldSchema: map[string]any{"type": "object"}, wantText: "object"},
-		{name: "null object", value: "null", fieldSchema: map[string]any{"type": "object"}, wantText: "expected a JSON object"},
-		{name: "array", value: "[", fieldSchema: map[string]any{"type": "array"}, wantText: "array"},
-		{
-			name:  "nested property",
-			value: `{"active":"sometimes"}`,
-			fieldSchema: map[string]any{
-				"type": "object",
-				"properties": map[string]any{
-					"active": map[string]any{"type": "bool"},
-				},
-			},
-			wantText: "field: active:",
-		},
-		{
-			name:  "array item",
-			value: "1,not-an-int",
-			fieldSchema: map[string]any{
-				"type":  "array",
-				"items": map[string]any{"type": "int"},
-			},
-			wantText: "item 1",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			schema := map[string]any{
-				"type":       "object",
-				"properties": map[string]any{"field": tt.fieldSchema},
-			}
-			_, err := normalizePluginInputParams(map[string]any{"field": tt.value}, schema)
-			if err == nil {
-				t.Fatal("normalizePluginInputParams() error = nil, want conversion error")
-			}
-			var appError *apperrors.Error
-			if !errors.As(err, &appError) ||
-				appError.Category != apperrors.CategoryValidation ||
-				appError.Reason != "plugin_input_schema_invalid" {
-				t.Fatalf("conversion error = %#v, want categorized plugin schema validation error", err)
-			}
-			if !strings.Contains(err.Error(), tt.wantText) {
-				t.Fatalf("conversion error = %q, want text %q", err, tt.wantText)
-			}
-		})
-	}
-}
-
-func TestNormalizePluginInputParamsRunsSchemaValidation(t *testing.T) {
-	schema := map[string]any{
-		"type":     "object",
-		"required": []any{"name"},
-		"properties": map[string]any{
-			"name": map[string]any{"type": "string"},
-		},
-	}
-	if _, err := normalizePluginInputParams(map[string]any{}, schema); err == nil ||
-		!strings.Contains(err.Error(), "$.name is required") {
-		t.Fatalf("required-field validation error = %v", err)
-	}
-}
-
-func TestPluginInputSchemaHelperEdges(t *testing.T) {
-	if got := canonicalPluginInputSchema(nil); got != nil {
-		t.Fatalf("canonicalPluginInputSchema(nil) = %#v, want nil", got)
-	}
-	if got := clonePluginSchemaValue("minimum", 1); got != 1 {
-		t.Fatalf("clonePluginSchemaValue(scalar) = %#v, want 1", got)
-	}
-	if got := cliInputValidationError(nil); got != nil {
-		t.Fatalf("cliInputValidationError(nil) = %v, want nil", got)
-	}
-
-	if got, err := coercePluginSchemaValue("", map[string]any{"type": "array"}); err != nil || !reflect.DeepEqual(got, []any(nil)) {
-		t.Fatalf("empty array coercion = (%#v, %v), want nil slice", got, err)
-	}
-	items := []any{"unchanged"}
-	if got, err := coercePluginSchemaValue(items, map[string]any{"type": "array"}); err != nil || !reflect.DeepEqual(got, items) {
-		t.Fatalf("array without item schema = (%#v, %v)", got, err)
-	}
-	if got, err := coercePluginSchemaValue(12, map[string]any{"type": "integer"}); err != nil || got != 12 {
-		t.Fatalf("non-string scalar coercion = (%#v, %v), want (12, nil)", got, err)
-	}
-	unknown := map[string]any{"unknown": "unchanged"}
-	if got, err := coercePluginSchemaValue(unknown, map[string]any{
-		"type":       "object",
-		"properties": map[string]any{},
-	}); err != nil || !reflect.DeepEqual(got, unknown) {
-		t.Fatalf("unknown property coercion = (%#v, %v), want unchanged map", got, err)
-	}
-
-	tests := []struct {
-		name   string
-		schema map[string]any
-		want   string
-	}{
-		{name: "missing", schema: map[string]any{}, want: ""},
-		{name: "single string", schema: map[string]any{"type": "integer"}, want: "integer"},
-		{name: "single string slice", schema: map[string]any{"type": []string{"null", "number"}}, want: "number"},
-		{name: "any slice", schema: map[string]any{"type": []any{nil, 3, "", "null", "boolean"}}, want: "boolean"},
-		{name: "ambiguous", schema: map[string]any{"type": []any{"string", "integer"}}, want: ""},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := singlePluginSchemaType(tt.schema); got != tt.want {
-				t.Fatalf("singlePluginSchemaType(%#v) = %q, want %q", tt.schema, got, tt.want)
-			}
-		})
-	}
-
-	for raw, want := range map[string]string{
-		" BOOL ": "boolean",
-		"Int":    "integer",
-		"FLOAT":  "number",
-		"custom": "custom",
-	} {
-		if got := canonicalPluginSchemaType(raw); got != want {
-			t.Errorf("canonicalPluginSchemaType(%q) = %q, want %q", raw, got, want)
-		}
-	}
-}

internal/app/plugin_input_schema_test.go

@@ -1,109 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package app
-
-import (
-	"context"
-	"errors"
-	"reflect"
-	"testing"
-
-	apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/executor"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/transport"
-)
-
-func TestPluginStdioExecutionNormalizesAndValidatesLiveSchema(t *testing.T) {
-	isolatePluginRuntime(t)
-	previousInit := runnerStdioEnsureInitialized
-	previousList := runnerStdioListTools
-	previousCall := runnerStdioCallTool
-	t.Cleanup(func() {
-		runnerStdioEnsureInitialized = previousInit
-		runnerStdioListTools = previousList
-		runnerStdioCallTool = previousCall
-	})
-
-	client := transport.NewStdioClient("unused", nil, nil)
-	RegisterStdioClient("conference/local", client)
-	runnerStdioEnsureInitialized = func(*transport.StdioClient, context.Context) error {
-		return nil
-	}
-	runnerStdioListTools = func(*transport.StdioClient, context.Context) (transport.ToolsListResult, error) {
-		return transport.ToolsListResult{
-			Tools: []transport.ToolDescriptor{{
-				Name: "create_conference",
-				InputSchema: map[string]any{
-					"type":     "object",
-					"required": []any{"title"},
-					"properties": map[string]any{
-						"title":           map[string]any{"type": "string"},
-						"capture_speaker": map[string]any{"type": "bool"},
-					},
-					"additionalProperties": false,
-				},
-			}},
-		}, nil
-	}
-	var calledParams map[string]any
-	runnerStdioCallTool = func(
-		_ *transport.StdioClient,
-		_ context.Context,
-		_ string,
-		params map[string]any,
-	) (transport.ToolCallResult, error) {
-		calledParams = params
-		return transport.ToolCallResult{Content: map[string]any{"ok": true}}, nil
-	}
-
-	runner := &runtimeRunner{}
-	invocation := executor.Invocation{
-		CanonicalProduct: "conference-local",
-		Tool:             "create_conference",
-		Params: map[string]any{
-			"title":           "schema validation",
-			"capture_speaker": "true",
-		},
-	}
-	result, err := runner.executeInvocation(
-		context.Background(),
-		"stdio://conference/local",
-		invocation,
-	)
-	if err != nil {
-		t.Fatalf("stdio plugin execution: %v", err)
-	}
-	wantParams := map[string]any{
-		"title":           "schema validation",
-		"capture_speaker": true,
-	}
-	if !reflect.DeepEqual(calledParams, wantParams) ||
-		!reflect.DeepEqual(result.Invocation.Params, wantParams) {
-		t.Fatalf("normalized wire params = %#v, result = %#v", calledParams, result.Invocation.Params)
-	}
-
-	calledParams = nil
-	invocation.Params = map[string]any{"capture_speaker": "true"}
-	_, err = runner.executeInvocation(
-		context.Background(),
-		"stdio://conference/local",
-		invocation,
-	)
-	var appError *apperrors.Error
-	if !errors.As(err, &appError) ||
-		appError.Category != apperrors.CategoryValidation ||
-		calledParams != nil {
-		t.Fatalf("missing required schema validation = %#v, call params = %#v", err, calledParams)
-	}
-}

internal/app/plugin_registration_residual_test.go

@@ -1,369 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-
-package app
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"os"
-	"path/filepath"
-	"reflect"
-	"testing"
-
-	apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/executor"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/pipeline"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/plugin"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/shortcut/userdef"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/transport"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/cmdutil"
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/mcptypes"
-	"github.com/spf13/cobra"
-)
-
-type schemaSourceContextKey struct{}
-
-func TestSchemaSourceRootPropagatesContextWithoutLoadingPlugins(t *testing.T) {
-	previous := rootLoadPlugins
-	t.Cleanup(func() { rootLoadPlugins = previous })
-
-	pluginLoads := 0
-	rootLoadPlugins = func(*cobra.Command, *pipeline.Engine, executor.Runner) []*cobra.Command {
-		pluginLoads++
-		return nil
-	}
-	wantContext := context.WithValue(context.Background(), schemaSourceContextKey{}, "schema")
-	root := NewSchemaSourceRootCommand(wantContext)
-	if root.Context() != wantContext {
-		t.Fatal("Schema source root did not retain the caller context")
-	}
-	if pluginLoads != 0 {
-		t.Fatalf("Schema source root loaded runtime plugins %d times", pluginLoads)
-	}
-}
-
-func TestCollectPluginServerCandidatesSortsAndSkipsInvalidStdio(t *testing.T) {
-	previousDescriptors := rootPluginDescriptors
-	previousClients := rootPluginStdioClients
-	previousDescriptor := rootPluginStdioDescriptor
-	t.Cleanup(func() {
-		rootPluginDescriptors = previousDescriptors
-		rootPluginStdioClients = previousClients
-		rootPluginStdioDescriptor = previousDescriptor
-	})
-
-	first := &plugin.Plugin{Manifest: plugin.Manifest{Name: "first"}}
-	second := &plugin.Plugin{Manifest: plugin.Manifest{Name: "second"}}
-	wantContext := &plugin.UserContext{UserID: "user", CorpID: "corp"}
-	client := transport.NewStdioClient("unused", nil, nil)
-
-	rootPluginDescriptors = func(owner *plugin.Plugin) []mcptypes.ServerDescriptor {
-		if owner == first {
-			return []mcptypes.ServerDescriptor{{Key: "same"}, {Key: " beta "}}
-		}
-		return []mcptypes.ServerDescriptor{{Key: "aardvark"}}
-	}
-	rootPluginStdioClients = func(owner *plugin.Plugin, gotContext *plugin.UserContext) []plugin.StdioServerClient {
-		if gotContext != wantContext {
-			t.Fatalf("stdio user context = %#v, want %#v", gotContext, wantContext)
-		}
-		if owner != first {
-			return nil
-		}
-		return []plugin.StdioServerClient{
-			{Key: "same", Client: client},
-			{Key: " alpha ", Client: client},
-			{Key: "invalid", Client: client},
-		}
-	}
-	rootPluginStdioDescriptor = func(_ *plugin.Plugin, stdio plugin.StdioServerClient) (mcptypes.ServerDescriptor, bool) {
-		if stdio.Key == "invalid" {
-			return mcptypes.ServerDescriptor{}, false
-		}
-		return mcptypes.ServerDescriptor{Key: stdio.Key}, true
-	}
-
-	candidates := collectPluginServerCandidates([]*plugin.Plugin{first, second}, wantContext)
-	if len(candidates) != 5 {
-		t.Fatalf("candidate count = %d, want 5", len(candidates))
-	}
-	gotKeys := make([]string, 0, len(candidates))
-	gotKinds := make([]string, 0, len(candidates))
-	for _, candidate := range candidates {
-		gotKeys = append(gotKeys, candidate.descriptor.Key)
-		if candidate.stdioClient == nil {
-			gotKinds = append(gotKinds, "http")
-		} else {
-			gotKinds = append(gotKinds, "stdio")
-			if candidate.stdioClient.Client != client {
-				t.Fatal("stdio candidate did not retain its client")
-			}
-		}
-	}
-	if want := []string{" alpha ", " beta ", "same", "same", "aardvark"}; !reflect.DeepEqual(gotKeys, want) {
-		t.Fatalf("candidate keys = %#v, want %#v", gotKeys, want)
-	}
-	if want := []string{"stdio", "http", "http", "stdio", "http"}; !reflect.DeepEqual(gotKinds, want) {
-		t.Fatalf("candidate transports = %#v, want %#v", gotKinds, want)
-	}
-}
-
-func TestPluginDescriptorBlankIdentityAndDistributionOwnership(t *testing.T) {
-	isolatePluginRuntime(t)
-
-	blank := mcptypes.ServerDescriptor{
-		Key: " ",
-		CLI: mcptypes.CLIOverlay{
-			ID:      " ",
-			Command: " ",
-			Aliases: []string{"", "  "},
-		},
-	}
-	if claims := pluginDescriptorIdentityClaims(blank); len(claims) != 0 {
-		t.Fatalf("blank descriptor claims = %#v, want none", claims)
-	}
-	if rootName := pluginDescriptorRootName(blank); rootName != "" {
-		t.Fatalf("blank descriptor root = %q", rootName)
-	}
-	owner := &plugin.Plugin{Manifest: plugin.Manifest{Name: "blank"}}
-	accepted := selectPluginServerCandidates(
-		&cobra.Command{Use: "dws"},
-		[]pluginServerCandidate{
-			{owner: owner, descriptor: mcptypes.ServerDescriptor{CLI: mcptypes.CLIOverlay{Skip: true}}},
-			{owner: owner, descriptor: blank},
-		},
-	)
-	if len(accepted) != 1 {
-		t.Fatalf("blank descriptor candidates = %#v, want one accepted candidate", accepted)
-	}
-
-	if distributionRootOwns(nil, "visible") {
-		t.Fatal("nil root claimed a command")
-	}
-	root := &cobra.Command{Use: "dws"}
-	visible := &cobra.Command{Use: "visible", Aliases: []string{" visible-alias "}}
-	hiddenFallback := &cobra.Command{Use: "conference", Hidden: true}
-	hiddenOwned := &cobra.Command{Use: "hidden-owned", Hidden: true}
-	pluginOwned := &cobra.Command{Use: "plugin-owned", Aliases: []string{"plugin-alias"}}
-	cmdutil.MarkPluginSource(pluginOwned)
-	root.AddCommand(visible, hiddenFallback, hiddenOwned, pluginOwned)
-
-	for _, name := range []string{"visible", "visible-alias", "hidden-owned"} {
-		if !distributionRootOwns(root, name) {
-			t.Errorf("distribution root did not claim %q", name)
-		}
-	}
-	for _, name := range []string{"conference", "plugin-owned", "plugin-alias", "missing"} {
-		if distributionRootOwns(root, name) {
-			t.Errorf("distribution root unexpectedly claimed %q", name)
-		}
-	}
-}
-
-func TestReplaceableFallbackIdentitySurvivesDistributionConflictChecks(t *testing.T) {
-	isolatePluginRuntime(t)
-	SetDynamicServers([]mcptypes.ServerDescriptor{
-		{
-			Key:      "conference",
-			Endpoint: "https://example.com/conference/mcp",
-			CLI:      mcptypes.CLIOverlay{ID: "conference"},
-		},
-		{
-			Key:      "chat",
-			Endpoint: "https://example.com/chat/mcp",
-			CLI:      mcptypes.CLIOverlay{ID: "chat"},
-		},
-	})
-
-	root := &cobra.Command{Use: "dws"}
-	root.AddCommand(&cobra.Command{Use: "conference", Hidden: true})
-	distributionProducts := DirectRuntimeProductIDs()
-
-	conferenceDescriptor := mcptypes.ServerDescriptor{
-		Key:         "conference-local",
-		DisplayName: "conference/conference-local",
-		CLI:         mcptypes.CLIOverlay{ID: "conference-local", Command: "conference"},
-	}
-	if pluginDescriptorConflictsWithDistribution(root, conferenceDescriptor, distributionProducts) {
-		t.Fatal("replaceable fallback identity blocked plugin server selection")
-	}
-
-	chatDescriptor := mcptypes.ServerDescriptor{
-		Key:         "chat-local",
-		DisplayName: "chat/chat-local",
-		CLI:         mcptypes.CLIOverlay{ID: "chat-local", Command: "chat"},
-	}
-	if !pluginDescriptorConflictsWithDistribution(root, chatDescriptor, distributionProducts) {
-		t.Fatal("non-replaceable distribution product no longer conflicts")
-	}
-
-	reservedDescriptor := mcptypes.ServerDescriptor{
-		Key:         "auth-local",
-		DisplayName: "auth/auth-local",
-		CLI:         mcptypes.CLIOverlay{ID: "auth-local", Command: "auth"},
-	}
-	if !pluginDescriptorConflictsWithDistribution(root, reservedDescriptor, distributionProducts) {
-		t.Fatal("reserved command name no longer conflicts")
-	}
-
-	first := &plugin.Plugin{Manifest: plugin.Manifest{Name: "conference"}}
-	second := &plugin.Plugin{Manifest: plugin.Manifest{Name: "other"}}
-	accepted := selectPluginServerCandidates(root, []pluginServerCandidate{
-		{owner: first, descriptor: conferenceDescriptor},
-		{
-			owner: second,
-			descriptor: mcptypes.ServerDescriptor{
-				Key:         "conference-other",
-				DisplayName: "other/conference-other",
-				CLI:         mcptypes.CLIOverlay{ID: "conference-other", Command: "conference"},
-			},
-		},
-	})
-	if len(accepted) != 1 {
-		t.Fatalf("accepted candidates = %d, want the first conference plugin only", len(accepted))
-	}
-	if accepted[0].owner != first {
-		t.Fatalf("accepted owner = %q, want the first conference plugin", accepted[0].owner.Manifest.Name)
-	}
-}
-
-func TestAddPluginCommandsSafeFiltersConflictingAliases(t *testing.T) {
-	root := &cobra.Command{Use: "dws"}
-	root.AddCommand(&cobra.Command{Use: "taken"})
-	command := &cobra.Command{
-		Use:     "extension",
-		Aliases: []string{"", "extension", "auth", "taken", "shared", " shared ", " okay "},
-	}
-	addPluginCommandsSafe(root, []*cobra.Command{
-		command,
-		{Use: "shared"},
-		{Use: "other", Aliases: []string{"extension"}},
-	})
-
-	if want := []string{"shared", "okay"}; !reflect.DeepEqual(command.Aliases, want) {
-		t.Fatalf("filtered aliases = %#v, want %#v", command.Aliases, want)
-	}
-	if child := findDirectChild(root, "shared"); child != nil {
-		t.Fatal("an accepted alias was also registered as a plugin primary command")
-	}
-	other := findDirectChild(root, "other")
-	if other == nil || len(other.Aliases) != 0 {
-		t.Fatalf("later plugin aliases = %#v", other)
-	}
-}
-
-func TestStdioRunnerReportsToolsListFailureAndMissingTool(t *testing.T) {
-	isolatePluginRuntime(t)
-	previousInit := runnerStdioEnsureInitialized
-	previousList := runnerStdioListTools
-	previousCall := runnerStdioCallTool
-	t.Cleanup(func() {
-		runnerStdioEnsureInitialized = previousInit
-		runnerStdioListTools = previousList
-		runnerStdioCallTool = previousCall
-	})
-
-	client := transport.NewStdioClient("unused", nil, nil)
-	RegisterStdioClient("plugin/server", client)
-	runnerStdioEnsureInitialized = func(*transport.StdioClient, context.Context) error { return nil }
-	toolCalls := 0
-	runnerStdioCallTool = func(*transport.StdioClient, context.Context, string, map[string]any) (transport.ToolCallResult, error) {
-		toolCalls++
-		return transport.ToolCallResult{}, nil
-	}
-	runner := &runtimeRunner{}
-	invocation := executor.Invocation{CanonicalProduct: "overlay-id", Tool: "wanted"}
-
-	listFailure := errors.New("list failed")
-	runnerStdioListTools = func(*transport.StdioClient, context.Context) (transport.ToolsListResult, error) {
-		return transport.ToolsListResult{}, listFailure
-	}
-	_, err := runner.executeStdioInvocationAtEndpoint(context.Background(), "stdio://plugin/server", invocation)
-	assertPluginRuntimeError(t, err, apperrors.CategoryAPI, "tools/list", "stdio_tools_list_error")
-
-	runnerStdioListTools = func(*transport.StdioClient, context.Context) (transport.ToolsListResult, error) {
-		return transport.ToolsListResult{Tools: []transport.ToolDescriptor{{Name: "other"}}}, nil
-	}
-	_, err = runner.executeStdioInvocationAtEndpoint(context.Background(), "stdio://plugin/server", invocation)
-	assertPluginRuntimeError(t, err, apperrors.CategoryValidation, "", "plugin_tool_not_found")
-	if toolCalls != 0 {
-		t.Fatalf("tools/call attempts after tools/list failures = %d", toolCalls)
-	}
-}
-
-func TestStdioManifestDescriptorAndRegistrationFailClosed(t *testing.T) {
-	isolatePluginRuntime(t)
-	p := &plugin.Plugin{
-		Manifest: plugin.Manifest{
-			Name: "broken-plugin",
-			MCPServers: map[string]*plugin.MCPServer{
-				"local": {CLI: json.RawMessage(`{`)},
-			},
-		},
-	}
-	server := plugin.StdioServerClient{
-		Key:    "local",
-		Client: transport.NewStdioClient("unused", nil, nil),
-	}
-	if descriptor, ok := stdioServerDescriptorFromManifest(p, server); ok || !reflect.ValueOf(descriptor).IsZero() {
-		t.Fatalf("invalid descriptor = (%#v, %v), want zero, false", descriptor, ok)
-	}
-	if descriptor := registerStdioServerFromManifest(p, server); !reflect.ValueOf(descriptor).IsZero() {
-		t.Fatalf("invalid registered descriptor = %#v, want zero", descriptor)
-	}
-	if _, ok := LookupStdioClient("broken-plugin/local"); ok {
-		t.Fatal("invalid stdio manifest registered a client")
-	}
-}
-
-func TestLegacyCommandsContinueWhenUserShortcutLoadFails(t *testing.T) {
-	configDir := t.TempDir()
-	t.Setenv("DWS_CONFIG_DIR", configDir)
-	shortcutDir := filepath.Join(configDir, "shortcuts")
-	if err := os.MkdirAll(shortcutDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(shortcutDir, "broken.yaml"), []byte("version: ["), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	if _, loadErrors := userdef.Load(); len(loadErrors) == 0 {
-		t.Fatal("malformed shortcut fixture did not fail to load")
-	}
-
-	runner := executor.EchoRunner{}
-	caller := newToolCallerAdapter(runner, &GlobalFlags{})
-	if commands := newLegacyPublicCommands(runner, caller, true); len(commands) == 0 {
-		t.Fatal("legacy commands were dropped after a user shortcut load error")
-	}
-}
-
-func findDirectChild(root *cobra.Command, name string) *cobra.Command {
-	for _, command := range root.Commands() {
-		if command.Name() == name {
-			return command
-		}
-	}
-	return nil
-}
-
-func assertPluginRuntimeError(
-	t *testing.T,
-	err error,
-	wantCategory apperrors.Category,
-	wantOperation string,
-	wantReason string,
-) {
-	t.Helper()
-	var appError *apperrors.Error
-	if !errors.As(err, &appError) {
-		t.Fatalf("runtime error = %#v, want structured app error", err)
-	}
-	if appError.Category != wantCategory ||
-		appError.Operation != wantOperation ||
-		appError.Reason != wantReason {
-		t.Fatalf("runtime error = %#v, want category=%q operation=%q reason=%q", appError, wantCategory, wantOperation, wantReason)
-	}
-}

internal/app/plugin_registration_test.go

@@ -5,7 +5,6 @@
 package app
 
 import (
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -13,7 +12,6 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/executor"
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/plugin"
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/transport"
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/mcptypes"
@@ -37,11 +35,6 @@ func isolatePluginRuntime(t *testing.T) {
 	stdioClients = make(map[string]*transport.StdioClient)
 	stdioMu.Unlock()
 
-	pluginAuthMu.Lock()
-	previousPluginAuth := pluginAuthRegistry
-	pluginAuthRegistry = make(map[string]*PluginAuth)
-	pluginAuthMu.Unlock()
-
 	t.Cleanup(func() {
 		StopAllStdioClients()
 		dynamicMu.Lock()
@@ -53,9 +46,6 @@ func isolatePluginRuntime(t *testing.T) {
 		stdioMu.Lock()
 		stdioClients = previousStdio
 		stdioMu.Unlock()
-		pluginAuthMu.Lock()
-		pluginAuthRegistry = previousPluginAuth
-		pluginAuthMu.Unlock()
 	})
 }
 
@@ -87,40 +77,14 @@ func TestRegisterPluginHTTPServerDoesNotProbeEndpoint(t *testing.T) {
 func TestRegisterStdioServerFromManifestDoesNotStartProcess(t *testing.T) {
 	isolatePluginRuntime(t)
 	marker := t.TempDir() + "/started"
-	pluginRoot := t.TempDir()
-	if err := os.WriteFile(pluginRoot+"/overlay.json", []byte(`{
-		"id":"local",
-		"command":"lazy-stdio",
-		"groups":{"health":{"description":"health checks"}},
-		"toolOverrides":{"ping":{"cliName":"ping","group":"health"}}
-	}`), 0o600); err != nil {
-		t.Fatal(err)
-	}
 	client := transport.NewStdioClient("/bin/sh", []string{
 		"-c", fmt.Sprintf("printf started > %q", marker),
 	}, nil)
 	p := &plugin.Plugin{
-		Manifest: plugin.Manifest{
-			Name:        "lazy-stdio",
-			Description: "lazy stdio test",
-			MCPServers: map[string]*plugin.MCPServer{
-				"local": {
-					Type:    "stdio",
-					Command: "unused",
-					CLI:     json.RawMessage(`"overlay.json"`),
-				},
-			},
-		},
-		Root: pluginRoot,
+		Manifest: plugin.Manifest{Name: "lazy-stdio", Description: "lazy stdio test"},
+		Root:     t.TempDir(),
 	}
 	descriptor := registerStdioServerFromManifest(p, plugin.StdioServerClient{Key: "local", Client: client})
-	commands := buildPluginCommands([]mcptypes.ServerDescriptor{descriptor}, executor.EchoRunner{}, nil)
-	root := pluginTestRoot(commands...)
-	root.SetArgs([]string{"lazy-stdio", "--help"})
-	if err := root.Execute(); err != nil {
-		t.Fatalf("lazy stdio help: %v", err)
-	}
-	requirePluginChild(t, commands[0], "health", "ping")
 
 	if _, err := os.Stat(marker); !os.IsNotExist(err) {
 		t.Fatalf("stdio process started during registration: stat error = %v", err)

internal/app/plugin_stdio_overlay.go

@@ -14,7 +14,10 @@
 package app
 
 import (
+	"encoding/json"
 	"log/slog"
+	"os"
+	"path/filepath"
 
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/plugin"
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/mcptypes"
@@ -30,26 +33,50 @@ import (
 // When no CLI metadata is present, a minimal overlay keyed by the server
 // name is returned so callers can still build an identity descriptor.
 func resolveStdioOverlay(p *plugin.Plugin, sc plugin.StdioServerClient) mcptypes.CLIOverlay {
-	overlay, ok := p.ResolveCLIOverlay(sc.Key)
-	if !ok {
-		return mcptypes.CLIOverlay{
-			ID:      sc.Key,
-			Command: sc.Key,
-			Skip:    true,
+	serverID := sc.Key
+	overlay := mcptypes.CLIOverlay{
+		ID:      serverID,
+		Command: serverID,
+	}
+	srv, ok := p.Manifest.MCPServers[sc.Key]
+	if !ok || len(srv.CLI) == 0 {
+		return overlay
+	}
+
+	cliData := srv.CLI
+	// A JSON string is interpreted as a relative path to an external
+	// overlay file (e.g. "overlay.json") anchored at the plugin root.
+	if len(cliData) > 0 && cliData[0] == '"' {
+		var cliPath string
+		if err := json.Unmarshal(cliData, &cliPath); err == nil && cliPath != "" {
+			absPath := filepath.Join(p.Root, cliPath)
+			if fileData, readErr := os.ReadFile(absPath); readErr == nil {
+				cliData = fileData
+			} else {
+				slog.Warn("plugin: failed to read CLI overlay file",
+					"plugin", p.Manifest.Name, "path", absPath, "error", readErr)
+			}
 		}
 	}
+	if err := json.Unmarshal(cliData, &overlay); err != nil {
+		slog.Warn("plugin: failed to parse CLI overlay for stdio server",
+			"plugin", p.Manifest.Name, "server", sc.Key, "error", err)
+	}
+	if overlay.ID == "" {
+		overlay.ID = serverID
+	}
+	if overlay.Command == "" {
+		overlay.Command = serverID
+	}
 	return overlay
 }
 
-func stdioServerDescriptorFromManifest(
-	p *plugin.Plugin,
-	sc plugin.StdioServerClient,
-) (mcptypes.ServerDescriptor, bool) {
-	overlay, ok := p.ResolveCLIOverlay(sc.Key)
-	if !ok {
-		return mcptypes.ServerDescriptor{}, false
-	}
-	return mcptypes.ServerDescriptor{
+// registerStdioServerFromManifest registers an endpoint descriptor and an
+// unstarted client from versioned plugin metadata. Tool discovery is not part
+// of command-tree construction; execution starts and initializes the client.
+func registerStdioServerFromManifest(p *plugin.Plugin, sc plugin.StdioServerClient) mcptypes.ServerDescriptor {
+	overlay := resolveStdioOverlay(p, sc)
+	descriptor := mcptypes.ServerDescriptor{
 		Key:         sc.Key,
 		DisplayName: p.Manifest.Name + "/" + sc.Key,
 		Description: p.Manifest.Description,
@@ -57,30 +84,13 @@ func stdioServerDescriptorFromManifest(
 		Source:      "plugin",
 		CLI:         overlay,
 		HasCLIMeta:  true,
-	}, true
-}
+	}
 
-func registerResolvedStdioServer(
-	p *plugin.Plugin,
-	sc plugin.StdioServerClient,
-	descriptor mcptypes.ServerDescriptor,
-) {
 	AppendDynamicServer(descriptor)
 	RegisterStdioClient(p.Manifest.Name+"/"+sc.Key, sc.Client)
 
 	slog.Debug("plugin: stdio server registered from manifest",
 		"plugin", p.Manifest.Name, "server", sc.Key,
-		"toolOverrides", len(descriptor.CLI.ToolOverrides))
-}
-
-// registerStdioServerFromManifest registers an endpoint descriptor and an
-// unstarted client from versioned plugin metadata. Tool discovery is not part
-// of command-tree construction; execution starts and initializes the client.
-func registerStdioServerFromManifest(p *plugin.Plugin, sc plugin.StdioServerClient) mcptypes.ServerDescriptor {
-	descriptor, ok := stdioServerDescriptorFromManifest(p, sc)
-	if !ok {
-		return mcptypes.ServerDescriptor{}
-	}
-	registerResolvedStdioServer(p, sc, descriptor)
+		"toolOverrides", len(overlay.ToolOverrides))
 	return descriptor
 }

internal/app/profile_command.go

@@ -266,7 +266,7 @@ func selectProfileSwitchProfile(cmd *cobra.Command, configDir string) (string, e
 	}
 	choice := strings.TrimSpace(cfg.CurrentProfile)
 	if choice == "" {
-		choice = authpkg.ProfileSelectionSelector(cfg.Profiles[0], cfg)
+		choice = authpkg.ProfileSelector(cfg.Profiles[0])
 	}
 	return profileSwitchTUIRunner(cmd, cfg, choice)
 }
@@ -428,36 +428,11 @@ func (m profileSwitchTUIModel) selectedCorpID() string {
 	if m.selected < 0 || m.selected >= len(m.profiles) {
 		return ""
 	}
-	selected := m.profiles[m.selected]
-	return authpkg.ProfileSelectionSelector(selected, &authpkg.ProfilesConfig{Profiles: m.profiles})
+	return authpkg.ProfileSelector(m.profiles[m.selected])
 }
 
 func profileSwitchProfileIndex(profiles []authpkg.Profile, selector string, cfg *authpkg.ProfilesConfig) int {
 	selector = strings.TrimSpace(selector)
-	for i, profile := range profiles {
-		if authpkg.ProfileSelectionSelector(profile, cfg) == selector {
-			return i
-		}
-	}
-	// Accept an old current/previous pointer long enough for the migration path
-	// to canonicalize it. Only an unresolved profile in a multi-account
-	// organization qualifies, so ordinary exact account names cannot capture an
-	// identity selector that contains ':'.
-	legacyBlank := -1
-	for i, profile := range profiles {
-		if strings.TrimSpace(profile.UserID) != "" || strings.TrimSpace(profile.Name) != selector ||
-			profileCountForCorp(cfg, profile.CorpID) <= 1 {
-			continue
-		}
-		if legacyBlank >= 0 {
-			legacyBlank = -1
-			break
-		}
-		legacyBlank = i
-	}
-	if legacyBlank >= 0 {
-		return legacyBlank
-	}
 	if corpID, userID, exact := authpkg.ParseIdentitySelector(selector); exact {
 		for i, p := range profiles {
 			if strings.TrimSpace(p.CorpID) == corpID && strings.TrimSpace(p.UserID) == userID {
@@ -468,9 +443,6 @@ func profileSwitchProfileIndex(profiles []authpkg.Profile, selector string, cfg
 	}
 	fallback := -1
 	for i, p := range profiles {
-		if strings.TrimSpace(p.UserID) == "" && strings.TrimSpace(p.Name) == selector {
-			return i
-		}
 		if strings.TrimSpace(p.CorpID) == selector {
 			if fallback < 0 {
 				fallback = i
@@ -514,7 +486,7 @@ func profileSwitchProfileCells(p authpkg.Profile, cfg *authpkg.ProfilesConfig) (
 }
 
 func profileSwitchProfileStatus(p authpkg.Profile, cfg *authpkg.ProfilesConfig) string {
-	if cfg != nil && profileSelectorSelectsProfile(cfg.CurrentProfile, p, cfg, profileIsOrgCurrent(p, cfg), profileCountForCorp(cfg, p.CorpID) <= 1) {
+	if cfg != nil && profileSelectorSelectsProfile(cfg.CurrentProfile, p, profileIsOrgCurrent(p, cfg), profileCountForCorp(cfg, p.CorpID) <= 1) {
 		return "当前组织"
 	}
 	return ""
@@ -664,14 +636,13 @@ func writeProfileListTable(w io.Writer, configDir string, cfg *authpkg.ProfilesC
 	}
 	fmt.Fprintf(w, "%-3s %-28s %-34s %-10s %s\n", "CUR", "ORG_NAME", "CORP_ID", "STATUS", "USER")
 	for _, p := range cfg.Profiles {
-		selector := profileCLISelector(p, cfg)
 		view := profileViewFromProfile(
 			p,
 			cfg,
 			cfg.PrimaryProfile,
 			cfg.CurrentProfile,
 			profileCountForCorp(cfg, p.CorpID) == 1,
-			loadProfileTokenState(configDir, p, selector),
+			loadProfileTokenState(configDir, p),
 		)
 		current := ""
 		if view.IsCurrent {
@@ -727,14 +698,13 @@ func profileViews(configDir string, cfg *authpkg.ProfilesConfig) []profileView {
 	}
 	views := make([]profileView, 0, len(cfg.Profiles))
 	for _, p := range cfg.Profiles {
-		selector := profileCLISelector(p, cfg)
 		views = append(views, profileViewFromProfile(
 			p,
 			cfg,
 			cfg.PrimaryProfile,
 			cfg.CurrentProfile,
 			profileCountForCorp(cfg, p.CorpID) == 1,
-			loadProfileTokenState(configDir, p, selector),
+			loadProfileTokenState(configDir, p),
 		))
 	}
 	return views
@@ -749,7 +719,7 @@ func profileViewFromProfile(
 ) profileView {
 	isOrgCurrent := profileIsOrgCurrent(p, cfg)
 	view := profileView{
-		Profile:           profileCLISelector(p, cfg),
+		Profile:           authpkg.ProfileSelector(p),
 		CorpID:            p.CorpID,
 		CorpName:          profileOrgName(p),
 		UserID:            p.UserID,
@@ -761,8 +731,8 @@ func profileViewFromProfile(
 		RefreshExpAt:      p.RefreshExpAt,
 		LastLoginAt:       p.LastLoginAt,
 		LastUsedAt:        p.LastUsedAt,
-		IsPrimary:         profileSelectorSelectsProfile(primaryProfile, p, cfg, isOrgCurrent, onlyAccountInOrg),
-		IsCurrent:         profileSelectorSelectsProfile(currentProfile, p, cfg, isOrgCurrent, onlyAccountInOrg),
+		IsPrimary:         profileSelectorSelectsProfile(primaryProfile, p, isOrgCurrent, onlyAccountInOrg),
+		IsCurrent:         profileSelectorSelectsProfile(currentProfile, p, isOrgCurrent, onlyAccountInOrg),
 		IsOrgCurrent:      isOrgCurrent,
 	}
 	if tokenState != nil {
@@ -773,12 +743,8 @@ func profileViewFromProfile(
 	return view
 }
 
-func loadProfileTokenState(configDir string, profile authpkg.Profile, selectors ...string) *profileTokenState {
-	selector := authpkg.ProfileSelector(profile)
-	if len(selectors) > 0 && strings.TrimSpace(selectors[0]) != "" {
-		selector = strings.TrimSpace(selectors[0])
-	}
-	data, err := profileLoadTokenData(configDir, selector)
+func loadProfileTokenState(configDir string, profile authpkg.Profile) *profileTokenState {
+	data, err := profileLoadTokenData(configDir, authpkg.ProfileSelector(profile))
 	if errors.Is(err, authpkg.ErrTokenDataNotFound) || (err == nil && data == nil) {
 		return &profileTokenState{Status: authpkg.ProfileStatusRevoked}
 	}
@@ -796,10 +762,6 @@ func loadProfileTokenState(configDir string, profile authpkg.Profile, selectors
 	}
 }
 
-func profileCLISelector(profile authpkg.Profile, cfg *authpkg.ProfilesConfig) string {
-	return authpkg.ProfileSelectionSelector(profile, cfg)
-}
-
 func profileTokenTime(value time.Time) string {
 	if value.IsZero() {
 		return ""
@@ -807,11 +769,8 @@ func profileTokenTime(value time.Time) string {
 	return value.Format(time.RFC3339)
 }
 
-func profileSelectorSelectsProfile(selector string, profile authpkg.Profile, cfg *authpkg.ProfilesConfig, isOrgCurrent, onlyAccountInOrg bool) bool {
+func profileSelectorSelectsProfile(selector string, profile authpkg.Profile, isOrgCurrent, onlyAccountInOrg bool) bool {
 	selector = strings.TrimSpace(selector)
-	if selector == authpkg.ProfileSelectionSelector(profile, cfg) {
-		return true
-	}
 	if corpID, userID, exact := authpkg.ParseIdentitySelector(selector); exact {
 		return corpID == strings.TrimSpace(profile.CorpID) && userID == strings.TrimSpace(profile.UserID)
 	}

internal/app/recovery_command.go

@@ -333,11 +333,7 @@ func (r *recoveryRuntime) CallToolDirect(ctx context.Context, serverID, toolName
 	if err != nil {
 		return nil, err
 	}
-	authToken, err := resolveRuntimeAuthToken(ctx, recoveryRuntimeToken(r.flags))
-	if err != nil {
-		return nil, tokenResolutionError(err)
-	}
-	tc := r.transport.WithAuth(authToken, resolveIdentityHeaders())
+	tc := r.transport.WithAuth(resolveRuntimeAuthToken(ctx, recoveryRuntimeToken(r.flags)), resolveIdentityHeaders())
 	result, err := tc.CallTool(ctx, endpoint, toolName, args)
 	if err != nil {
 		return nil, err

internal/app/root.go

@@ -23,7 +23,6 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
-	"sort"
 	"strings"
 	"sync"
 	"syscall"
@@ -70,8 +69,7 @@ var (
 	rootPluginDescriptors           = (*plugin.Plugin).ToServerDescriptors
 	rootPluginStdioClients          = (*plugin.Plugin).StdioClients
 	rootRegisterPluginHTTPServer    = registerPluginHTTPServer
-	rootPluginStdioDescriptor       = stdioServerDescriptorFromManifest
-	rootRegisterResolvedStdioServer = registerResolvedStdioServer
+	rootRegisterStdioManifest       = registerStdioServerFromManifest
 	rootPluginLoadHooks             = (*plugin.Plugin).LoadHooks
 	rootPluginSyncSkills            = plugin.SyncSkills
 	rootAuthLoadTokenData           = authpkg.LoadTokenData
@@ -308,28 +306,13 @@ func NewRootCommand(ctx ...context.Context) *cobra.Command {
 	if len(ctx) > 0 && ctx[0] != nil {
 		rootCtx = ctx[0]
 	}
-	return newRootCommandWithEngine(rootCtx, nil, true)
-}
-
-// NewSchemaSourceRootCommand constructs the distribution-owned command tree
-// used by Schema generation and command-surface policy. Installed plugins and
-// user-defined shortcuts must not change the reviewed embedded Schema.
-func NewSchemaSourceRootCommand(ctx ...context.Context) *cobra.Command {
-	var rootCtx context.Context
-	if len(ctx) > 0 && ctx[0] != nil {
-		rootCtx = ctx[0]
-	}
-	return newRootCommandWithEngine(rootCtx, nil, false)
+	return NewRootCommandWithEngine(rootCtx, nil)
 }
 
 // NewRootCommandWithEngine constructs the root CLI command with an
 // optional pipeline engine for input correction. When engine is nil,
 // no pipeline processing is applied.
 func NewRootCommandWithEngine(rootCtx context.Context, engine *pipeline.Engine) *cobra.Command {
-	return newRootCommandWithEngine(rootCtx, engine, true)
-}
-
-func newRootCommandWithEngine(rootCtx context.Context, engine *pipeline.Engine, loadRuntimeExtensions bool) *cobra.Command {
 	if rootCtx == nil {
 		rootCtx = context.Background()
 	}
@@ -385,16 +368,11 @@ func newRootCommandWithEngine(rootCtx context.Context, engine *pipeline.Engine,
 
 	schemaCmd := newSchemaCommand(loader)
 	mcpCmd := newMCPCommand(rootCtx, loader, runner, engine)
-	// The legacy dynamic MCP surface remains disabled, but reviewed static MCP
-	// helpers registered below are part of the public CLI and Schema surface.
-	mcpCmd.Hidden = false
-	mcpCmd.Short = "管理 MCP 服务连接信息"
-	mcpCmd.Long = "管理经过审核并纳入 Schema 的 MCP 服务连接辅助能力。"
+	mcpCmd.Hidden = true
 	// Wrap the caller so every MCP tool call's shape is recorded to the local
 	// usage log (privacy-preserving; see internal/shortcut/usage). Powers
 	// `dws shortcut stats` and future high-frequency shortcut distillation.
 	patCaller := newRecordingToolCaller(newToolCallerAdapter(runner, flags))
-	mcpCmd.AddCommand(newMCPURLGroup(patCaller))
 
 	utilityCommands := []*cobra.Command{
 		newAuthCommand(patCaller),
@@ -418,9 +396,16 @@ func newRootCommandWithEngine(rootCtx context.Context, engine *pipeline.Engine,
 	}
 	root.AddCommand(utilityCommands...)
 
-	root.AddCommand(newLegacyPublicCommands(runner, patCaller, loadRuntimeExtensions)...)
+	root.AddCommand(newLegacyPublicCommands(runner, patCaller)...)
 	root.AddCommand(newLegacyHiddenCommands(runner)...)
 
+	// --- Plugin loading: runs AFTER legacy commands so plugin endpoints can
+	// be appended on top of the static endpoint registry.
+	pluginCmds := rootLoadPlugins(engine, runner)
+	if len(pluginCmds) > 0 {
+		addPluginCommandsSafe(root, pluginCmds)
+	}
+
 	// PAT authorization commands (open-source core)
 	pat.RegisterCommands(root, patCaller)
 
@@ -429,15 +414,6 @@ func newRootCommandWithEngine(rootCtx context.Context, engine *pipeline.Engine,
 		fn(root, caller)
 		deduplicateCommands(root)
 	}
-	if loadRuntimeExtensions {
-		// Resolve plugins only after the complete distribution command tree is
-		// present, so endpoint and Cobra conflict checks see PAT and edition
-		// commands as well as the open-source base.
-		pluginCmds := rootLoadPlugins(root, engine, runner)
-		if len(pluginCmds) > 0 {
-			addPluginCommandsSafe(root, pluginCmds)
-		}
-	}
 	hideNonDirectRuntimeCommands(root)
 	configureRootHelp(root)
 	// Set custom flag error handler for better UX
@@ -624,7 +600,6 @@ func hideNonDirectRuntimeCommands(root *cobra.Command) {
 		"profile":    true,
 		"version":    true,
 		"help":       true,
-		"markdown":   true,
 		"recovery":   true,
 		"schema":     true,
 		"mcp":        true,
@@ -656,17 +631,12 @@ var reservedCommands = map[string]bool{
 	"schema": true, "mcp": true, "help": true,
 }
 
-var replaceablePluginFallbacks = map[string]bool{
-	"conference": true,
-}
-
 // addPluginCommandsSafe registers plugin commands with conflict detection.
 //
 // Rules:
 //   - Plugin vs reserved (auth/plugin/cache/...) → reject, warn
 //   - Plugin vs plugin (same name)               → reject later one, warn
-//   - Plugin vs hidden compatibility fallback     → allow, plugin wins
-//   - Plugin vs visible distribution command      → reject, warn
+//   - Plugin vs Market dynamic command            → allow, plugin wins
 func addPluginCommandsSafe(root *cobra.Command, pluginCmds []*cobra.Command) {
 	// Build index of existing commands before plugin registration.
 	existing := make(map[string]bool)
@@ -694,47 +664,17 @@ func addPluginCommandsSafe(root *cobra.Command, pluginCmds []*cobra.Command) {
 		}
 		pluginSeen[name] = true
 
-		// An alias must not bypass the same protections applied to primary
-		// plugin command names or shadow another root command.
-		filteredAliases := make([]string, 0, len(cmd.Aliases))
-		for _, rawAlias := range cmd.Aliases {
-			alias := strings.TrimSpace(rawAlias)
-			if alias == "" || alias == name || reservedCommands[alias] ||
-				existing[alias] || pluginSeen[alias] {
-				if alias != "" {
-					slog.Warn("plugin: command alias conflicts with an existing command, skipping",
-						"command", name, "alias", alias)
-				}
-				continue
-			}
-			pluginSeen[alias] = true
-			filteredAliases = append(filteredAliases, alias)
-		}
-		cmd.Aliases = filteredAliases
-
-		// Rule 3: an installed plugin may replace a hidden compatibility
-		// fallback (for example conference), but never a visible distribution
-		// command that participates in the reviewed base interface.
+		// Rule 3: plugin vs Market — plugin wins, remove the old one.
 		if existing[name] {
 			for _, old := range root.Commands() {
 				if old.Name() == name {
-					if !old.Hidden || !replaceablePluginFallbacks[name] ||
-						cmdutil.IsPluginSourced(old) {
-						slog.Warn("plugin: command conflicts with a visible distribution command, skipping",
-							"command", name)
-						cmd = nil
-						break
-					}
 					root.RemoveCommand(old)
-					slog.Debug("plugin: overriding hidden compatibility command",
+					slog.Debug("plugin: overriding Market command",
 						"command", name)
 					break
 				}
 			}
 		}
-		if cmd == nil {
-			continue
-		}
 
 		root.AddCommand(cmd)
 	}
@@ -871,21 +811,7 @@ func CloseFileLogger() {
 // loadPlugins registers versioned plugin manifests, stdio clients, hooks, and
 // skills. It deliberately does not initialize MCP transports or call
 // tools/list while constructing the command tree.
-type pluginServerCandidate struct {
-	owner       *plugin.Plugin
-	order       int
-	descriptor  mcptypes.ServerDescriptor
-	stdioClient *plugin.StdioServerClient
-}
-
-type pluginIdentityOwner struct {
-	plugin    *plugin.Plugin
-	serverKey string
-	rootName  string
-	shareable bool
-}
-
-func loadPlugins(root *cobra.Command, engine *pipeline.Engine, runner executor.Runner) []*cobra.Command {
+func loadPlugins(engine *pipeline.Engine, _ executor.Runner) []*cobra.Command {
 	pluginLoader := plugin.NewLoader(RawVersion())
 
 	// 0a. Inject plugin config values from settings.json as environment
@@ -912,34 +838,25 @@ func loadPlugins(root *cobra.Command, engine *pipeline.Engine, runner executor.R
 
 	// 2. Load dev plugins (registered via `dws plugin dev`)
 	devPlugins := rootPluginLoadDev(pluginLoader)
-	sortPluginsForRegistration(userPlugins)
-	sortPluginsForRegistration(devPlugins)
 
 	allPlugins := append(userPlugins, devPlugins...)
-	descriptorsByPlugin := make(map[*plugin.Plugin][]mcptypes.ServerDescriptor, len(allPlugins))
 
-	// 3. Resolve every descriptor once, then choose identity winners before
-	// mutating endpoint, auth, or stdio-client registries. This keeps the
-	// visible command and its transport owned by the same plugin.
-	candidates := collectPluginServerCandidates(allPlugins, userCtx)
-	accepted := selectPluginServerCandidates(root, candidates)
-	for _, candidate := range accepted {
-		if candidate.stdioClient != nil {
-			rootRegisterResolvedStdioServer(
-				candidate.owner,
-				*candidate.stdioClient,
-				candidate.descriptor,
-			)
-		} else {
-			rootRegisterPluginHTTPServer(candidate.descriptor)
+	// 3. Register HTTP descriptors and authentication from the manifest.
+	for _, p := range allPlugins {
+		for _, srv := range rootPluginDescriptors(p) {
+			rootRegisterPluginHTTPServer(srv)
 		}
-		descriptorsByPlugin[candidate.owner] = append(
-			descriptorsByPlugin[candidate.owner],
-			candidate.descriptor,
-		)
 	}
 
-	// 4. Register plugin hooks into pipeline engine
+	// 4. Register stdio descriptors and unstarted clients. The subprocess is
+	// started and initialized only when a command is actually executed.
+	for _, p := range allPlugins {
+		for _, sc := range rootPluginStdioClients(p, userCtx) {
+			rootRegisterStdioManifest(p, sc)
+		}
+	}
+
+	// 5. Register plugin hooks into pipeline engine
 	if engine != nil {
 		for _, p := range allPlugins {
 			hooksCfg, err := rootPluginLoadHooks(p)
@@ -957,7 +874,7 @@ func loadPlugins(root *cobra.Command, engine *pipeline.Engine, runner executor.R
 		}
 	}
 
-	// 5. Sync plugin skills to agent directories
+	// 7. Sync plugin skills to agent directories
 	rootPluginSyncSkills(allPlugins)
 
 	if len(allPlugins) > 0 {
@@ -967,228 +884,11 @@ func loadPlugins(root *cobra.Command, engine *pipeline.Engine, runner executor.R
 		)
 	}
 
-	var pluginCommands []*cobra.Command
-	for _, p := range allPlugins {
-		// Build each plugin independently. addPluginCommandsSafe deliberately
-		// resolves cross-plugin root conflicts with first-plugin-wins semantics.
-		pluginCommands = append(pluginCommands, buildPluginCommands(descriptorsByPlugin[p], runner, root)...)
-	}
-	return pluginCommands
-}
-
-func sortPluginsForRegistration(plugins []*plugin.Plugin) {
-	sort.SliceStable(plugins, func(i, j int) bool {
-		left := strings.TrimSpace(plugins[i].Manifest.Name) + "\x00" + strings.TrimSpace(plugins[i].Root)
-		right := strings.TrimSpace(plugins[j].Manifest.Name) + "\x00" + strings.TrimSpace(plugins[j].Root)
-		return left < right
-	})
-}
-
-func collectPluginServerCandidates(
-	plugins []*plugin.Plugin,
-	userCtx *plugin.UserContext,
-) []pluginServerCandidate {
-	var candidates []pluginServerCandidate
-	for order, owner := range plugins {
-		for _, descriptor := range rootPluginDescriptors(owner) {
-			candidates = append(candidates, pluginServerCandidate{
-				owner:      owner,
-				order:      order,
-				descriptor: descriptor,
-			})
-		}
-		for _, stdioClient := range rootPluginStdioClients(owner, userCtx) {
-			descriptor, ok := rootPluginStdioDescriptor(owner, stdioClient)
-			if !ok {
-				continue
-			}
-			clientCopy := stdioClient
-			candidates = append(candidates, pluginServerCandidate{
-				owner:       owner,
-				order:       order,
-				descriptor:  descriptor,
-				stdioClient: &clientCopy,
-			})
-		}
-	}
-	sort.SliceStable(candidates, func(i, j int) bool {
-		if candidates[i].order != candidates[j].order {
-			return candidates[i].order < candidates[j].order
-		}
-		left := strings.TrimSpace(candidates[i].descriptor.Key)
-		right := strings.TrimSpace(candidates[j].descriptor.Key)
-		if left != right {
-			return left < right
-		}
-		return candidates[i].stdioClient == nil && candidates[j].stdioClient != nil
-	})
-	return candidates
-}
-
-func selectPluginServerCandidates(
-	root *cobra.Command,
-	candidates []pluginServerCandidate,
-) []pluginServerCandidate {
-	distributionProducts := DirectRuntimeProductIDs()
-	owners := make(map[string]pluginIdentityOwner)
-	for identity := range distributionProducts {
-		if replaceablePluginFallbacks[identity] {
-			continue
-		}
-		owners[identity] = pluginIdentityOwner{serverKey: "distribution"}
-	}
-
-	accepted := make([]pluginServerCandidate, 0, len(candidates))
-	for _, candidate := range candidates {
-		descriptor := candidate.descriptor
-		if descriptor.CLI.Skip {
-			continue
-		}
-		if reason := unsupportedPluginDescriptor(root, descriptor); reason != "" {
-			slog.Warn("plugin: descriptor CLI semantics are unsupported, skipping",
-				"plugin", candidate.owner.Manifest.Name,
-				"server", descriptor.Key,
-				"field", reason)
-			continue
-		}
-		if pluginDescriptorConflictsWithDistribution(root, descriptor, distributionProducts) {
-			continue
-		}
-		claims := pluginDescriptorIdentityClaims(descriptor)
-		conflict := ""
-		for identity, shareable := range claims {
-			existing, exists := owners[identity]
-			if !exists {
-				continue
-			}
-			rootName := pluginDescriptorRootName(descriptor)
-			if shareable && existing.shareable &&
-				existing.plugin == candidate.owner &&
-				existing.rootName == rootName {
-				continue
-			}
-			conflict = identity
-			break
-		}
-		if conflict != "" {
-			slog.Warn("plugin: descriptor identity already owned, skipping",
-				"plugin", candidate.owner.Manifest.Name,
-				"server", descriptor.Key,
-				"identity", conflict)
-			continue
-		}
-		rootName := pluginDescriptorRootName(descriptor)
-		for identity, shareable := range claims {
-			if existing, exists := owners[identity]; exists &&
-				shareable && existing.shareable &&
-				existing.plugin == candidate.owner &&
-				existing.rootName == rootName {
-				continue
-			}
-			owners[identity] = pluginIdentityOwner{
-				plugin:    candidate.owner,
-				serverKey: descriptor.Key,
-				rootName:  rootName,
-				shareable: shareable,
-			}
-		}
-		accepted = append(accepted, candidate)
-	}
-	return accepted
-}
-
-func pluginDescriptorIdentityClaims(descriptor mcptypes.ServerDescriptor) map[string]bool {
-	claims := make(map[string]bool)
-	canonicalID := firstNonEmptyPluginString(descriptor.CLI.ID, descriptor.Key)
-	if canonicalID != "" {
-		claims[canonicalID] = false
-	}
-	for _, identity := range append(
-		[]string{pluginDescriptorRootName(descriptor)},
-		descriptor.CLI.Aliases...,
-	) {
-		identity = strings.TrimSpace(identity)
-		if identity == "" {
-			continue
-		}
-		if _, exists := claims[identity]; !exists {
-			claims[identity] = true
-		}
-	}
-	return claims
-}
-
-func pluginDescriptorRootName(descriptor mcptypes.ServerDescriptor) string {
-	return firstNonEmptyPluginString(
-		descriptor.CLI.Command,
-		descriptor.CLI.ID,
-		descriptor.Key,
-	)
-}
-
-func pluginDescriptorConflictsWithDistribution(
-	root *cobra.Command,
-	descriptor mcptypes.ServerDescriptor,
-	distributionProducts map[string]bool,
-) bool {
-	candidates := append(
-		[]string{
-			firstNonEmptyPluginString(descriptor.CLI.ID, descriptor.Key),
-			pluginDescriptorRootName(descriptor),
-		},
-		descriptor.CLI.Aliases...,
-	)
-	for _, candidate := range candidates {
-		candidate = strings.TrimSpace(candidate)
-		if candidate == "" {
-			continue
-		}
-		if !reservedCommands[candidate] && replaceablePluginFallbacks[candidate] {
-			// The distribution ships only a hidden compatibility fallback for
-			// this name; plugins may claim it and the later command merge in
-			// addPluginCommandsSafe still rejects visible non-fallback owners.
-			continue
-		}
-		if reservedCommands[candidate] ||
-			distributionProducts[candidate] ||
-			distributionRootOwns(root, candidate) {
-			slog.Warn("plugin: descriptor conflicts with a distribution command, skipping",
-				"plugin", descriptor.DisplayName,
-				"server", descriptor.Key,
-				"identity", candidate)
-			return true
-		}
-	}
-	return false
-}
-
-func distributionRootOwns(root *cobra.Command, name string) bool {
-	if root == nil {
-		return false
-	}
-	for _, command := range root.Commands() {
-		if cmdutil.IsPluginSourced(command) {
-			continue
-		}
-		if command.Name() == name {
-			if command.Hidden && replaceablePluginFallbacks[name] {
-				return false
-			}
-			return true
-		}
-		for _, alias := range command.Aliases {
-			if strings.TrimSpace(alias) == name {
-				return true
-			}
-		}
-	}
-	return false
+	return nil
 }
 
 func registerPluginHTTPServer(srv mcptypes.ServerDescriptor) {
 	AppendDynamicServer(srv)
-	productID := firstNonEmptyPluginString(srv.CLI.ID, srv.Key)
-	ClearPluginAuth(productID)
 	if len(srv.AuthHeaders) > 0 {
 		registerPluginAuthFromHeaders(srv)
 	}
@@ -1217,7 +917,10 @@ func registerPluginAuthFromHeaders(srv mcptypes.ServerDescriptor) {
 		host := parsed.Hostname()
 		trustedDomains = []string{host, "*." + host}
 	}
-	productID := firstNonEmptyPluginString(srv.CLI.ID, srv.Key)
+	productID := strings.TrimSpace(srv.CLI.ID)
+	if productID == "" {
+		productID = srv.Key
+	}
 	RegisterPluginAuth(productID, &PluginAuth{
 		Token:          authToken,
 		ExtraHeaders:   extraHeaders,

internal/app/root_full_coverage_test.go

@@ -75,7 +75,7 @@ func TestCrossPlatformCoverageRootConstructionHooksAndVersionCoverage(t *testing
 		version, buildTime, gitCommit = oldVersion, oldBuild, oldCommit
 	})
 
-	rootLoadPlugins = func(*cobra.Command, *pipeline.Engine, executor.Runner) []*cobra.Command {
+	rootLoadPlugins = func(*pipeline.Engine, executor.Runner) []*cobra.Command {
 		return []*cobra.Command{{Use: "plugin-added", Run: func(*cobra.Command, []string) {}}}
 	}
 	preRunCalled := false
@@ -236,8 +236,7 @@ func TestCrossPlatformCoverageRootLoadPluginsRemainingCoverage(t *testing.T) {
 	oldDescriptors := rootPluginDescriptors
 	oldStdioClients := rootPluginStdioClients
 	oldHTTP := rootRegisterPluginHTTPServer
-	oldStdioDescriptor := rootPluginStdioDescriptor
-	oldStdioRegister := rootRegisterResolvedStdioServer
+	oldStdio := rootRegisterStdioManifest
 	oldHooks := rootPluginLoadHooks
 	oldSync := rootPluginSyncSkills
 	oldToken := rootAuthLoadTokenData
@@ -248,8 +247,7 @@ func TestCrossPlatformCoverageRootLoadPluginsRemainingCoverage(t *testing.T) {
 		rootPluginDescriptors = oldDescriptors
 		rootPluginStdioClients = oldStdioClients
 		rootRegisterPluginHTTPServer = oldHTTP
-		rootPluginStdioDescriptor = oldStdioDescriptor
-		rootRegisterResolvedStdioServer = oldStdioRegister
+		rootRegisterStdioManifest = oldStdio
 		rootPluginLoadHooks = oldHooks
 		rootPluginSyncSkills = oldSync
 		rootAuthLoadTokenData = oldToken
@@ -266,17 +264,9 @@ func TestCrossPlatformCoverageRootLoadPluginsRemainingCoverage(t *testing.T) {
 	}
 	rootPluginDescriptors = func(p *plugin.Plugin) []mcptypes.ServerDescriptor {
 		if p == p1 {
-			return []mcptypes.ServerDescriptor{{
-				Key: "http", Endpoint: "https://example.test",
-				CLI: mcptypes.CLIOverlay{
-					ID: "http", Command: "one-http",
-					ToolOverrides: map[string]mcptypes.CLIToolOverride{
-						"ping": {CLIName: "ping"},
-					},
-				},
-			}}
+			return []mcptypes.ServerDescriptor{{Key: "http", Endpoint: "https://example.test"}}
 		}
-		return []mcptypes.ServerDescriptor{{Key: p.Manifest.Name + "-no-cli", Endpoint: "https://example.test"}}
+		return []mcptypes.ServerDescriptor{{Key: "no-cli", Endpoint: "https://example.test"}}
 	}
 	client := transport.NewStdioClient("ignored", nil, nil)
 	rootPluginStdioClients = func(p *plugin.Plugin, uc *plugin.UserContext) []plugin.StdioServerClient {
@@ -288,23 +278,9 @@ func TestCrossPlatformCoverageRootLoadPluginsRemainingCoverage(t *testing.T) {
 	httpCount := 0
 	stdioCount := 0
 	rootRegisterPluginHTTPServer = func(mcptypes.ServerDescriptor) { httpCount++ }
-	rootPluginStdioDescriptor = func(*plugin.Plugin, plugin.StdioServerClient) (mcptypes.ServerDescriptor, bool) {
-		return mcptypes.ServerDescriptor{
-			Key: "local",
-			CLI: mcptypes.CLIOverlay{
-				ID: "local", Command: "one-stdio",
-				ToolOverrides: map[string]mcptypes.CLIToolOverride{
-					"pong": {CLIName: "pong"},
-				},
-			},
-		}, true
-	}
-	rootRegisterResolvedStdioServer = func(
-		*plugin.Plugin,
-		plugin.StdioServerClient,
-		mcptypes.ServerDescriptor,
-	) {
+	rootRegisterStdioManifest = func(*plugin.Plugin, plugin.StdioServerClient) mcptypes.ServerDescriptor {
 		stdioCount++
+		return mcptypes.ServerDescriptor{}
 	}
 	rootPluginLoadHooks = func(p *plugin.Plugin) (*plugin.HooksConfig, error) {
 		switch p {
@@ -318,8 +294,7 @@ func TestCrossPlatformCoverageRootLoadPluginsRemainingCoverage(t *testing.T) {
 	}
 	synced := false
 	rootPluginSyncSkills = func([]*plugin.Plugin) { synced = true }
-	got := loadPlugins(nil, pipeline.NewEngine(), runnerCoverageFallback{})
-	if len(got) != 2 || got[0].Name() != "one-http" || got[1].Name() != "one-stdio" {
+	if got := loadPlugins(pipeline.NewEngine(), runnerCoverageFallback{}); got != nil {
 		t.Fatalf("loaded plugin commands = %#v", got)
 	}
 	if httpCount != 3 || stdioCount != 1 || !synced {

internal/app/root_help_test.go

@@ -15,14 +15,11 @@ package app
 
 import (
 	"bytes"
-	stderrors "errors"
 	"io"
 	"os"
-	"path/filepath"
 	"strings"
 	"testing"
 
-	apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/edition"
 	"github.com/spf13/cobra"
 )
@@ -78,14 +75,7 @@ func TestRootKeepsMainBranchChatCompatibilityCommands(t *testing.T) {
 		}
 	}
 
-	mediaGroup := mustFindCommand(t, root, "chat", "media")
-	if mediaGroup.Deprecated == "" || mediaGroup.Hidden || !mediaGroup.Runnable() {
-		t.Fatalf("chat media compatibility contract: deprecated=%q hidden=%v runnable=%v", mediaGroup.Deprecated, mediaGroup.Hidden, mediaGroup.Runnable())
-	}
-	mediaUpload := mustFindCommand(t, mediaGroup, "upload")
-	if mediaUpload.Deprecated == "" || mediaUpload.Hidden || !mediaUpload.Runnable() {
-		t.Fatalf("chat media upload compatibility contract: deprecated=%q hidden=%v runnable=%v", mediaUpload.Deprecated, mediaUpload.Hidden, mediaUpload.Runnable())
-	}
+	mediaUpload := mustFindCommand(t, root, "chat", "media", "upload")
 	for _, flag := range []string{"file", "type"} {
 		if mediaUpload.Flags().Lookup(flag) == nil {
 			t.Fatalf("chat media upload missing --%s", flag)
@@ -98,113 +88,6 @@ func TestRootKeepsMainBranchChatCompatibilityCommands(t *testing.T) {
 	mustFindCommand(t, root, "conference", "meeting", "reserve")
 }
 
-func TestChatHelpAndSchemaHideRetiredMediaUpload(t *testing.T) {
-	for _, args := range [][]string{
-		{"chat", "--help"},
-		{"chat", "media", "--help"},
-	} {
-		root := NewRootCommand()
-		var output bytes.Buffer
-		root.SetOut(&output)
-		root.SetErr(&output)
-		root.SetArgs(args)
-		if err := root.Execute(); err != nil {
-			t.Fatalf("dws %s: %v\n%s", strings.Join(args, " "), err, output.String())
-		}
-		for _, line := range strings.Split(output.String(), "\n") {
-			fields := strings.Fields(line)
-			if len(fields) > 0 && (fields[0] == "media" || fields[0] == "upload") {
-				t.Fatalf("dws %s exposes retired command in Help line %q:\n%s", strings.Join(args, " "), line, output.String())
-			}
-		}
-	}
-
-	root := NewRootCommand()
-	var output bytes.Buffer
-	root.SetOut(&output)
-	root.SetErr(&output)
-	root.SetArgs([]string{"schema", "--cli-path", "chat media upload", "--format", "json"})
-	err := root.Execute()
-	if err == nil {
-		t.Fatalf("retired chat media upload remains queryable from Schema:\n%s", output.String())
-	}
-	if !strings.Contains(err.Error(), "unknown runtime schema path") {
-		t.Fatalf("retired chat media upload Schema error = %v, want unknown path", err)
-	}
-}
-
-func TestRootChatMediaUploadWithoutAppCredentialsReturnsMigrationValidation(t *testing.T) {
-	for _, key := range []string{"DWS_CLIENT_ID", "DWS_CLIENT_SECRET"} {
-		value, existed := os.LookupEnv(key)
-		if err := os.Unsetenv(key); err != nil {
-			t.Fatalf("unset %s: %v", key, err)
-		}
-		t.Cleanup(func() {
-			if existed {
-				_ = os.Setenv(key, value)
-				return
-			}
-			_ = os.Unsetenv(key)
-		})
-		if _, exists := os.LookupEnv(key); exists {
-			t.Fatalf("%s is still set", key)
-		}
-	}
-	t.Setenv("DWS_CONFIG_DIR", filepath.Join(t.TempDir(), "config"))
-
-	filePath := filepath.Join(t.TempDir(), "image.png")
-	if err := os.WriteFile(filePath, []byte("image"), 0o600); err != nil {
-		t.Fatalf("write image fixture: %v", err)
-	}
-	commandArgs := []string{
-		"chat", "media", "upload",
-		"--file", filePath,
-		"--type", "image",
-	}
-	previousArgs := os.Args
-	os.Args = append([]string{"dws"}, commandArgs...)
-	t.Cleanup(func() { os.Args = previousArgs })
-
-	root := NewRootCommand()
-	var output bytes.Buffer
-	root.SetOut(&output)
-	root.SetErr(&output)
-	root.SetArgs(commandArgs)
-	err := root.Execute()
-	if err == nil {
-		t.Fatalf("chat media upload succeeded without app credentials:\n%s", output.String())
-	}
-
-	var typed *apperrors.Error
-	if !stderrors.As(err, &typed) {
-		t.Fatalf("chat media upload error type = %T, want *errors.Error: %v", err, err)
-	}
-	if typed.Category != apperrors.CategoryValidation {
-		t.Fatalf("chat media upload category = %q, want %q", typed.Category, apperrors.CategoryValidation)
-	}
-	if exitCode := apperrors.ExitCode(err); exitCode != 3 {
-		t.Fatalf("chat media upload exit code = %d, want 3", exitCode)
-	}
-
-	got := output.String() + "\n" + err.Error()
-	for _, want := range []string{"已下线", "chat message send --msg-type file --file-path"} {
-		if !strings.Contains(got, want) {
-			t.Fatalf("chat media upload migration output missing %q:\n%s", want, got)
-		}
-	}
-	for _, forbidden := range []string{
-		"DWS_CLIENT_ID",
-		"DWS_CLIENT_SECRET",
-		"缺少应用凭证",
-		"AppSecret",
-		"clientSecret",
-	} {
-		if strings.Contains(got, forbidden) {
-			t.Fatalf("chat media upload returned credential error %q:\n%s", forbidden, got)
-		}
-	}
-}
-
 func TestRootKeepsContactWukongCompatibilityCommands(t *testing.T) {
 	root := NewRootCommand()
 	label := mustFindCommand(t, root, "contact", "label")

internal/app/runner.go

@@ -168,7 +168,6 @@ var (
 	runnerPreflightDocDownload          = (*runtimeRunner).preflightDocDownload
 	runnerCallTool                      = (*transport.Client).CallTool
 	runnerStdioEnsureInitialized        = (*transport.StdioClient).EnsureInitialized
-	runnerStdioListTools                = (*transport.StdioClient).ListTools
 	runnerStdioCallTool                 = (*transport.StdioClient).CallTool
 	runnerHandlePatAuthCheck            func(context.Context, *runtimeRunner, executor.Invocation, *apperrors.PATError, string, io.Writer) (executor.Result, error)
 	runnerRetryWithPatAuthRetry         func(context.Context, executor.Runner, executor.Invocation, *PatScopeError, string, io.Writer) (executor.Result, error)
@@ -210,14 +209,7 @@ func (r *runtimeRunner) Run(ctx context.Context, invocation executor.Invocation)
 		if profile == nil {
 			return executor.Result{}, apperrors.NewValidation(fmt.Sprintf("profile %q not found", rawProfile))
 		}
-		resolvedSelector := authpkg.ProfileSelector(*profile)
-		if strings.TrimSpace(profile.UserID) == "" {
-			// Preserve a unique local-name selector for an unresolved account.
-			// Reducing it to corpId can select a different exact account through
-			// the organization's current-account pointer.
-			resolvedSelector = rawProfile
-		}
-		authpkg.SetRuntimeProfile(resolvedSelector)
+		authpkg.SetRuntimeProfile(authpkg.ProfileSelector(*profile))
 		defer authpkg.SetRuntimeProfile(rawProfile)
 	}
 
@@ -243,9 +235,7 @@ func (r *runtimeRunner) runSingle(ctx context.Context, invocation executor.Invoc
 	// ~70ms on macOS; starting it here lets the load overlap with endpoint
 	// resolution and catalog loading below.
 	if prefetchToken {
-		go func() {
-			_, _ = runnerGetCachedRuntimeToken(ctx)
-		}()
+		go runnerGetCachedRuntimeToken(ctx)
 	}
 
 	if shouldUseDirectRuntime(invocation) {
@@ -358,9 +348,6 @@ func (r *runtimeRunner) runMultiProfile(ctx context.Context, invocation executor
 
 	for _, selection := range selections {
 		resolvedSelector := authpkg.ProfileSelector(selection.Profile)
-		if strings.TrimSpace(selection.Profile.UserID) == "" {
-			resolvedSelector = selection.Selector
-		}
 		authpkg.SetRuntimeProfile(resolvedSelector)
 		result, err := r.runSingle(ctx, cloneInvocation(invocation), false)
 
@@ -496,7 +483,7 @@ func (r *runtimeRunner) handleCatalogMiss(ctx context.Context, invocation execut
 func (r *runtimeRunner) executeInvocation(ctx context.Context, endpoint string, invocation executor.Invocation) (result executor.Result, retErr error) {
 	// Route stdio:// endpoints to the local StdioClient — no HTTP, no auth.
 	if IsStdioEndpoint(endpoint) {
-		return r.executeStdioInvocationAtEndpoint(ctx, endpoint, invocation)
+		return r.executeStdioInvocation(ctx, invocation)
 	}
 
 	// Constructing the Cobra tree is also used for help, schema, and command
@@ -547,12 +534,8 @@ func (r *runtimeRunner) executeInvocation(ctx context.Context, endpoint string,
 	authToken := ""
 	if hasPluginAuth {
 		authToken = pluginAuth.Token
-	} else if !invocation.DryRun && (r.globalFlags == nil || !r.globalFlags.Mock) {
-		var tokenErr error
-		authToken, tokenErr = r.resolveAuthToken(ctx)
-		if tokenErr != nil {
-			return executor.Result{}, tokenResolutionError(tokenErr)
-		}
+	} else {
+		authToken = r.resolveAuthToken(ctx)
 	}
 
 	var timeoutSec int
@@ -634,12 +617,6 @@ func (r *runtimeRunner) executeInvocation(ctx context.Context, endpoint string,
 			}
 			return runnerHandlePatAuthCheck(ctx, r, invocation, patCheck, defaultConfigDir(), os.Stderr)
 		}
-		if result, retryErr, handled := r.retryAuthRefreshRequired(ctx, endpoint, invocation, authToken, err, hasPluginAuth); handled {
-			if retryErr != nil {
-				runnerCaptureRuntimeFailure(invocation, err, retryErr)
-			}
-			return result, retryErr
-		}
 		runnerCaptureRuntimeFailure(invocation, err, err)
 		return executor.Result{}, err
 	}
@@ -648,15 +625,9 @@ func (r *runtimeRunner) executeInvocation(ctx context.Context, endpoint string,
 	callResult, err := runnerCallTool(tc, callCtx, endpoint, invocation.Tool, invocation.Params)
 	RecordTiming(ctx, "mcp_call", time.Since(callStart))
 	if err != nil {
-		if isRefreshableTransportAuthError(err) {
+		if isAuthError(err) {
 			if fn := edition.Get().OnAuthError; fn != nil {
 				if overrideErr := fn(defaultConfigDir(), err); overrideErr != nil {
-					if result, retryErr, handled := r.retryAuthRefreshRequired(ctx, endpoint, invocation, authToken, overrideErr, hasPluginAuth); handled {
-						if retryErr != nil {
-							runnerCaptureRuntimeFailure(invocation, err, retryErr)
-						}
-						return result, retryErr
-					}
 					runnerCaptureRuntimeFailure(invocation, err, overrideErr)
 					return executor.Result{}, overrideErr
 				}
@@ -681,12 +652,6 @@ func (r *runtimeRunner) executeInvocation(ctx context.Context, endpoint string,
 				}
 				return runnerHandlePatAuthCheck(ctx, r, invocation, patCheck, defaultConfigDir(), os.Stderr)
 			}
-			if result, retryErr, handled := r.retryAuthRefreshRequired(ctx, endpoint, invocation, authToken, editionErr, hasPluginAuth); handled {
-				if retryErr != nil {
-					runnerCaptureRuntimeFailure(invocation, editionErr, retryErr)
-				}
-				return result, retryErr
-			}
 			return executor.Result{}, editionErr
 		}
 	}
@@ -707,12 +672,6 @@ func (r *runtimeRunner) executeInvocation(ctx context.Context, endpoint string,
 		// patterns (PAT permission, gateway-auth) before generic handling.
 		if classify := edition.Get().ClassifyToolResult; classify != nil {
 			if hookErr := classify(callResult.Content); hookErr != nil {
-				if result, retryErr, handled := r.retryAuthRefreshRequired(ctx, endpoint, invocation, authToken, hookErr, hasPluginAuth); handled {
-					if retryErr != nil {
-						runnerCaptureRuntimeFailure(invocation, hookErr, retryErr)
-					}
-					return result, retryErr
-				}
 				runnerCaptureRuntimeFailure(invocation, hookErr, hookErr)
 				return executor.Result{}, hookErr
 			}
@@ -777,14 +736,6 @@ func (r *runtimeRunner) executeInvocation(ctx context.Context, endpoint string,
 // subprocess instead of the HTTP transport. This is used for plugin stdio
 // servers whose endpoints use the stdio:// scheme.
 func (r *runtimeRunner) executeStdioInvocation(ctx context.Context, invocation executor.Invocation) (executor.Result, error) {
-	return r.executeStdioInvocationAtEndpoint(ctx, "", invocation)
-}
-
-func (r *runtimeRunner) executeStdioInvocationAtEndpoint(
-	ctx context.Context,
-	endpoint string,
-	invocation executor.Invocation,
-) (executor.Result, error) {
 	if invocation.DryRun {
 		return executor.Result{
 			Invocation: invocation,
@@ -797,14 +748,10 @@ func (r *runtimeRunner) executeStdioInvocationAtEndpoint(
 		}, nil
 	}
 
-	lookupKey := strings.Trim(strings.TrimPrefix(strings.TrimSpace(endpoint), stdioEndpointScheme), "/")
-	if lookupKey == "" {
-		lookupKey = invocation.CanonicalProduct
-	}
-	client, ok := LookupStdioClient(lookupKey)
+	client, ok := LookupStdioClient(invocation.CanonicalProduct)
 	if !ok {
 		return executor.Result{}, apperrors.NewInternal(
-			fmt.Sprintf("stdio client not found for %q", lookupKey))
+			fmt.Sprintf("stdio client not found for %q", invocation.CanonicalProduct))
 	}
 
 	callCtx := ctx
@@ -821,27 +768,6 @@ func (r *runtimeRunner) executeStdioInvocationAtEndpoint(
 		)
 	}
 
-	tools, err := runnerStdioListTools(client, callCtx)
-	if err != nil {
-		return executor.Result{}, apperrors.NewAPI(
-			fmt.Sprintf("stdio tools/list failed: %v", err),
-			apperrors.WithOperation("tools/list"),
-			apperrors.WithReason("stdio_tools_list_error"),
-		)
-	}
-	schema, ok := pluginToolInputSchema(tools, invocation.Tool)
-	if !ok {
-		return executor.Result{}, apperrors.NewValidation(
-			fmt.Sprintf("plugin tool %q is not declared by tools/list", invocation.Tool),
-			apperrors.WithReason("plugin_tool_not_found"),
-		)
-	}
-	normalizedParams, err := normalizePluginInputParams(invocation.Params, schema)
-	if err != nil {
-		return executor.Result{}, err
-	}
-	invocation.Params = normalizedParams
-
 	callResult, err := runnerStdioCallTool(client, callCtx, invocation.Tool, invocation.Params)
 	if err != nil {
 		return executor.Result{}, apperrors.NewAPI(
@@ -870,49 +796,67 @@ func (r *runtimeRunner) executeStdioInvocationAtEndpoint(
 	}, nil
 }
 
-func (r *runtimeRunner) resolveAuthToken(ctx context.Context) (string, error) {
+func (r *runtimeRunner) resolveAuthToken(ctx context.Context) string {
 	explicitToken := ""
 	if r != nil && r.globalFlags != nil {
 		explicitToken = r.globalFlags.Token
 	}
-	return resolveRuntimeAuthToken(ctx, explicitToken)
-}
-
-func resolveRuntimeAuthToken(ctx context.Context, explicitToken string) (string, error) {
-	snapshot, err := runtimeTokenManager.Get(ctx, defaultConfigDir(), explicitToken)
-	if err != nil {
-		return "", err
+	if token := strings.TrimSpace(explicitToken); token != "" {
+		return token
 	}
-	return snapshot.AccessToken, nil
+	if tp := edition.Get().TokenProvider; tp != nil {
+		token, _ := tp(ctx, func() (string, error) {
+			return resolveAccessTokenFromDir(ctx, defaultConfigDir())
+		})
+		return token
+	}
+	return getCachedRuntimeToken(ctx)
 }
 
-// getCachedRuntimeToken is kept as the prefetch seam used by runner tests. The
-// cache itself lives exclusively in TokenManager.
-func getCachedRuntimeToken(ctx context.Context) (string, error) {
+func resolveRuntimeAuthToken(ctx context.Context, explicitToken string) string {
+	if token := strings.TrimSpace(explicitToken); token != "" {
+		return token
+	}
+	// Use cached token to avoid repeated Keychain access (~70ms per call)
+	return getCachedRuntimeToken(ctx)
+}
+
+// Cached token state for process lifetime
+var (
+	cachedRuntimeTokenMu sync.Mutex
+	cachedRuntimeTokens  = map[string]string{}
+)
+
+// getCachedRuntimeToken returns a cached access token, loading it only once per process.
+// This avoids repeated Keychain access which takes ~70ms each time.
+func getCachedRuntimeToken(ctx context.Context) string {
+	cacheKey := strings.TrimSpace(authpkg.RuntimeProfile())
+	if cacheKey == "" {
+		cacheKey = "__default__"
+	}
+	cachedRuntimeTokenMu.Lock()
+	if token := cachedRuntimeTokens[cacheKey]; token != "" {
+		cachedRuntimeTokenMu.Unlock()
+		return token
+	}
+	cachedRuntimeTokenMu.Unlock()
+
 	loadStart := time.Now()
 	defer func() { RecordTiming(ctx, "auth_keychain", time.Since(loadStart)) }()
-	return resolveRuntimeAuthToken(ctx, "")
-}
 
-func tokenResolutionError(err error) error {
-	if err == nil {
-		return nil
+	configDir := defaultConfigDir()
+	token, tokenErr := resolveAccessTokenFromDir(ctx, configDir)
+	if tokenErr != nil && errors.Is(tokenErr, authpkg.ErrTokenDecryption) {
+		slog.Error(tokenErr.Error())
+		return ""
 	}
-	if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
-		return err
+	if token == "" {
+		return ""
 	}
-	if errors.Is(err, authpkg.ErrTokenDataNotFound) {
-		return apperrors.NewAuth(
-			"未登录，请先执行 dws auth login",
-			apperrors.WithReason("not_authenticated"),
-			apperrors.WithHint("运行 'dws auth login' 完成登录后重试"),
-			apperrors.WithActions("dws auth login"),
-			apperrors.WithCause(err),
-		)
-	}
-	// Keychain, parse, permission, lock, and refresh failures are real local or
-	// network errors. Preserve their cause instead of disguising them as logout.
-	return fmt.Errorf("resolve access token: %w", err)
+	cachedRuntimeTokenMu.Lock()
+	cachedRuntimeTokens[cacheKey] = token
+	cachedRuntimeTokenMu.Unlock()
+	return token
 }
 
 // generateExecutionID returns a random 16-char hex string used to correlate
@@ -927,7 +871,9 @@ func generateExecutionID() string {
 // ResetRuntimeTokenCache clears the cached token, forcing a reload on next access.
 // This should be called after login/logout operations.
 func ResetRuntimeTokenCache() {
-	runtimeTokenManager.Invalidate()
+	cachedRuntimeTokenMu.Lock()
+	defer cachedRuntimeTokenMu.Unlock()
+	cachedRuntimeTokens = map[string]string{}
 }
 
 func newRuntimeContentScanner() safety.Scanner {

internal/app/runner_full_coverage_test.go

@@ -50,9 +50,9 @@ func TestCrossPlatformCoverageRunnerRemainingRoutingCoverage(t *testing.T) {
 
 	inv := executor.Invocation{CanonicalProduct: "product", Tool: "tool"}
 	prefetched := make(chan struct{}, 1)
-	runnerGetCachedRuntimeToken = func(context.Context) (string, error) {
+	runnerGetCachedRuntimeToken = func(context.Context) string {
 		prefetched <- struct{}{}
-		return "", nil
+		return ""
 	}
 	r := &runtimeRunner{
 		loader:    cli.CatalogLoaderFrom(cli.Catalog{}, wantErr),
@@ -197,7 +197,7 @@ func TestCrossPlatformCoverageRunnerRemainingExecutionCoverage(t *testing.T) {
 		return nil
 	}
 
-	authErr := apperrors.NewAuth("expired", apperrors.WithReason("http_401"))
+	authErr := apperrors.NewAuth("expired")
 	runnerCallTool = func(*transport.Client, context.Context, string, string, map[string]any) (transport.ToolCallResult, error) {
 		return transport.ToolCallResult{}, authErr
 	}
@@ -290,12 +290,10 @@ func TestCrossPlatformCoverageRunnerRemainingExecutionCoverage(t *testing.T) {
 
 func TestCrossPlatformCoverageRunnerRemainingStdioAuthAndHeadersCoverage(t *testing.T) {
 	oldStdioInit := runnerStdioEnsureInitialized
-	oldStdioList := runnerStdioListTools
 	oldStdioCall := runnerStdioCallTool
 	oldEdition := edition.Get()
 	t.Cleanup(func() {
 		runnerStdioEnsureInitialized = oldStdioInit
-		runnerStdioListTools = oldStdioList
 		runnerStdioCallTool = oldStdioCall
 		edition.Override(oldEdition)
 		StopAllStdioClients()
@@ -311,14 +309,6 @@ func TestCrossPlatformCoverageRunnerRemainingStdioAuthAndHeadersCoverage(t *test
 		t.Fatalf("stdio initialize error = %v", err)
 	}
 	runnerStdioEnsureInitialized = func(*transport.StdioClient, context.Context) error { return nil }
-	runnerStdioListTools = func(*transport.StdioClient, context.Context) (transport.ToolsListResult, error) {
-		return transport.ToolsListResult{
-			Tools: []transport.ToolDescriptor{{
-				Name:        "tool",
-				InputSchema: map[string]any{"type": "object"},
-			}},
-		}, nil
-	}
 	runnerStdioCallTool = func(*transport.StdioClient, context.Context, string, map[string]any) (transport.ToolCallResult, error) {
 		return transport.ToolCallResult{}, wantErr
 	}
@@ -337,31 +327,21 @@ func TestCrossPlatformCoverageRunnerRemainingStdioAuthAndHeadersCoverage(t *test
 	if got, err := r.executeStdioInvocation(context.Background(), inv); err != nil || !got.Invocation.Implemented {
 		t.Fatalf("stdio success = %#v, %v", got, err)
 	}
-	RegisterStdioClient("plugin/server-key", client)
-	overlayIDInvocation := inv
-	overlayIDInvocation.CanonicalProduct = "overlay-id"
-	if got, err := r.executeInvocation(
-		context.Background(),
-		"stdio://plugin/server-key",
-		overlayIDInvocation,
-	); err != nil || !got.Invocation.Implemented {
-		t.Fatalf("stdio endpoint-key lookup = %#v, %v", got, err)
-	}
 
 	r.globalFlags.Token = " explicit "
-	if got, err := r.resolveAuthToken(context.Background()); err != nil || got != "explicit" {
-		t.Fatalf("explicit auth token = %q, %v", got, err)
+	if got := r.resolveAuthToken(context.Background()); got != "explicit" {
+		t.Fatalf("explicit auth token = %q", got)
 	}
 	edition.Override(&edition.Hooks{TokenProvider: func(_ context.Context, fallback func() (string, error)) (string, error) {
 		_, _ = fallback()
 		return "provided", nil
 	}})
 	r.globalFlags.Token = ""
-	if got, err := r.resolveAuthToken(context.Background()); err != nil || got != "provided" {
-		t.Fatalf("provided auth token = %q, %v", got, err)
+	if got := r.resolveAuthToken(context.Background()); got != "provided" {
+		t.Fatalf("provided auth token = %q", got)
 	}
-	if got, err := resolveRuntimeAuthToken(context.Background(), " runtime "); err != nil || got != "runtime" {
-		t.Fatalf("runtime explicit token = %q, %v", got, err)
+	if got := resolveRuntimeAuthToken(context.Background(), " runtime "); got != "runtime" {
+		t.Fatalf("runtime explicit token = %q", got)
 	}
 
 	t.Setenv(envDWSChannel, "channel")

internal/app/schema_completeness_test.go

@@ -14,7 +14,7 @@ func TestRuntimeSchemaCompletenessCoversPublicCommandTree(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	root := NewSchemaSourceRootCommand()
+	root := NewRootCommand()
 	if err := cli.ValidateEmbeddedRuntimeSchemaCompleteness(root); err != nil {
 		t.Fatal(err)
 	}

internal/app/skill_command.go

@@ -17,7 +17,6 @@ import (
 	"archive/zip"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"mime"
@@ -37,25 +36,25 @@ import (
 )
 
 var (
-	skillLoadAccessToken    = loadSkillAccessToken
-	skillDownloadToTmp      = downloadSkillToTmpDir
-	skillHTTPDo             = func(client *http.Client, req *http.Request) (*http.Response, error) { return client.Do(req) }
-	skillNewRequest         = http.NewRequestWithContext
-	skillResolveAccessToken = ResolveAuxiliaryAccessToken
-	skillResolveTargetPath  = resolveSkillTargetPath
-	skillFetchDownloadInfo  = fetchSkillDownloadInfo
-	skillDownloadFile       = downloadSkillFile
-	skillExtractZip         = extractSkillZip
-	skillUserHomeDir        = os.UserHomeDir
-	skillMkdirTemp          = os.MkdirTemp
-	skillCreate             = os.Create
-	skillCreateTemp         = os.CreateTemp
-	skillRemoveAll          = os.RemoveAll
-	skillRemove             = os.Remove
-	skillMkdirAll           = os.MkdirAll
-	skillOpenFile           = os.OpenFile
-	skillCopy               = io.Copy
-	skillOpenZipFile        = func(file *zip.File) (io.ReadCloser, error) { return file.Open() }
+	skillLoadAccessToken   = loadSkillAccessToken
+	skillDownloadToTmp     = downloadSkillToTmpDir
+	skillHTTPDo            = func(client *http.Client, req *http.Request) (*http.Response, error) { return client.Do(req) }
+	skillNewRequest        = http.NewRequestWithContext
+	skillLoadTokenData     = authpkg.LoadTokenData
+	skillResolveTargetPath = resolveSkillTargetPath
+	skillFetchDownloadInfo = fetchSkillDownloadInfo
+	skillDownloadFile      = downloadSkillFile
+	skillExtractZip        = extractSkillZip
+	skillUserHomeDir       = os.UserHomeDir
+	skillMkdirTemp         = os.MkdirTemp
+	skillCreate            = os.Create
+	skillCreateTemp        = os.CreateTemp
+	skillRemoveAll         = os.RemoveAll
+	skillRemove            = os.Remove
+	skillMkdirAll          = os.MkdirAll
+	skillOpenFile          = os.OpenFile
+	skillCopy              = io.Copy
+	skillOpenZipFile       = func(file *zip.File) (io.ReadCloser, error) { return file.Open() }
 )
 
 func init() {
@@ -297,7 +296,7 @@ func newSkillAddHintCommand() *cobra.Command {
 
 func runSkillGet(cmd *cobra.Command, args []string) error {
 	skillID, _ := cmd.Flags().GetString("skill-id")
-	accessToken, err := skillLoadAccessToken(cmd.Context())
+	accessToken, err := skillLoadAccessToken()
 	if err != nil {
 		return err
 	}
@@ -320,7 +319,7 @@ func runSkillFind(cmd *cobra.Command, args []string) error {
 	if source == "" {
 		source, _ = cmd.Flags().GetString("scopes")
 	}
-	accessToken, err := skillLoadAccessToken(cmd.Context())
+	accessToken, err := skillLoadAccessToken()
 	if err != nil {
 		return err
 	}
@@ -389,7 +388,7 @@ func runSkillAdd(cmd *cobra.Command, args []string) error {
 		return apperrors.NewValidation(fmt.Sprintf("invalid target '%s': %v. Supported targets: %s", target, err, supportedTargets()))
 	}
 
-	accessToken, err := skillLoadAccessToken(cmd.Context())
+	accessToken, err := skillLoadAccessToken()
 	if err != nil {
 		return err
 	}
@@ -442,16 +441,13 @@ func runSkillAdd(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func loadSkillAccessToken(ctx context.Context) (string, error) {
+func loadSkillAccessToken() (string, error) {
 	configDir := defaultConfigDir()
-	token, err := skillResolveAccessToken(ctx, configDir, "")
-	if errors.Is(err, authpkg.ErrTokenDataNotFound) {
+	tokenData, err := skillLoadTokenData(configDir)
+	if err != nil || tokenData == nil || !tokenData.IsAccessTokenValid() {
 		return "", skillAuthError()
 	}
-	if err != nil {
-		return "", fmt.Errorf("resolve skill access token: %w", err)
-	}
-	return token, nil
+	return tokenData.AccessToken, nil
 }
 
 func skillAuthError() error {

internal/app/skill_command_full_coverage_test.go

@@ -57,11 +57,11 @@ func TestCrossPlatformCoverageSkillCommandHighLevelRemainingCoverage(t *testing.
 	})
 	fail := errors.New("failure")
 	cmd := skillCoverageCommand()
-	skillLoadAccessToken = func(context.Context) (string, error) { return "", fail }
+	skillLoadAccessToken = func() (string, error) { return "", fail }
 	if err := runSkillGet(cmd, nil); !errors.Is(err, fail) {
 		t.Fatalf("skill get auth error = %v", err)
 	}
-	skillLoadAccessToken = func(context.Context) (string, error) { return "token", nil }
+	skillLoadAccessToken = func() (string, error) { return "token", nil }
 	skillNewRequest = func(context.Context, string, string, io.Reader) (*http.Request, error) { return nil, fail }
 	if err := runSkillFind(cmd, nil); err == nil {
 		t.Fatal("skill find request failure should propagate")
@@ -72,11 +72,11 @@ func TestCrossPlatformCoverageSkillCommandHighLevelRemainingCoverage(t *testing.
 		t.Fatalf("skill get download error = %v", err)
 	}
 
-	skillLoadAccessToken = func(context.Context) (string, error) { return "", fail }
+	skillLoadAccessToken = func() (string, error) { return "", fail }
 	if err := runSkillFind(cmd, nil); !errors.Is(err, fail) {
 		t.Fatalf("skill find auth error = %v", err)
 	}
-	skillLoadAccessToken = func(context.Context) (string, error) { return "token", nil }
+	skillLoadAccessToken = func() (string, error) { return "token", nil }
 	skillHTTPDo = func(*http.Client, *http.Request) (*http.Response, error) { return nil, fail }
 	if err := runSkillFind(cmd, nil); err == nil {
 		t.Fatal("skill find network failure should propagate")
@@ -111,11 +111,11 @@ func TestCrossPlatformCoverageSkillCommandHighLevelRemainingCoverage(t *testing.
 		t.Fatal("invalid skill target should fail")
 	}
 	skillResolveTargetPath = func(string) (string, error) { return "dest", nil }
-	skillLoadAccessToken = func(context.Context) (string, error) { return "", fail }
+	skillLoadAccessToken = func() (string, error) { return "", fail }
 	if err := runSkillAdd(cmd, []string{"id", "target"}); !errors.Is(err, fail) {
 		t.Fatalf("skill add auth error = %v", err)
 	}
-	skillLoadAccessToken = func(context.Context) (string, error) { return "token", nil }
+	skillLoadAccessToken = func() (string, error) { return "token", nil }
 	skillFetchDownloadInfo = func(context.Context, string, string) (*downloadSkillResponse, error) { return nil, fail }
 	if err := runSkillAdd(cmd, []string{"id", "target"}); !errors.Is(err, fail) {
 		t.Fatalf("skill info error = %v", err)
@@ -152,35 +152,25 @@ func TestCrossPlatformCoverageSkillCommandHighLevelRemainingCoverage(t *testing.
 
 func TestCrossPlatformCoverageSkillCommandLowLevelRemainingCoverage(t *testing.T) {
 	oldHTTP := skillHTTPDo
-	oldNewRequest, oldResolveToken := skillNewRequest, skillResolveAccessToken
+	oldNewRequest, oldLoadToken := skillNewRequest, skillLoadTokenData
 	oldHome := skillUserHomeDir
 	oldMkdirTemp, oldCreate, oldCreateTemp := skillMkdirTemp, skillCreate, skillCreateTemp
 	oldRemoveAll, oldRemove, oldMkdir := skillRemoveAll, skillRemove, skillMkdirAll
 	oldOpen, oldCopy, oldZipOpen := skillOpenFile, skillCopy, skillOpenZipFile
 	t.Cleanup(func() {
 		skillHTTPDo = oldHTTP
-		skillNewRequest, skillResolveAccessToken = oldNewRequest, oldResolveToken
+		skillNewRequest, skillLoadTokenData = oldNewRequest, oldLoadToken
 		skillUserHomeDir = oldHome
 		skillMkdirTemp, skillCreate, skillCreateTemp = oldMkdirTemp, oldCreate, oldCreateTemp
 		skillRemoveAll, skillRemove, skillMkdirAll = oldRemoveAll, oldRemove, oldMkdir
 		skillOpenFile, skillCopy, skillOpenZipFile = oldOpen, oldCopy, oldZipOpen
 	})
 	fail := errors.New("failure")
-	skillResolveAccessToken = func(context.Context, string, string) (string, error) {
-		return "", authpkg.ErrTokenDataNotFound
-	}
-	if _, err := loadSkillAccessToken(context.Background()); err == nil {
+	skillLoadTokenData = func(string) (*authpkg.TokenData, error) { return nil, nil }
+	if _, err := loadSkillAccessToken(); err == nil {
 		t.Fatal("invalid skill access token succeeded")
 	}
-	canceled, cancel := context.WithCancel(context.Background())
-	cancel()
-	skillResolveAccessToken = func(ctx context.Context, _, _ string) (string, error) {
-		return "", ctx.Err()
-	}
-	if _, err := loadSkillAccessToken(canceled); !errors.Is(err, context.Canceled) {
-		t.Fatalf("skill token cancellation = %v", err)
-	}
-	skillResolveAccessToken = oldResolveToken
+	skillLoadTokenData = oldLoadToken
 	skillNewRequest = func(context.Context, string, string, io.Reader) (*http.Request, error) { return nil, fail }
 	if _, err := fetchSkillDownloadInfo(context.Background(), "token", "id"); err == nil {
 		t.Fatal("download-info request failure should propagate")

internal/app/skill_command_test.go

@@ -18,6 +18,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -396,11 +397,9 @@ func TestSkillInstallRequiresAuth(t *testing.T) {
 	configDir := filepath.Join(tempDir, "config")
 	t.Setenv("DWS_CONFIG_DIR", configDir)
 	t.Cleanup(CloseFileLogger)
-	originalResolveToken := skillResolveAccessToken
-	skillResolveAccessToken = func(context.Context, string, string) (string, error) {
-		return "", authpkg.ErrTokenDataNotFound
-	}
-	t.Cleanup(func() { skillResolveAccessToken = originalResolveToken })
+	originalLoadToken := skillLoadTokenData
+	skillLoadTokenData = func(string) (*authpkg.TokenData, error) { return nil, errors.New("missing") }
+	t.Cleanup(func() { skillLoadTokenData = originalLoadToken })
 
 	// Ensure the config directory exists but has no token
 	if err := os.MkdirAll(configDir, 0755); err != nil {
@@ -680,11 +679,16 @@ func TestSkillSearchUsesSourceQueryAndKeepsScopesCompat(t *testing.T) {
 	configDir := filepath.Join(t.TempDir(), "config")
 	t.Setenv("DWS_CONFIG_DIR", configDir)
 	t.Cleanup(CloseFileLogger)
-	originalResolveToken := skillResolveAccessToken
-	skillResolveAccessToken = func(context.Context, string, string) (string, error) {
-		return "test-token", nil
+	originalLoadToken := skillLoadTokenData
+	skillLoadTokenData = func(string) (*authpkg.TokenData, error) {
+		return &authpkg.TokenData{
+			AccessToken:  "test-token",
+			RefreshToken: "refresh-token",
+			ExpiresAt:    time.Now().Add(time.Hour),
+			RefreshExpAt: time.Now().Add(24 * time.Hour),
+		}, nil
 	}
-	t.Cleanup(func() { skillResolveAccessToken = originalResolveToken })
+	t.Cleanup(func() { skillLoadTokenData = originalLoadToken })
 
 	var gotSources []string
 	var gotScopes []string

internal/app/testmain_test.go

@@ -52,10 +52,6 @@ func TestMain(m *testing.M) {
 		_ = os.RemoveAll(tmpDir)
 		panic("set " + keychain.StorageDirEnv + ": " + err.Error())
 	}
-	if err := os.Setenv(keychain.TestNamespaceEnv, tmpDir); err != nil {
-		_ = os.RemoveAll(tmpDir)
-		panic("set " + keychain.TestNamespaceEnv + ": " + err.Error())
-	}
 	if err := os.Setenv("DWS_CONFIG_DIR", filepath.Join(tmpDir, "config")); err != nil {
 		_ = os.RemoveAll(tmpDir)
 		panic("set DWS_CONFIG_DIR: " + err.Error())
@@ -83,12 +79,6 @@ func TestMain(m *testing.M) {
 	StopAllStdioClients()
 	CloseAuditSink()
 	CloseFileLogger()
-	if err := keychain.RemoveAuthTokenEntries(keychain.Service); err != nil {
-		fmt.Fprintf(os.Stderr, "internal/app keychain cleanup: %v\n", err)
-		if code == 0 {
-			code = 1
-		}
-	}
 	if err := os.RemoveAll(tmpDir); err != nil {
 		fmt.Fprintf(os.Stderr, "internal/app test cleanup %s: %v\n", tmpDir, err)
 		if code == 0 {

internal/auth/access_token_snapshot_test.go

@@ -1,151 +0,0 @@
-package auth
-
-import (
-	"context"
-	"errors"
-	"io"
-	"log/slog"
-	"net/http"
-	"net/url"
-	"testing"
-	"time"
-)
-
-func TestCrossPlatformCoverageOAuthProviderTokenSnapshotPreservesLoadFailure(t *testing.T) {
-	oldLoad := oauthLoadToken
-	want := errors.New("keychain permission denied")
-	oauthLoadToken = func(string) (*TokenData, error) { return nil, want }
-	t.Cleanup(func() { oauthLoadToken = oldLoad })
-
-	_, err := NewOAuthProvider(t.TempDir(), nil).GetTokenSnapshot(context.Background())
-	if !errors.Is(err, want) {
-		t.Fatalf("error = %v, want cause %v", err, want)
-	}
-	if errors.Is(err, ErrTokenDataNotFound) {
-		t.Fatalf("load failure was misclassified as missing credentials: %v", err)
-	}
-}
-
-func TestCrossPlatformCoverageOAuthProviderLoginReauthorizesAfterLoadFailureAndRejectsUnreadableTarget(t *testing.T) {
-	cleanupKeychain(t)
-	setLoginPreflightCredentials(t)
-
-	oldLoad := oauthLoadToken
-	oldOpenBrowser := oauthOpenBrowser
-	oldExchange := oauthExchange
-	oldCheckStatus := oauthCheckStatus
-	oldSave := oauthSaveToken
-	oldKeychainGet := authKeychainGet
-	oldLoginTimeout := oauthLoginTimeout
-	t.Cleanup(func() {
-		oauthLoadToken = oldLoad
-		oauthOpenBrowser = oldOpenBrowser
-		oauthExchange = oldExchange
-		oauthCheckStatus = oldCheckStatus
-		oauthSaveToken = oldSave
-		authKeychainGet = oldKeychainGet
-		oauthLoginTimeout = oldLoginTimeout
-	})
-	oauthLoginTimeout = 2 * time.Second
-
-	loadErr := errors.New("keychain permission denied")
-	targetErr := errors.New("target token ciphertext is unreadable")
-	oauthLoadToken = func(string) (*TokenData, error) { return nil, loadErr }
-
-	browserCalls := 0
-	oauthOpenBrowser = func(authURL string) error {
-		browserCalls++
-		parsed, err := url.Parse(authURL)
-		if err != nil {
-			return err
-		}
-		callbackURL := parsed.Query().Get("redirect_uri") + "?code=reauthorize"
-		response, err := (&http.Client{Timeout: 5 * time.Second}).Get(callbackURL)
-		if err != nil {
-			return err
-		}
-		_, _ = io.Copy(io.Discard, response.Body)
-		return response.Body.Close()
-	}
-
-	exchangeCalls := 0
-	oauthExchange = func(*OAuthProvider, context.Context, string) (*TokenData, error) {
-		exchangeCalls++
-		return &TokenData{
-			AccessToken: "new-access",
-			CorpID:      "corp-target",
-			UserID:      "user-target",
-		}, nil
-	}
-	oauthCheckStatus = func(*OAuthProvider, context.Context, string) (*CLIAuthStatus, error) {
-		return &CLIAuthStatus{Success: true, Result: &CLIAuthResult{CLIAuthEnabled: true}}, nil
-	}
-
-	targetReads := 0
-	authKeychainGet = func(_ string, account string) (string, error) {
-		if account == TokenAccountForIdentity("corp-target", "user-target") {
-			targetReads++
-			return "", targetErr
-		}
-		return "", nil
-	}
-	saveCalls := 0
-	oauthSaveToken = func(string, *TokenData) error {
-		saveCalls++
-		return nil
-	}
-
-	provider := NewOAuthProvider(t.TempDir(), slog.New(slog.NewTextHandler(io.Discard, nil)))
-	provider.Output = io.Discard
-	_, err := provider.Login(context.Background(), false)
-	if !errors.Is(err, targetErr) {
-		t.Fatalf("Login() error = %v, want target cause %v", err, targetErr)
-	}
-	if errors.Is(err, loadErr) {
-		t.Fatalf("Login() returned stale load failure instead of reauthorizing: %v", err)
-	}
-	if browserCalls != 1 || exchangeCalls != 1 {
-		t.Fatalf("authorization calls = browser:%d exchange:%d, want 1 each", browserCalls, exchangeCalls)
-	}
-	if targetReads != 1 {
-		t.Fatalf("target slot reads = %d, want 1", targetReads)
-	}
-	if saveCalls != 0 {
-		t.Fatalf("SaveTokenData calls = %d, want 0", saveCalls)
-	}
-}
-
-func TestCrossPlatformCoverageOAuthProviderTokenSnapshotReturnsExpiryMetadata(t *testing.T) {
-	oldLoad := oauthLoadToken
-	expiresAt := time.Now().Add(time.Hour)
-	oauthLoadToken = func(string) (*TokenData, error) {
-		return &TokenData{AccessToken: "token", ExpiresAt: expiresAt}, nil
-	}
-	t.Cleanup(func() { oauthLoadToken = oldLoad })
-
-	snapshot, err := NewOAuthProvider(t.TempDir(), nil).GetTokenSnapshot(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if snapshot.AccessToken != "token" || !snapshot.ExpiresAt.Equal(expiresAt) {
-		t.Fatalf("snapshot = %#v", snapshot)
-	}
-}
-
-func TestCrossPlatformCoverageTokenMarkerRevisionChangesOnEveryPublication(t *testing.T) {
-	configDir := t.TempDir()
-	if err := WriteTokenMarker(configDir); err != nil {
-		t.Fatal(err)
-	}
-	first, present, err := ReadTokenMarkerRevision(configDir)
-	if err != nil || !present || first == "" {
-		t.Fatalf("first marker = %q, %v, %v", first, present, err)
-	}
-	if err := WriteTokenMarker(configDir); err != nil {
-		t.Fatal(err)
-	}
-	second, present, err := ReadTokenMarkerRevision(configDir)
-	if err != nil || !present || second == "" || second == first {
-		t.Fatalf("second marker = %q, %v, %v; first=%q", second, present, err, first)
-	}
-}

internal/auth/auth_legacy_platform_coverage_test.go

@@ -1,297 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package auth
-
-import (
-	"errors"
-	"strings"
-	"testing"
-
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/keychain"
-)
-
-// The native coverage jobs intentionally execute only TestCrossPlatformCoverage
-// entry points. Keep the compatibility assertions below as independently named
-// regression tests for the stable make target, and exercise the same functions
-// here as isolated subtests so their cleanup hooks run between cases.
-func TestCrossPlatformCoverageAuthLegacyCompatibilityRegressions(t *testing.T) {
-	t.Setenv(keychain.DisableKeychainEnv, "1")
-	t.Setenv(keychain.StorageDirEnv, t.TempDir())
-	tests := []struct {
-		name string
-		run  func(*testing.T)
-	}{
-		{"prepare unique global owner", TestPrepareLoginPersistenceRepairsOnlySafeGlobalOwner},
-		{"token load isolation matrix", TestTokenLoadIsolationMatrix},
-		{"reject future profiles before remote work", TestPersistingLoginFlowsRejectFutureProfilesBeforeRemoteWork},
-		{"fresh UID-less isolation", TestFreshUIDLessExactLoginCannotOverwriteExistingUnresolvedProfile},
-		{"reject mismatched exact switch", TestSetCurrentProfileRejectsMismatchedExactIdentitySlotBesideBlankProfile},
-		{"reject unreadable previous identity", TestUsePreviousProfileRejectsUnreadableExactIdentityBesideBlankProfile},
-		{"reauthorization guidance without profile", TestLegacyRefreshReauthorizationGuidanceWithoutProfileStillExplainsLogin},
-		{"repair v3 unresolved profile", TestPrepareLoginPersistenceV3UnresolvedProfileRepair},
-		{"device ignores unrelated unreadable profile", TestDeviceLoginIgnoresUnreadableUnrelatedProfile},
-		{"reject unreadable global before login", TestPrepareLoginPersistenceUnreadableGlobalFailsClosedBeforeRemote},
-		{"device validates resolved target", TestDeviceFlowChecksResolvedTargetBeforeSave},
-		{"accept recoverable credential material", TestPrepareLoginPersistenceRequiresCredentialMaterialButNotValidity},
-		{"auth code validates resolved target", TestExchangeAuthCodeChecksResolvedTargetBeforeSave},
-		{"standalone exchange prepares and marks fresh", TestExchangeCodeForTokenPreparesBeforeRemoteAndMarksFresh},
-	}
-	for _, test := range tests {
-		t.Run(test.name, test.run)
-	}
-}
-
-func TestCrossPlatformCoverageHalfMigratedGlobalRepairRemainingEdges(t *testing.T) {
-	t.Setenv(keychain.DisableKeychainEnv, "1")
-	t.Setenv(keychain.StorageDirEnv, t.TempDir())
-
-	t.Run("nil global token", func(t *testing.T) {
-		isolateHalfMigratedRepairHooks(t)
-		profilesLoadLegacy = func() (*TokenData, error) { return nil, nil }
-		cfg := &ProfilesConfig{Version: profilesVersion, Profiles: []Profile{{CorpID: "corp_nil_global"}}}
-		if err := repairHalfMigratedGlobalTokenLocked(cfg); err != nil {
-			t.Fatalf("repairHalfMigratedGlobalTokenLocked() error = %v", err)
-		}
-	})
-
-	t.Run("global token without organization", func(t *testing.T) {
-		isolateHalfMigratedRepairHooks(t)
-		profilesLoadLegacy = func() (*TokenData, error) {
-			return &TokenData{AccessToken: "legacy"}, nil
-		}
-		cfg := &ProfilesConfig{Version: profilesVersion, Profiles: []Profile{{CorpID: "corp_other"}}}
-		if err := repairHalfMigratedGlobalTokenLocked(cfg); err != nil {
-			t.Fatalf("repairHalfMigratedGlobalTokenLocked() error = %v", err)
-		}
-	})
-
-	t.Run("orphan global organization", func(t *testing.T) {
-		isolateHalfMigratedRepairHooks(t)
-		profilesLoadLegacy = func() (*TokenData, error) {
-			return &TokenData{AccessToken: "legacy", CorpID: "corp_orphan"}, nil
-		}
-		cfg := &ProfilesConfig{Version: profilesVersion, Profiles: []Profile{{CorpID: "corp_other"}}}
-		if err := repairHalfMigratedGlobalTokenLocked(cfg); err != nil {
-			t.Fatalf("repairHalfMigratedGlobalTokenLocked() error = %v", err)
-		}
-	})
-
-	t.Run("identity repair write failure", func(t *testing.T) {
-		isolateHalfMigratedRepairHooks(t)
-		failure := errors.New("identity repair write failure")
-		const corpID, userID = "corp_identity_repair", "user_identity_repair"
-		profilesLoadLegacy = func() (*TokenData, error) {
-			return &TokenData{AccessToken: "legacy", CorpID: corpID}, nil
-		}
-		profilesLoadCorp = func(string) (*TokenData, error) {
-			return &TokenData{AccessToken: "organization", CorpID: corpID}, nil
-		}
-		profilesSaveIdentity = func(string, string, *TokenData) error { return failure }
-		cfg := &ProfilesConfig{Version: profilesVersion, Profiles: []Profile{{CorpID: corpID, UserID: userID}}}
-		if err := repairHalfMigratedGlobalTokenLocked(cfg); !errors.Is(err, failure) {
-			t.Fatalf("repairHalfMigratedGlobalTokenLocked() error = %v, want %v", err, failure)
-		}
-	})
-
-	t.Run("organization repair write failure", func(t *testing.T) {
-		isolateHalfMigratedRepairHooks(t)
-		failure := errors.New("organization repair write failure")
-		const corpID = "corp_organization_repair"
-		profilesLoadLegacy = func() (*TokenData, error) {
-			return &TokenData{AccessToken: "legacy", CorpID: corpID}, nil
-		}
-		profilesSaveCorp = func(string, *TokenData) error { return failure }
-		cfg := &ProfilesConfig{Version: profilesVersion, Profiles: []Profile{{CorpID: corpID}}}
-		if err := repairHalfMigratedGlobalTokenLocked(cfg); !errors.Is(err, failure) {
-			t.Fatalf("repairHalfMigratedGlobalTokenLocked() error = %v, want %v", err, failure)
-		}
-	})
-
-	t.Run("nil profile is not canonical", func(t *testing.T) {
-		if loginProfileHasUsableCanonicalToken(nil, nil, nil) {
-			t.Fatal("nil profile was treated as a usable canonical token")
-		}
-	})
-
-	t.Run("global write preflight reports unreadable slot", func(t *testing.T) {
-		oldGet := authKeychainGet
-		failure := errors.New("global ciphertext is unreadable")
-		authKeychainGet = func(_, account string) (string, error) {
-			if account == keychain.AccountToken {
-				return "", failure
-			}
-			return "", nil
-		}
-		t.Cleanup(func() { authKeychainGet = oldGet })
-
-		err := preflightTokenWritePersistence(t.TempDir(), &TokenData{AccessToken: "fresh"})
-		if !errors.Is(err, failure) {
-			t.Fatalf("preflightTokenWritePersistence() error = %v, want %v", err, failure)
-		}
-	})
-}
-
-func TestCrossPlatformCoverageLegacyProfileGuardRemainingEdges(t *testing.T) {
-	t.Run("empty v3 registry normalizes and persists", func(t *testing.T) {
-		oldLoad := profilesLoad
-		oldSave := profilesSave
-		cfg := &ProfilesConfig{Version: profilesUnresolvedSelectorVersion}
-		profilesLoad = func(string) (*ProfilesConfig, error) { return cfg, nil }
-		saves := 0
-		profilesSave = func(string, *ProfilesConfig) error {
-			saves++
-			return nil
-		}
-		t.Cleanup(func() {
-			profilesLoad = oldLoad
-			profilesSave = oldSave
-		})
-
-		if err := ensureProfilesMigrationLocked(t.TempDir()); err != nil {
-			t.Fatalf("ensureProfilesMigrationLocked() error = %v", err)
-		}
-		if cfg.Version != profilesVersion || saves != 1 {
-			t.Fatalf("normalized registry = version %d saves %d", cfg.Version, saves)
-		}
-	})
-
-	if normalizeProfilesVersionForSelectors(nil) {
-		t.Fatal("nil profile registry reported a version change")
-	}
-	future := &ProfilesConfig{Version: profilesMaxVersion + 1}
-	if normalizeProfilesVersionForSelectors(future) {
-		t.Fatal("future profile registry reported a version change")
-	}
-	if profilesConfigContainsUnresolvedSelector(nil) {
-		t.Fatal("nil profile registry contained an unresolved selector")
-	}
-	reserved := unresolvedProfileSelector("corp_org_current_guard")
-	if !profilesConfigContainsUnresolvedSelector(&ProfilesConfig{
-		OrgCurrentProfiles: map[string]string{"corp_org_current_guard": reserved},
-	}) {
-		t.Fatal("reserved organization-current selector was not detected")
-	}
-	if selectorConflictsWithOrganizationGrammar(nil, "corp") {
-		t.Fatal("nil profile registry reported an organization-selector conflict")
-	}
-	if err := validateIdentityOnlyProfileToken(Profile{}); !errors.Is(err, ErrTokenDataNotFound) {
-		t.Fatalf("validateIdentityOnlyProfileToken(blank) error = %v", err)
-	}
-
-	oldLoadIdentity := profilesLoadIdentity
-	profilesLoadIdentity = func(string, string) (*TokenData, error) { return nil, nil }
-	t.Cleanup(func() { profilesLoadIdentity = oldLoadIdentity })
-	if err := validateIdentityOnlyProfileToken(Profile{CorpID: "corp_nil_identity", UserID: "user_nil_identity"}); !errors.Is(err, ErrTokenDataNotFound) {
-		t.Fatalf("validateIdentityOnlyProfileToken(nil token) error = %v", err)
-	}
-}
-
-func TestCrossPlatformCoverageTokenPersistenceRemainingEdges(t *testing.T) {
-	t.Setenv(keychain.DisableKeychainEnv, "1")
-	t.Setenv(keychain.StorageDirEnv, t.TempDir())
-
-	plan := planTokenPersistenceWrites(&ProfilesConfig{}, nil, "")
-	if !plan.WriteGlobal || plan.CorpID != "" {
-		t.Fatalf("nil-token write plan = %#v", plan)
-	}
-	if err := SaveLoginTokenData(t.TempDir(), nil); err == nil {
-		t.Fatal("SaveLoginTokenData(nil) succeeded")
-	}
-
-	futureDir := t.TempDir()
-	writeFutureProfilesForLoginPreflight(t, futureDir)
-	err := SaveLoginTokenData(futureDir, &TokenData{AccessToken: "fresh"})
-	if err == nil || !strings.Contains(err.Error(), "newer than supported") {
-		t.Fatalf("SaveLoginTokenData(future schema) error = %v", err)
-	}
-
-	t.Run("nil identity token", func(t *testing.T) {
-		isolateTokenProfileLoadHooks(t)
-		tokenLoadKeychainIdentity = func(string, string) (*TokenData, error) { return nil, nil }
-		_, err := tokenLoadProfileIdentity(Profile{CorpID: "corp_nil_identity", UserID: "user_nil_identity"})
-		if !errors.Is(err, ErrTokenDataNotFound) {
-			t.Fatalf("tokenLoadProfileIdentity() error = %v", err)
-		}
-	})
-
-	t.Run("nil organization fallback", func(t *testing.T) {
-		isolateTokenProfileLoadHooks(t)
-		tokenLoadKeychainForCorpID = func(string) (*TokenData, error) { return nil, nil }
-		_, err := tokenLoadProfileIdentity(Profile{CorpID: "corp_nil_org", UserID: "user_nil_org"})
-		if !errors.Is(err, ErrTokenDataNotFound) {
-			t.Fatalf("tokenLoadProfileIdentity() error = %v", err)
-		}
-	})
-
-	t.Run("organization fallback belongs to another organization", func(t *testing.T) {
-		isolateTokenProfileLoadHooks(t)
-		tokenLoadKeychainForCorpID = func(string) (*TokenData, error) {
-			return &TokenData{AccessToken: "wrong", CorpID: "corp_other", UserID: "user_wrong_org"}, nil
-		}
-		_, err := tokenLoadProfileIdentity(Profile{CorpID: "corp_expected", UserID: "user_wrong_org"})
-		if err == nil || !strings.Contains(err.Error(), "contains token for corpId") {
-			t.Fatalf("tokenLoadProfileIdentity() error = %v", err)
-		}
-	})
-
-	t.Run("identity repair write failure", func(t *testing.T) {
-		isolateTokenProfileLoadHooks(t)
-		failure := errors.New("identity repair write failure")
-		const corpID, userID = "corp_identity_save", "user_identity_save"
-		tokenLoadKeychainForCorpID = func(string) (*TokenData, error) {
-			return &TokenData{AccessToken: "organization", CorpID: corpID, UserID: userID}, nil
-		}
-		tokenSaveKeychainForIdentity = func(string, string, *TokenData) error { return failure }
-		_, err := tokenLoadProfileIdentity(Profile{CorpID: corpID, UserID: userID})
-		if !errors.Is(err, failure) {
-			t.Fatalf("tokenLoadProfileIdentity() error = %v, want %v", err, failure)
-		}
-	})
-}
-
-func isolateHalfMigratedRepairHooks(t *testing.T) {
-	t.Helper()
-	oldLoadLegacy := profilesLoadLegacy
-	oldLoadCorp := profilesLoadCorp
-	oldLoadIdentity := profilesLoadIdentity
-	oldSaveCorp := profilesSaveCorp
-	oldSaveIdentity := profilesSaveIdentity
-	t.Cleanup(func() {
-		profilesLoadLegacy = oldLoadLegacy
-		profilesLoadCorp = oldLoadCorp
-		profilesLoadIdentity = oldLoadIdentity
-		profilesSaveCorp = oldSaveCorp
-		profilesSaveIdentity = oldSaveIdentity
-	})
-	profilesLoadLegacy = func() (*TokenData, error) { return nil, ErrTokenDataNotFound }
-	profilesLoadCorp = func(string) (*TokenData, error) { return nil, ErrTokenDataNotFound }
-	profilesLoadIdentity = func(string, string) (*TokenData, error) { return nil, ErrTokenDataNotFound }
-	profilesSaveCorp = func(string, *TokenData) error { return nil }
-	profilesSaveIdentity = func(string, string, *TokenData) error { return nil }
-}
-
-func isolateTokenProfileLoadHooks(t *testing.T) {
-	t.Helper()
-	oldLoadIdentity := tokenLoadKeychainIdentity
-	oldLoadCorp := tokenLoadKeychainForCorpID
-	oldSaveIdentity := tokenSaveKeychainForIdentity
-	t.Cleanup(func() {
-		tokenLoadKeychainIdentity = oldLoadIdentity
-		tokenLoadKeychainForCorpID = oldLoadCorp
-		tokenSaveKeychainForIdentity = oldSaveIdentity
-	})
-	tokenLoadKeychainIdentity = func(string, string) (*TokenData, error) { return nil, ErrTokenDataNotFound }
-	tokenLoadKeychainForCorpID = func(string) (*TokenData, error) { return nil, ErrTokenDataNotFound }
-	tokenSaveKeychainForIdentity = func(string, string, *TokenData) error { return nil }
-}

internal/auth/blank_profile_selector_regression_test.go

@@ -1,357 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package auth
-
-import (
-	"encoding/json"
-	"os"
-	"strings"
-	"testing"
-)
-
-type blankProfileSelectorFixture struct {
-	configDir     string
-	corpID        string
-	blankName     string
-	blankSelector string
-	exactUserID   string
-	exactSelector string
-	blankToken    *TokenData
-	exactToken    *TokenData
-}
-
-func seedBlankProfileSelectorFixture(
-	t *testing.T,
-	blankName string,
-	corpName string,
-	blankCurrent bool,
-) blankProfileSelectorFixture {
-	t.Helper()
-	cleanupKeychain(t)
-
-	configDir := t.TempDir()
-	corpID := "corp_selector_fixture"
-	exactUserID := "identity_exact_fixture"
-	exactSelector := profileSelector(corpID, exactUserID)
-
-	blankToken := testToken("at_unresolved_fixture", corpID, corpName)
-	blankToken.UserID = ""
-	blankToken.UserName = ""
-	exactToken := testToken("at_exact_fixture", corpID, corpName)
-	exactToken.UserID = exactUserID
-	exactToken.UserName = "Exact Fixture Account"
-
-	if err := SaveTokenDataKeychainForCorpID(corpID, blankToken); err != nil {
-		t.Fatalf("SaveTokenDataKeychainForCorpID(blank) error = %v", err)
-	}
-	if err := SaveTokenDataKeychainForIdentity(corpID, exactUserID, exactToken); err != nil {
-		t.Fatalf("SaveTokenDataKeychainForIdentity(exact) error = %v", err)
-	}
-	if err := SaveTokenDataKeychain(exactToken); err != nil {
-		t.Fatalf("SaveTokenDataKeychain(exact mirror) error = %v", err)
-	}
-	if err := WriteTokenMarker(configDir); err != nil {
-		t.Fatalf("WriteTokenMarker() error = %v", err)
-	}
-
-	cfg := &ProfilesConfig{
-		Version:        profilesVersion,
-		PrimaryProfile: exactSelector,
-		OrgCurrentProfiles: map[string]string{
-			corpID: exactSelector,
-		},
-		Profiles: []Profile{
-			{
-				Name:     blankName,
-				CorpID:   corpID,
-				CorpName: corpName,
-				Status:   ProfileStatusActive,
-			},
-			{
-				Name:     "Exact Fixture Account",
-				CorpID:   corpID,
-				CorpName: corpName,
-				UserID:   exactUserID,
-				UserName: "Exact Fixture Account",
-				Status:   ProfileStatusActive,
-			},
-		},
-	}
-	blankSelector := ProfileSelectionSelector(cfg.Profiles[0], cfg)
-	persistedBlankPointer := strings.TrimSpace(blankName)
-	if selectorConflictsWithOrganizationGrammar(cfg, persistedBlankPointer) {
-		// An ambiguous local name has always been captured by CorpId/CorpName
-		// grammar in the public resolver. New writers must use the reserved
-		// selector to preserve exact blank-profile intent without changing that
-		// precedence.
-		persistedBlankPointer = blankSelector
-		if _, reserved := parseUnresolvedProfileSelector(persistedBlankPointer); reserved {
-			cfg.Version = profilesUnresolvedSelectorVersion
-		}
-	}
-	cfg.CurrentProfile = exactSelector
-	cfg.PreviousProfile = persistedBlankPointer
-	if blankCurrent {
-		cfg.CurrentProfile = persistedBlankPointer
-		cfg.PreviousProfile = exactSelector
-	}
-	data, err := json.MarshalIndent(cfg, "", "  ")
-	if err != nil {
-		t.Fatalf("json.MarshalIndent(profiles) error = %v", err)
-	}
-	data = append(data, '\n')
-	if err := os.WriteFile(ProfilesPath(configDir), data, 0o600); err != nil {
-		t.Fatalf("os.WriteFile(profiles.json) error = %v", err)
-	}
-
-	return blankProfileSelectorFixture{
-		configDir:     configDir,
-		corpID:        corpID,
-		blankName:     blankName,
-		blankSelector: blankSelector,
-		exactUserID:   exactUserID,
-		exactSelector: exactSelector,
-		blankToken:    blankToken,
-		exactToken:    exactToken,
-	}
-}
-
-func TestCrossPlatformCoverageBlankProfileNameMatchingCorpNameResolvesCurrentProfileExactly(t *testing.T) {
-	fixture := seedBlankProfileSelectorFixture(t, "Fixture Organization", "Fixture Organization", true)
-
-	selected, exact, err := ResolveProfileWithScope(fixture.configDir, "")
-	if err != nil {
-		t.Fatalf("ResolveProfileWithScope(current) error = %v", err)
-	}
-	if selected == nil || selected.CorpID != fixture.corpID || selected.UserID != "" {
-		t.Fatalf("resolved current profile = %#v, want unresolved profile", selected)
-	}
-	if !exact {
-		t.Fatal("current local-name selector should resolve one exact unresolved profile")
-	}
-	cfg, err := LoadProfiles(fixture.configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles() error = %v", err)
-	}
-	if cfg.CurrentProfile != fixture.blankSelector {
-		t.Fatalf("current profile = %q, want stable unresolved selector %q", cfg.CurrentProfile, fixture.blankSelector)
-	}
-}
-
-func TestCrossPlatformCoverageBlankProfileNameMatchingCorpNameLoadsOrganizationToken(t *testing.T) {
-	fixture := seedBlankProfileSelectorFixture(t, "Fixture Organization", "Fixture Organization", false)
-
-	if fixture.blankSelector == fixture.blankName || fixture.blankSelector == fixture.corpID {
-		t.Fatalf("unsafe blank selector = %q, want reserved exact selector", fixture.blankSelector)
-	}
-	loaded, err := LoadTokenDataForProfile(fixture.configDir, fixture.blankSelector)
-	if err != nil {
-		t.Fatalf("LoadTokenDataForProfile(blank local name) error = %v", err)
-	}
-	if loaded.UserID != "" || loaded.AccessToken != fixture.blankToken.AccessToken {
-		t.Fatalf("loaded token = %#v, want unresolved organization token", loaded)
-	}
-}
-
-func TestCrossPlatformCoverageBlankProfileNameMatchingCorpNameRoundTripsPreviousProfile(t *testing.T) {
-	fixture := seedBlankProfileSelectorFixture(t, "Fixture Organization", "Fixture Organization", false)
-
-	selected, err := UsePreviousProfile(fixture.configDir)
-	if err != nil {
-		t.Fatalf("UsePreviousProfile() error = %v", err)
-	}
-	if selected == nil || selected.CorpID != fixture.corpID || selected.UserID != "" {
-		t.Fatalf("selected previous profile = %#v, want unresolved profile", selected)
-	}
-
-	cfg, err := LoadProfiles(fixture.configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles() error = %v", err)
-	}
-	if cfg.CurrentProfile != fixture.blankSelector || cfg.PreviousProfile != fixture.exactSelector {
-		t.Fatalf(
-			"profile pointers = current %q previous %q, want %q and %q",
-			cfg.CurrentProfile,
-			cfg.PreviousProfile,
-			fixture.blankSelector,
-			fixture.exactSelector,
-		)
-	}
-}
-
-func TestCrossPlatformCoverageBlankProfileNameMatchingCorpNameDeletesOnlyUnresolvedProfile(t *testing.T) {
-	fixture := seedBlankProfileSelectorFixture(t, "Fixture Organization", "Fixture Organization", false)
-
-	if err := DeleteTokenDataForProfile(fixture.configDir, fixture.blankSelector); err != nil {
-		t.Fatalf("DeleteTokenDataForProfile(blank local name) error = %v", err)
-	}
-
-	cfg, err := LoadProfiles(fixture.configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles() error = %v", err)
-	}
-	if len(cfg.Profiles) != 1 || cfg.Profiles[0].CorpID != fixture.corpID || cfg.Profiles[0].UserID != fixture.exactUserID {
-		t.Fatalf("profiles after blank deletion = %#v, want only exact account", cfg.Profiles)
-	}
-	loaded, err := LoadTokenDataForProfile(fixture.configDir, fixture.exactSelector)
-	if err != nil {
-		t.Fatalf("LoadTokenDataForProfile(exact after blank deletion) error = %v", err)
-	}
-	if loaded.UserID != fixture.exactUserID || loaded.AccessToken != fixture.exactToken.AccessToken {
-		t.Fatalf("exact token after blank deletion = %#v, want exact account preserved", loaded)
-	}
-}
-
-func TestCrossPlatformCoverageBlankProfileNameContainingColonWinsOverIdentitySyntax(t *testing.T) {
-	fixture := seedBlankProfileSelectorFixture(t, "legacy:outsourced", "Fixture Organization", true)
-
-	if fixture.blankSelector == fixture.blankName {
-		t.Fatalf("colon-containing name leaked as selector %q", fixture.blankSelector)
-	}
-	if _, _, parsedAsIdentity := ParseIdentitySelector(fixture.blankSelector); parsedAsIdentity {
-		t.Fatalf("stable blank selector %q was parsed as an identity", fixture.blankSelector)
-	}
-	selected, exact, err := ResolveProfileWithScope(fixture.configDir, "")
-	if err != nil {
-		t.Fatalf("ResolveProfileWithScope(colon local name) error = %v", err)
-	}
-	if selected == nil || selected.CorpID != fixture.corpID || selected.UserID != "" {
-		t.Fatalf("resolved colon-name profile = %#v, want unresolved profile", selected)
-	}
-	if !exact {
-		t.Fatal("colon-containing local name should resolve one exact unresolved profile")
-	}
-
-	cfg, err := LoadProfiles(fixture.configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles() error = %v", err)
-	}
-	if cfg.CurrentProfile != fixture.blankSelector {
-		t.Fatalf("current profile = %q, want migrated colon-name selector %q", cfg.CurrentProfile, fixture.blankSelector)
-	}
-
-	loaded, err := LoadTokenDataForProfile(fixture.configDir, fixture.blankSelector)
-	if err != nil {
-		t.Fatalf("LoadTokenDataForProfile(colon local name) error = %v", err)
-	}
-	if loaded.UserID != "" || loaded.AccessToken != fixture.blankToken.AccessToken {
-		t.Fatalf("loaded colon-name token = %#v, want unresolved organization token", loaded)
-	}
-}
-
-func TestCrossPlatformCoverageRealExactSelectorWinsOverMatchingBlankLegacyName(t *testing.T) {
-	const exactSelector = "corp_selector_fixture:identity_exact_fixture"
-	fixture := seedBlankProfileSelectorFixture(t, exactSelector, "Fixture Organization", true)
-
-	selected, exact, err := ResolveProfileWithScope(fixture.configDir, "")
-	if err != nil {
-		t.Fatalf("ResolveProfileWithScope(current exact collision) error = %v", err)
-	}
-	if selected == nil || selected.UserID != fixture.exactUserID || !exact {
-		t.Fatalf("resolved current collision = %#v exact=%v, want real exact identity", selected, exact)
-	}
-	cfg, err := LoadProfiles(fixture.configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles() error = %v", err)
-	}
-	if cfg.CurrentProfile != exactSelector {
-		t.Fatalf("current collision selector = %q, want real exact %q", cfg.CurrentProfile, exactSelector)
-	}
-
-	blank, err := LoadTokenDataForProfile(fixture.configDir, fixture.blankSelector)
-	if err != nil {
-		t.Fatalf("LoadTokenDataForProfile(reserved blank collision) error = %v", err)
-	}
-	if blank.UserID != "" || blank.AccessToken != fixture.blankToken.AccessToken {
-		t.Fatalf("reserved blank collision token = %#v", blank)
-	}
-	if err := DeleteTokenDataForProfile(fixture.configDir, fixture.blankSelector); err != nil {
-		t.Fatalf("DeleteTokenDataForProfile(reserved blank collision) error = %v", err)
-	}
-	exactToken, err := LoadTokenDataForProfile(fixture.configDir, exactSelector)
-	if err != nil || exactToken.UserID != fixture.exactUserID {
-		t.Fatalf("exact identity after blank collision delete = %#v, %v", exactToken, err)
-	}
-}
-
-func TestCrossPlatformCoverageUnrelatedProfileDeletionPreservesBlankOrganizationCurrentMapping(t *testing.T) {
-	fixture := seedBlankProfileSelectorFixture(t, "Fixture Organization", "Fixture Organization", true)
-	cfg, err := LoadProfiles(fixture.configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles() error = %v", err)
-	}
-	cfg.Profiles = append(cfg.Profiles, Profile{
-		Name:   "Unrelated Account",
-		CorpID: "corp_unrelated_fixture",
-		UserID: "identity_unrelated_fixture",
-		Status: ProfileStatusActive,
-	})
-	if err := SaveProfiles(fixture.configDir, cfg); err != nil {
-		t.Fatalf("SaveProfiles(unrelated) error = %v", err)
-	}
-	if _, err := RemoveProfile(fixture.configDir, "corp_unrelated_fixture:identity_unrelated_fixture"); err != nil {
-		t.Fatalf("RemoveProfile(unrelated) error = %v", err)
-	}
-
-	cfg, err = LoadProfiles(fixture.configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles(after unrelated delete) error = %v", err)
-	}
-	if cfg.CurrentProfile != fixture.blankSelector {
-		t.Fatalf("blank current after unrelated delete = %q, want %q", cfg.CurrentProfile, fixture.blankSelector)
-	}
-	if got := cfg.OrgCurrentProfiles[fixture.corpID]; got != fixture.exactSelector {
-		t.Fatalf("organization current after unrelated delete = %q, want %q", got, fixture.exactSelector)
-	}
-	selected, err := ResolveProfile(fixture.configDir, fixture.corpID)
-	if err != nil || selected.UserID != fixture.exactUserID {
-		t.Fatalf("organization selector after unrelated delete = %#v, %v", selected, err)
-	}
-}
-
-func TestCrossPlatformCoverageSameCorpNonCurrentDeletionPreservesExactOrganizationCurrent(t *testing.T) {
-	fixture := seedBlankProfileSelectorFixture(t, "Fixture Organization", "Fixture Organization", true)
-	cfg, err := LoadProfiles(fixture.configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles() error = %v", err)
-	}
-	cfg.Profiles = append(cfg.Profiles, Profile{
-		Name:     "Another Exact Account",
-		CorpID:   fixture.corpID,
-		CorpName: "Fixture Organization",
-		UserID:   "identity_noncurrent_fixture",
-		Status:   ProfileStatusActive,
-	})
-	if err := SaveProfiles(fixture.configDir, cfg); err != nil {
-		t.Fatalf("SaveProfiles(non-current exact) error = %v", err)
-	}
-	if _, err := RemoveProfile(fixture.configDir, fixture.corpID+":identity_noncurrent_fixture"); err != nil {
-		t.Fatalf("RemoveProfile(non-current exact) error = %v", err)
-	}
-
-	cfg, err = LoadProfiles(fixture.configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles(after same-corp delete) error = %v", err)
-	}
-	if cfg.CurrentProfile != fixture.blankSelector {
-		t.Fatalf("blank current after same-corp delete = %q, want %q", cfg.CurrentProfile, fixture.blankSelector)
-	}
-	if got := cfg.OrgCurrentProfiles[fixture.corpID]; got != fixture.exactSelector {
-		t.Fatalf("organization current after same-corp delete = %q, want %q", got, fixture.exactSelector)
-	}
-	selected, err := ResolveProfile(fixture.configDir, fixture.corpID)
-	if err != nil || selected.UserID != fixture.exactUserID {
-		t.Fatalf("organization selector after same-corp delete = %#v, %v", selected, err)
-	}
-}

internal/auth/coverage_edges_test.go

@@ -3159,13 +3159,7 @@ func TestCrossPlatformCoverageMultiAccountSelectorAndIdentityLoadEdges(t *testin
 	if got, err := loadTokenForProfileIdentity(profile); err != nil || got.AccessToken != "mirror" {
 		t.Fatalf("identity repair = %#v %v", got, err)
 	}
-	if _, err := loadTokenForProfileIdentity(Profile{CorpID: "corp-a"}); err == nil {
-		t.Fatal("unresolved profile loaded organization token owned by an exact identity")
-	}
-	profilesLoadCorp = func(string) (*TokenData, error) {
-		return &TokenData{CorpID: "corp-a", AccessToken: "organization"}, nil
-	}
-	if got, err := loadTokenForProfileIdentity(Profile{CorpID: "corp-a"}); err != nil || got.AccessToken != "organization" {
-		t.Fatalf("organization-only token load = %#v %v", got, err)
+	if _, err := loadTokenForProfileIdentity(Profile{CorpID: "corp-a"}); err != nil {
+		t.Fatalf("organization-only token load = %v", err)
 	}
 }

internal/auth/device_flow.go

@@ -195,7 +195,7 @@ func (p *DeviceFlowProvider) resetCredentialState() {
 }
 
 func (p *DeviceFlowProvider) Login(ctx context.Context) (*TokenData, error) {
-	if err := prepareLoginPersistence(p.configDir); err != nil {
+	if err := preflightTokenPersistence(p.configDir); err != nil {
 		return nil, fmt.Errorf("%s: %w", i18n.T("本地登录态无法安全更新"), err)
 	}
 
@@ -357,9 +357,6 @@ func (p *DeviceFlowProvider) loginOnce(ctx context.Context, attempt int) (*Token
 	if err := oauthProvider.prepareLoginToken(ctx, tokenData); err != nil {
 		return nil, fmt.Errorf("%s: %w", i18n.T("保存 token 失败"), err)
 	}
-	if err := preflightTokenWritePersistence(p.configDir, tokenData); err != nil {
-		return nil, fmt.Errorf("%s: %w", i18n.T("本地登录态无法安全更新"), err)
-	}
 	if err := deviceSaveToken(p.configDir, tokenData); err != nil {
 		return nil, fmt.Errorf("%s: %w", i18n.T("保存 token 失败"), err)
 	}
@@ -725,6 +722,6 @@ func isInvalidGrantError(err error) bool {
 	if err == nil {
 		return false
 	}
-	msg := strings.ToLower(err.Error() + " " + httpStatusResponseBody(err))
+	msg := strings.ToLower(err.Error())
 	return strings.Contains(msg, "invalid_grant") || (strings.Contains(msg, "code") && strings.Contains(msg, "expired"))
 }

internal/auth/force_refresh.go

@@ -13,50 +13,7 @@
 
 package auth
 
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/edition"
-)
-
-const rejectedTokenRefreshFailureCooldown = 3 * time.Second
-
-type rejectedTokenRefreshKey struct {
-	configDir   string
-	profile     string
-	tokenDigest [sha256.Size]byte
-}
-
-type rejectedTokenRefreshCall struct {
-	done         chan struct{}
-	participants int
-	token        string
-	err          error
-}
-
-type rejectedTokenRefreshFailure struct {
-	at  time.Time
-	err error
-}
-
-var rejectedTokenRefreshCoordinator = struct {
-	sync.Mutex
-	inFlight map[rejectedTokenRefreshKey]*rejectedTokenRefreshCall
-	failures map[rejectedTokenRefreshKey]rejectedTokenRefreshFailure
-	now      func() time.Time
-}{
-	inFlight: make(map[rejectedTokenRefreshKey]*rejectedTokenRefreshCall),
-	failures: make(map[rejectedTokenRefreshKey]rejectedTokenRefreshFailure),
-	now:      time.Now,
-}
+import "time"
 
 // MarkAccessTokenStale loads the persisted TokenData, sets ExpiresAt to a past
 // instant (preserving access_token and refresh_token), and writes it back. The
@@ -82,192 +39,3 @@ func MarkAccessTokenStale(configDir string) error {
 	data.ExpiresAt = time.Now().Add(-1 * time.Minute)
 	return SaveTokenData(configDir, data)
 }
-
-// ForceRefreshRejectedToken refreshes rejectedAccessToken only while it is
-// still the credential stored for the active profile. The compare and refresh
-// run under the same process + file lock used by ordinary expiry refresh, so a
-// late rejection cannot invalidate or refresh over a token another caller has
-// already rotated.
-//
-// When the stored token no longer matches, the newer token is returned without
-// calling the refresh endpoint. Refresh failures leave the stored credential in
-// place; login/logout remain the only owners of credential deletion.
-func (p *OAuthProvider) ForceRefreshRejectedToken(ctx context.Context, rejectedAccessToken string) (string, error) {
-	if p == nil || strings.TrimSpace(p.configDir) == "" {
-		return "", fmt.Errorf("config directory is empty")
-	}
-	rejectedAccessToken = strings.TrimSpace(rejectedAccessToken)
-	if rejectedAccessToken == "" {
-		return "", fmt.Errorf("rejected access token is empty")
-	}
-	if ctx == nil {
-		ctx = context.Background()
-	}
-
-	profile := strings.TrimSpace(RuntimeProfile())
-	key := newRejectedTokenRefreshKey(p.configDir, profile, rejectedAccessToken)
-	call, leader := beginRejectedTokenRefresh(key)
-	if !leader {
-		select {
-		case <-call.done:
-			return call.token, call.err
-		case <-ctx.Done():
-			return "", ctx.Err()
-		}
-	}
-
-	token, err, recordFailure := p.forceRefreshRejectedTokenOnce(ctx, profile, rejectedAccessToken, key)
-	finishRejectedTokenRefresh(key, call, token, err, recordFailure)
-	return token, err
-}
-
-func (p *OAuthProvider) forceRefreshRejectedTokenOnce(
-	ctx context.Context,
-	profile string,
-	rejectedAccessToken string,
-	key rejectedTokenRefreshKey,
-) (string, error, bool) {
-	lock, err := oauthAcquireLock(ctx, p.configDir)
-	if err != nil {
-		return "", fmt.Errorf("acquiring dual lock: %w", err), false
-	}
-	defer lock.Release()
-
-	data, err := loadOAuthTokenUnderHeldLock(p.configDir, profile)
-	if err != nil {
-		return "", fmt.Errorf("reload rejected token: %w", err), false
-	}
-	current := strings.TrimSpace(data.AccessToken)
-	if current == "" {
-		clearRejectedTokenRefreshFailure(key)
-		return "", fmt.Errorf("stored access token is empty"), false
-	}
-	if current != rejectedAccessToken {
-		clearRejectedTokenRefreshFailure(key)
-		return current, nil, false
-	}
-	if cachedErr := recentRejectedTokenRefreshFailure(key); cachedErr != nil {
-		return "", cachedErr, false
-	}
-	if !data.IsRefreshTokenValid() {
-		return "", fmt.Errorf("refresh_token 已过期"), true
-	}
-	if err := preflightTokenRefreshPersistence(p.configDir, data); err != nil {
-		return "", fmt.Errorf("本地登录态无法安全更新: %w", err), true
-	}
-
-	refreshed, err := oauthRefreshToken(p, ctx, data)
-	if err != nil {
-		return "", err, true
-	}
-	if refreshed == nil || strings.TrimSpace(refreshed.AccessToken) == "" {
-		return "", fmt.Errorf("force refresh returned empty access token"), true
-	}
-	return strings.TrimSpace(refreshed.AccessToken), nil, false
-}
-
-func newRejectedTokenRefreshKey(configDir, profile, rejectedAccessToken string) rejectedTokenRefreshKey {
-	canonicalDir := filepath.Clean(configDir)
-	if absolute, err := filepath.Abs(configDir); err == nil {
-		canonicalDir = filepath.Clean(absolute)
-	}
-	return rejectedTokenRefreshKey{
-		configDir:   canonicalDir,
-		profile:     strings.TrimSpace(profile),
-		tokenDigest: sha256.Sum256([]byte(strings.TrimSpace(rejectedAccessToken))),
-	}
-}
-
-func beginRejectedTokenRefresh(key rejectedTokenRefreshKey) (*rejectedTokenRefreshCall, bool) {
-	rejectedTokenRefreshCoordinator.Lock()
-	defer rejectedTokenRefreshCoordinator.Unlock()
-
-	if call := rejectedTokenRefreshCoordinator.inFlight[key]; call != nil {
-		call.participants++
-		return call, false
-	}
-	call := &rejectedTokenRefreshCall{done: make(chan struct{}), participants: 1}
-	rejectedTokenRefreshCoordinator.inFlight[key] = call
-	return call, true
-}
-
-func finishRejectedTokenRefresh(
-	key rejectedTokenRefreshKey,
-	call *rejectedTokenRefreshCall,
-	token string,
-	err error,
-	recordFailure bool,
-) {
-	rejectedTokenRefreshCoordinator.Lock()
-	defer rejectedTokenRefreshCoordinator.Unlock()
-
-	call.token = token
-	call.err = err
-	delete(rejectedTokenRefreshCoordinator.inFlight, key)
-	if err == nil {
-		delete(rejectedTokenRefreshCoordinator.failures, key)
-	} else if recordFailure && !errors.Is(err, context.Canceled) && !errors.Is(err, context.DeadlineExceeded) {
-		now := time.Now()
-		if rejectedTokenRefreshCoordinator.now != nil {
-			now = rejectedTokenRefreshCoordinator.now()
-		}
-		rejectedTokenRefreshCoordinator.failures[key] = rejectedTokenRefreshFailure{at: now, err: err}
-	}
-	close(call.done)
-}
-
-func recentRejectedTokenRefreshFailure(key rejectedTokenRefreshKey) error {
-	rejectedTokenRefreshCoordinator.Lock()
-	defer rejectedTokenRefreshCoordinator.Unlock()
-
-	now := time.Now()
-	if rejectedTokenRefreshCoordinator.now != nil {
-		now = rejectedTokenRefreshCoordinator.now()
-	}
-	for failureKey, failure := range rejectedTokenRefreshCoordinator.failures {
-		age := now.Sub(failure.at)
-		if age < 0 || age >= rejectedTokenRefreshFailureCooldown {
-			delete(rejectedTokenRefreshCoordinator.failures, failureKey)
-		}
-	}
-	if failure, ok := rejectedTokenRefreshCoordinator.failures[key]; ok {
-		return failure.err
-	}
-	return nil
-}
-
-func clearRejectedTokenRefreshFailure(key rejectedTokenRefreshKey) {
-	rejectedTokenRefreshCoordinator.Lock()
-	delete(rejectedTokenRefreshCoordinator.failures, key)
-	rejectedTokenRefreshCoordinator.Unlock()
-}
-
-// loadOAuthTokenUnderHeldLock mirrors LoadTokenDataForProfile without taking a
-// second, non-reentrant auth lock. Opaque edition storage hooks (for example
-// Wukong's encrypted .data file) are read inside the caller's dual lock so the
-// compare-and-refresh decision covers both Core and embedded storage.
-func loadOAuthTokenUnderHeldLock(configDir, profile string) (*TokenData, error) {
-	hooks := edition.Get()
-	if hooks.LoadToken == nil {
-		data, err := oauthLoadTokenLocked(configDir, profile)
-		if err != nil {
-			return nil, err
-		}
-		if data == nil {
-			return nil, fmt.Errorf("stored token data is empty")
-		}
-		return data, nil
-	}
-	if strings.TrimSpace(profile) != "" {
-		return nil, fmt.Errorf("profile selection is not supported by the current auth backend")
-	}
-	blob, err := hooks.LoadToken(configDir)
-	if err != nil {
-		return nil, err
-	}
-	var data TokenData
-	if err := json.Unmarshal(blob, &data); err != nil {
-		return nil, fmt.Errorf("parsing token data from hook: %w", err)
-	}
-	return &data, nil
-}

internal/auth/keychain_store.go

@@ -138,177 +138,11 @@ func loadTokenDataKeychainAccount(account string) (*TokenData, error) {
 	return &data, nil
 }
 
-// prepareLoginPersistence rejects profile registries written by a newer client
-// and protects the legacy global mirror before a new authorization flow
-// performs remote work. Version-1 registries keep using the existing full
-// migration in saveTokenDataLocked before any compatibility mirror is
-// overwritten.
-//
-// For v2/v3, only the organization referenced by the readable global mirror is
-// inspected. A uniquely matching half-migrated profile is repaired from that
-// mirror under the profiles lock. Missing or damaged slots in unrelated
-// organizations and orphan inventory are deliberately not scanned.
-func prepareLoginPersistence(configDir string) error {
-	if h := edition.Get(); h.SaveToken != nil {
-		return nil
-	}
-	return withProfilesLock(configDir, func() error {
-		cfg, err := profilesLoad(configDir)
-		if err != nil {
-			return fmt.Errorf("load token profiles: %w", err)
-		}
-		if err := ensureProfilesWritable(cfg); err != nil {
-			return err
-		}
-		return repairHalfMigratedGlobalTokenLocked(cfg)
-	})
-}
-
-// repairHalfMigratedGlobalTokenLocked preserves the only readable copy left by
-// an interrupted v1.0.53 migration. The caller must hold the profiles lock.
-func repairHalfMigratedGlobalTokenLocked(cfg *ProfilesConfig) error {
-	if cfg == nil || cfg.Version < profilesVersion || len(cfg.Profiles) == 0 {
-		return nil
-	}
-
-	global, err := profilesLoadLegacy()
-	if errors.Is(err, ErrTokenDataNotFound) {
-		return nil
-	}
-	if err != nil {
-		return fmt.Errorf(
-			"legacy token slot %q is unreadable; refusing to overwrite a potentially unique old login: %w",
-			keychain.AccountToken,
-			err,
-		)
-	}
-	if global == nil {
-		return nil
-	}
-	corpID := strings.TrimSpace(global.CorpID)
-	if corpID == "" {
-		return nil
-	}
-	profiles := profilesForCorpID(cfg, corpID)
-	if len(profiles) == 0 {
-		// A readable global token for an unregistered organization is an orphan,
-		// not a profile credential that this registry still promises to retain.
-		return nil
-	}
-
-	orgToken, orgErr := profilesLoadCorp(corpID)
-	allCanonical := true
-	for _, profile := range profiles {
-		if !loginProfileHasUsableCanonicalToken(profile, orgToken, orgErr) {
-			allCanonical = false
-			break
-		}
-	}
-	if allCanonical {
-		return nil
-	}
-
-	profile := uniqueV2GlobalRepairProfile(cfg, corpID)
-	if profile == nil {
-		return fmt.Errorf(
-			"legacy token slot %q may be the only recoverable login for one of %d accounts in organization %q; refusing to overwrite it until each account has a usable identity slot",
-			keychain.AccountToken,
-			len(profiles),
-			corpID,
-		)
-	}
-	userID := strings.TrimSpace(profile.UserID)
-	if userID != "" &&
-		orgErr == nil &&
-		loginTokenHasCredentialMaterial(orgToken) &&
-		legacyTokenMatchesV2RepairProfile(orgToken, profile) {
-		if err := repairLoginIdentityToken(profile, orgToken); err != nil {
-			return err
-		}
-		return nil
-	}
-	if !legacyTokenMatchesV2RepairProfile(global, profile) {
-		return fmt.Errorf(
-			"legacy token slot %q does not safely match the only profile in organization %q; refusing to overwrite a potentially unique old login",
-			keychain.AccountToken,
-			corpID,
-		)
-	}
-	if !loginTokenHasCredentialMaterial(global) {
-		return fmt.Errorf(
-			"legacy token slot %q has no recoverable credential material for organization %q; refusing to overwrite a potentially unique old login",
-			keychain.AccountToken,
-			corpID,
-		)
-	}
-
-	// The matching global token is the only recoverable copy. Overwrite a
-	// damaged organization slot as well as filling a missing one.
-	if err := profilesSaveCorp(corpID, global); err != nil {
-		return fmt.Errorf("repair organization token slot %q: %w", TokenAccountForCorpID(corpID), err)
-	}
-	if userID == "" {
-		return nil
-	}
-	return repairLoginIdentityToken(profile, global)
-}
-
-func loginProfileHasUsableCanonicalToken(
-	profile *Profile,
-	orgToken *TokenData,
-	orgErr error,
-) bool {
-	if profile == nil {
-		return false
-	}
-	corpID := strings.TrimSpace(profile.CorpID)
-	userID := strings.TrimSpace(profile.UserID)
-	if userID == "" {
-		return orgErr == nil &&
-			loginTokenHasCredentialMaterial(orgToken) &&
-			strings.TrimSpace(orgToken.CorpID) == corpID &&
-			strings.TrimSpace(orgToken.UserID) == ""
-	}
-	identity, err := profilesLoadIdentity(corpID, userID)
-	if err == nil &&
-		loginTokenHasCredentialMaterial(identity) &&
-		strings.TrimSpace(identity.CorpID) == corpID &&
-		strings.TrimSpace(identity.UserID) == userID {
-		return true
-	}
-	return false
-}
-
-func loginTokenHasCredentialMaterial(data *TokenData) bool {
-	return data != nil &&
-		(strings.TrimSpace(data.AccessToken) != "" ||
-			strings.TrimSpace(data.RefreshToken) != "" ||
-			strings.TrimSpace(data.PersistentCode) != "")
-}
-
-func repairLoginIdentityToken(profile *Profile, source *TokenData) error {
-	corpID := strings.TrimSpace(profile.CorpID)
-	userID := strings.TrimSpace(profile.UserID)
-	identityToken := source
-	if strings.TrimSpace(source.UserID) == "" {
-		enriched := *source
-		enriched.UserID = userID
-		if strings.TrimSpace(enriched.UserName) == "" {
-			enriched.UserName = strings.TrimSpace(profile.UserName)
-		}
-		identityToken = &enriched
-	}
-	if err := profilesSaveIdentity(corpID, userID, identityToken); err != nil {
-		return fmt.Errorf("repair identity token slot %q: %w", TokenAccountForIdentity(corpID, userID), err)
-	}
-	return nil
-}
-
-// preflightTokenPersistence verifies every persisted token slot, including
-// unregistered/orphan ciphertext. Keep this full-inventory validator for
-// migration, export and explicit storage diagnostics; login must use the
-// schema-only and target-only preflights instead so an unrelated damaged
-// account cannot block reauthorization.
+// preflightTokenPersistence verifies that every registered token slot can be
+// read before an OAuth login or exchange can target any profile.
+// A missing slot is safe (first login or a legacy fallback); any other error
+// stops the remote operation when existing ciphertext is already known to be
+// unreadable and therefore unsafe to update.
 func preflightTokenPersistence(configDir string) error {
 	if h := edition.Get(); h.SaveToken != nil {
 		return nil
@@ -357,11 +191,10 @@ func preflightTokenPersistence(configDir string) error {
 	return nil
 }
 
-// preflightTokenWritePersistence checks only the slots SaveTokenData can write
-// for data under the current runtime selector. It is shared by login and
-// refresh so both paths stay aligned with the same identity/org/global mirror
-// isolation rules.
-func preflightTokenWritePersistence(configDir string, data *TokenData) error {
+// preflightTokenRefreshPersistence checks only the slots a refresh can write.
+// An unrelated broken profile must not prevent the current profile from using
+// its still-valid credentials.
+func preflightTokenRefreshPersistence(configDir string, data *TokenData) error {
 	if h := edition.Get(); h.SaveToken != nil {
 		return nil
 	}
@@ -373,46 +206,33 @@ func preflightTokenWritePersistence(configDir string, data *TokenData) error {
 		return err
 	}
 
-	plan := planTokenPersistenceWrites(cfg, data, RuntimeProfile())
-	if err := validateTokenPersistenceWritePlan(cfg, data, plan); err != nil {
-		return err
+	if _, err := LoadTokenDataKeychain(); err != nil && !errors.Is(err, ErrTokenDataNotFound) {
+		return fmt.Errorf("legacy token slot %q is unreadable: %w", keychain.AccountToken, err)
 	}
-	if plan.WriteGlobal {
-		if _, err := LoadTokenDataKeychain(); err != nil && !errors.Is(err, ErrTokenDataNotFound) {
-			return fmt.Errorf("legacy token slot %q is unreadable: %w", keychain.AccountToken, err)
-		}
-	}
-	if plan.CorpID == "" {
+	if data == nil || strings.TrimSpace(data.CorpID) == "" {
 		return nil
 	}
-	if plan.WriteIdentity {
-		if _, err := LoadTokenDataKeychainForIdentity(plan.CorpID, plan.UserID); err != nil && !errors.Is(err, ErrTokenDataNotFound) {
-			return fmt.Errorf(
-				"identity token slot %q is unreadable: %w",
-				TokenAccountForIdentity(plan.CorpID, plan.UserID),
-				err,
-			)
+	corpID := strings.TrimSpace(data.CorpID)
+	userID := strings.TrimSpace(data.UserID)
+	if userID != "" {
+		if _, err := LoadTokenDataKeychainForIdentity(corpID, userID); err != nil && !errors.Is(err, ErrTokenDataNotFound) {
+			return fmt.Errorf("identity token slot %q is unreadable: %w", TokenAccountForIdentity(corpID, userID), err)
 		}
 	}
-	if plan.WriteOrganization {
-		if _, err := LoadTokenDataKeychainForCorpID(plan.CorpID); err != nil && !errors.Is(err, ErrTokenDataNotFound) {
-			return fmt.Errorf(
-				"profile token slot %q is unreadable: %w",
-				TokenAccountForCorpID(plan.CorpID),
-				err,
-			)
+	checkOrganizationMirror := true
+	if _, _, exact := ParseIdentitySelector(RuntimeProfile()); exact {
+		checkOrganizationMirror =
+			exactProfileSelectorForCorp(cfg, corpID, cfg.OrgCurrentProfiles[corpID]) ==
+				profileSelector(corpID, userID)
+	}
+	if checkOrganizationMirror {
+		if _, err := LoadTokenDataKeychainForCorpID(corpID); err != nil && !errors.Is(err, ErrTokenDataNotFound) {
+			return fmt.Errorf("profile token slot %q is unreadable: %w", TokenAccountForCorpID(corpID), err)
 		}
 	}
 	return nil
 }
 
-// preflightTokenRefreshPersistence checks only the slots a refresh can write.
-// An unrelated broken profile must not prevent the current profile from using
-// its still-valid credentials.
-func preflightTokenRefreshPersistence(configDir string, data *TokenData) error {
-	return preflightTokenWritePersistence(configDir, data)
-}
-
 // DeleteTokenDataKeychain removes TokenData from the platform keychain.
 func DeleteTokenDataKeychain() error {
 	return authKeychainRemove(keychain.Service, keychain.AccountToken)

internal/auth/legacy_compat_coverage_gaps_test.go

@@ -1,288 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package auth
-
-import (
-	"errors"
-	"testing"
-)
-
-func TestCrossPlatformCoverageLegacySelectorCompatibilityEdges(t *testing.T) {
-	upgradeDir := t.TempDir()
-	upgradeCfg := &ProfilesConfig{
-		Version: profilesVersion,
-		Profiles: []Profile{{
-			Name:   "Legacy Organization",
-			CorpID: "corp_upgrade_fixture",
-		}},
-	}
-	if err := upsertProfileFromToken(upgradeDir, upgradeCfg, &TokenData{
-		CorpID:   "corp_upgrade_fixture",
-		UserID:   "identity_upgrade_fixture",
-		UserName: "Upgraded Account",
-	}, false); err != nil {
-		t.Fatalf("upsertProfileFromToken(upgrade legacy profile) error = %v", err)
-	}
-	if len(upgradeCfg.Profiles) != 1 || upgradeCfg.Profiles[0].UserID != "identity_upgrade_fixture" {
-		t.Fatalf("upgraded profiles = %#v", upgradeCfg.Profiles)
-	}
-
-	renameDir := t.TempDir()
-	renameCfg := &ProfilesConfig{
-		Version: profilesVersion,
-		Profiles: []Profile{
-			{Name: "duplicate", CorpID: "corp_rename_fixture"},
-			{Name: "duplicate", CorpID: "corp_rename_fixture", UserID: "identity_exact_fixture"},
-		},
-	}
-	if err := upsertProfileFromToken(renameDir, renameCfg, &TokenData{
-		CorpID:   "corp_rename_fixture",
-		CorpName: "Renamed Organization",
-	}, false); err != nil {
-		t.Fatalf("upsertProfileFromToken(rename blank profile) error = %v", err)
-	}
-	if renameCfg.Profiles[0].Name != "Renamed Organization" {
-		t.Fatalf("blank profile name = %q, want conflict-free organization name", renameCfg.Profiles[0].Name)
-	}
-
-	blank := Profile{CorpID: "corp_selector_fixture"}
-	if got := storedProfileSelector(nil, nil); got != "" {
-		t.Fatalf("storedProfileSelector(nil profile) = %q", got)
-	}
-	if got := storedProfileSelector(nil, &blank); got != blank.CorpID {
-		t.Fatalf("storedProfileSelector(nil config) = %q", got)
-	}
-	if localProfileSelectorIsSafe(nil, &blank, "local") ||
-		localProfileSelectorIsSafe(&ProfilesConfig{}, nil, "local") {
-		t.Fatal("nil selector inputs were treated as safe")
-	}
-	if got := unresolvedProfileSelector("   "); got != "" {
-		t.Fatalf("unresolvedProfileSelector(blank) = %q", got)
-	}
-	if _, ok := parseUnresolvedProfileSelector(unresolvedProfileSelectorPrefix + "!"); ok {
-		t.Fatal("invalid base64 legacy selector parsed successfully")
-	}
-	if _, ok := parseUnresolvedProfileSelector(unresolvedProfileSelectorPrefix + "IA"); ok {
-		t.Fatal("blank decoded legacy selector parsed successfully")
-	}
-
-	previousRuntime := RuntimeProfile()
-	SetRuntimeProfile("")
-	t.Cleanup(func() { SetRuntimeProfile(previousRuntime) })
-	if got := StableTokenProfileSelector(t.TempDir(), nil); got != "" {
-		t.Fatalf("StableTokenProfileSelector(nil) = %q", got)
-	}
-
-	ambiguousDir := t.TempDir()
-	ambiguousCfg := &ProfilesConfig{
-		Version:        profilesVersion,
-		CurrentProfile: "corp_ambiguous_fixture",
-		Profiles: []Profile{
-			{Name: "First", CorpID: "corp_ambiguous_fixture", UserID: "identity_first_fixture"},
-			{Name: "Second", CorpID: "corp_ambiguous_fixture", UserID: "identity_second_fixture"},
-		},
-	}
-	if err := SaveProfiles(ambiguousDir, ambiguousCfg); err != nil {
-		t.Fatalf("SaveProfiles(ambiguous current) error = %v", err)
-	}
-	ambiguousToken := &TokenData{CorpID: "corp_ambiguous_fixture", UserID: "identity_first_fixture"}
-	if got, want := StableTokenProfileSelector(ambiguousDir, ambiguousToken), "corp_ambiguous_fixture:identity_first_fixture"; got != want {
-		t.Fatalf("StableTokenProfileSelector(ambiguous organization) = %q, want %q", got, want)
-	}
-
-	reserved := unresolvedProfileSelector("corp_missing_fixture")
-	emptyCfg := &ProfilesConfig{}
-	if _, _, err := resolveProfileSelection("", emptyCfg, reserved); err == nil {
-		t.Fatal("missing reserved profile selection succeeded")
-	}
-	if _, _, err := resolveProfileDeletionSelection(emptyCfg, reserved); err == nil {
-		t.Fatal("missing reserved profile deletion succeeded")
-	}
-	if got := canonicalStoredSelector(emptyCfg, reserved); got != "" {
-		t.Fatalf("canonical missing reserved selector = %q", got)
-	}
-	if !selectorTargetsCorp(reserved, "corp_missing_fixture") {
-		t.Fatal("reserved selector did not target its organization")
-	}
-
-	localCfg := &ProfilesConfig{Profiles: []Profile{{
-		Name:   "local-profile-fixture",
-		CorpID: "corp_local_fixture",
-		UserID: "identity_local_fixture",
-	}}}
-	if got, want := canonicalStoredSelector(localCfg, "local-profile-fixture"), "corp_local_fixture:identity_local_fixture"; got != want {
-		t.Fatalf("canonical local selector = %q, want %q", got, want)
-	}
-	if unresolvedProfileForCorp(nil, "corp") != nil || unresolvedProfileForLocalName(nil, "local") != nil {
-		t.Fatal("nil profile registry returned an unresolved profile")
-	}
-	if unresolvedProfileForLocalName(localCfg, "   ") != nil {
-		t.Fatal("blank local name returned an unresolved profile")
-	}
-	duplicateCfg := &ProfilesConfig{Profiles: []Profile{
-		{Name: "duplicate-blank", CorpID: "corp_duplicate_one"},
-		{Name: "Exact One", CorpID: "corp_duplicate_one", UserID: "identity_one"},
-		{Name: "duplicate-blank", CorpID: "corp_duplicate_two"},
-		{Name: "Exact Two", CorpID: "corp_duplicate_two", UserID: "identity_two"},
-	}}
-	if unresolvedProfileForLocalName(duplicateCfg, "duplicate-blank") != nil {
-		t.Fatal("duplicate unresolved local name selected an arbitrary profile")
-	}
-
-	oldLoadCorp := tokenLoadKeychainForCorpID
-	t.Cleanup(func() { tokenLoadKeychainForCorpID = oldLoadCorp })
-	tokenLoadKeychainForCorpID = func(string) (*TokenData, error) { return nil, nil }
-	if _, err := tokenLoadProfileIdentity(Profile{CorpID: "corp_nil_token_fixture"}); !errors.Is(err, ErrTokenDataNotFound) {
-		t.Fatalf("nil organization token error = %v", err)
-	}
-}
-
-func TestCrossPlatformCoverageLegacyProfileLifecycleErrorEdges(t *testing.T) {
-	oldEnsure := profilesEnsureMigration
-	oldLoad := profilesLoad
-	oldSave := profilesSave
-	oldLoadCorp := profilesLoadCorp
-	oldLoadLegacy := profilesLoadLegacy
-	oldLoadIdentity := profilesLoadIdentity
-	oldSaveCorp := profilesSaveCorp
-	oldDeleteCorp := profilesDeleteCorp
-	oldDeleteLegacy := profilesDeleteLegacy
-	oldDeleteMarker := profilesDeleteMarker
-	t.Cleanup(func() {
-		profilesEnsureMigration = oldEnsure
-		profilesLoad = oldLoad
-		profilesSave = oldSave
-		profilesLoadCorp = oldLoadCorp
-		profilesLoadLegacy = oldLoadLegacy
-		profilesLoadIdentity = oldLoadIdentity
-		profilesSaveCorp = oldSaveCorp
-		profilesDeleteCorp = oldDeleteCorp
-		profilesDeleteLegacy = oldDeleteLegacy
-		profilesDeleteMarker = oldDeleteMarker
-	})
-
-	identityFailure := errors.New("identity load failure")
-	profilesEnsureMigration = func(string) error { return nil }
-	profilesSave = func(string, *ProfilesConfig) error { return nil }
-	profilesLoadCorp = func(string) (*TokenData, error) { return nil, ErrTokenDataNotFound }
-	profilesLoadLegacy = func() (*TokenData, error) { return nil, ErrTokenDataNotFound }
-	profilesLoadIdentity = func(string, string) (*TokenData, error) { return nil, identityFailure }
-	profilesSaveCorp = func(string, *TokenData) error { return nil }
-	profilesDeleteCorp = func(string) error { return nil }
-	profilesDeleteLegacy = func() error { return nil }
-	profilesDeleteMarker = func(string) error { return nil }
-
-	setCurrentCfg := &ProfilesConfig{
-		Version:        profilesVersion,
-		CurrentProfile: "corp_set_fixture:identity_set_fixture",
-		OrgCurrentProfiles: map[string]string{
-			"corp_set_fixture": "corp_set_fixture:identity_set_fixture",
-		},
-		Profiles: []Profile{{
-			Name:   "Set Account",
-			CorpID: "corp_set_fixture",
-			UserID: "identity_set_fixture",
-		}},
-	}
-	profilesLoad = func(string) (*ProfilesConfig, error) { return setCurrentCfg, nil }
-	if _, err := setCurrentProfileLocked(t.TempDir(), "corp_set_fixture:identity_set_fixture"); !errors.Is(err, identityFailure) {
-		t.Fatalf("setCurrentProfileLocked sync error = %v", err)
-	}
-
-	usePreviousCfg := &ProfilesConfig{
-		Version:         profilesVersion,
-		CurrentProfile:  "corp_previous_fixture:identity_current_fixture",
-		PreviousProfile: "corp_previous_fixture:identity_previous_fixture",
-		OrgCurrentProfiles: map[string]string{
-			"corp_previous_fixture": "corp_previous_fixture:identity_current_fixture",
-		},
-		Profiles: []Profile{
-			{Name: "Current", CorpID: "corp_previous_fixture", UserID: "identity_current_fixture"},
-			{Name: "Previous", CorpID: "corp_previous_fixture", UserID: "identity_previous_fixture"},
-		},
-	}
-	profilesLoad = func(string) (*ProfilesConfig, error) { return usePreviousCfg, nil }
-	if _, err := usePreviousProfileLocked(t.TempDir()); !errors.Is(err, identityFailure) {
-		t.Fatalf("usePreviousProfileLocked sync error = %v", err)
-	}
-
-	snapshotFailure := errors.New("organization snapshot failure")
-	profilesLoadCorp = func(string) (*TokenData, error) { return nil, snapshotFailure }
-	if _, err := snapshotProfileSelectionMirrors(t.TempDir(), "corp_snapshot_fixture", true); !errors.Is(err, snapshotFailure) {
-		t.Fatalf("snapshot organization error = %v", err)
-	}
-	profilesLoadCorp = func(string) (*TokenData, error) { return nil, ErrTokenDataNotFound }
-
-	operationFailure := errors.New("selection operation failure")
-	organizationRestoreFailure := errors.New("organization restore failure")
-	profilesSaveCorp = func(string, *TokenData) error { return organizationRestoreFailure }
-	withOrganization := profileSelectionMirrorSnapshot{
-		organization: tokenSlotSnapshot{known: true, exists: true, token: &TokenData{CorpID: "corp_rollback_fixture"}},
-		marker:       tokenMarkerSnapshot{known: true},
-	}
-	if err := rollbackProfileSelection(t.TempDir(), &ProfilesConfig{}, "corp_rollback_fixture", withOrganization, operationFailure); !errors.Is(err, operationFailure) || !errors.Is(err, organizationRestoreFailure) {
-		t.Fatalf("rollback organization save error = %v", err)
-	}
-
-	organizationDeleteFailure := errors.New("organization delete failure")
-	profilesSaveCorp = func(string, *TokenData) error { return nil }
-	profilesDeleteCorp = func(string) error { return organizationDeleteFailure }
-	withoutOrganization := profileSelectionMirrorSnapshot{
-		organization: tokenSlotSnapshot{known: true},
-		marker:       tokenMarkerSnapshot{known: true},
-	}
-	if err := rollbackProfileSelection(t.TempDir(), &ProfilesConfig{}, "corp_rollback_fixture", withoutOrganization, operationFailure); !errors.Is(err, operationFailure) || !errors.Is(err, organizationDeleteFailure) {
-		t.Fatalf("rollback organization delete error = %v", err)
-	}
-	profilesDeleteCorp = func(string) error { return nil }
-
-	remainingCfg := &ProfilesConfig{
-		Version:        profilesVersion,
-		CurrentProfile: "corp_removed_fixture:identity_removed_fixture",
-		OrgCurrentProfiles: map[string]string{
-			"corp_removed_fixture": "corp_removed_fixture:identity_removed_fixture",
-		},
-		Profiles: []Profile{
-			{Name: "Removed", CorpID: "corp_removed_fixture", UserID: "identity_removed_fixture"},
-			{Name: "Remaining", CorpID: "corp_remaining_fixture", UserID: "identity_remaining_fixture"},
-		},
-	}
-	profilesLoad = func(string) (*ProfilesConfig, error) { return remainingCfg, nil }
-	if _, err := removeProfileLocked(t.TempDir(), "corp_removed_fixture:identity_removed_fixture"); err != nil {
-		t.Fatalf("removeProfileLocked(single fallback) error = %v", err)
-	}
-	if remainingCfg.CurrentProfile != "corp_remaining_fixture:identity_remaining_fixture" {
-		t.Fatalf("fallback current profile = %q", remainingCfg.CurrentProfile)
-	}
-
-	blankCfg := &ProfilesConfig{
-		Version:         profilesVersion,
-		CurrentProfile:  "corp_blank_fixture:identity_exact_fixture",
-		PreviousProfile: "legacy-blank-fixture",
-		OrgCurrentProfiles: map[string]string{
-			"corp_blank_fixture": "corp_blank_fixture:identity_exact_fixture",
-		},
-		Profiles: []Profile{
-			{Name: "legacy-blank-fixture", CorpID: "corp_blank_fixture"},
-			{Name: "Exact", CorpID: "corp_blank_fixture", UserID: "identity_exact_fixture"},
-		},
-	}
-	profilesLoad = func(string) (*ProfilesConfig, error) { return blankCfg, nil }
-	if _, err := removeProfileLocked(t.TempDir(), "corp_blank_fixture:identity_exact_fixture"); err != nil {
-		t.Fatalf("removeProfileLocked(blank fallback) error = %v", err)
-	}
-	if blankCfg.CurrentProfile != "corp_blank_fixture" || blankCfg.OrgCurrentProfiles["corp_blank_fixture"] != "" {
-		t.Fatalf("blank fallback selection = current %q org %q", blankCfg.CurrentProfile, blankCfg.OrgCurrentProfiles["corp_blank_fixture"])
-	}
-}

internal/auth/legacy_version_migration_test.go

@@ -1,879 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package auth
-
-import (
-	"encoding/json"
-	"errors"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/keychain"
-)
-
-// The fixture builders spell out the exact v1 profiles and token JSON keys.
-// They deliberately avoid the current TokenData and ProfilesConfig serializers
-// so that historical field omission and account names stay part of the upgrade
-// contract exercised by these tests.
-func TestCrossPlatformCoverageV1044GlobalSlotWithoutProfilesMigrates(t *testing.T) {
-	for _, tc := range []struct {
-		name   string
-		userID string
-	}{
-		{name: "known user", userID: "legacy-user-v1044"},
-		{name: "unresolved external worker"},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			cleanupHistoricalKeychain(t)
-			configDir := t.TempDir()
-			corpID := "ding_v1044_" + strings.ReplaceAll(tc.name, " ", "_")
-			seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-				t, "global-v1044-"+tc.name, corpID, "V1044 Org", tc.userID, "",
-			))
-
-			loaded, err := LoadTokenData(configDir)
-			if err != nil {
-				t.Fatalf("LoadTokenData() error = %v", err)
-			}
-			if loaded.CorpID != corpID || loaded.UserID != tc.userID {
-				t.Fatalf("migrated v1.0.44 token = %#v", loaded)
-			}
-			if !TokenDataExistsKeychainForCorpID(corpID) {
-				t.Fatal("v1.0.44 global token was not copied to its organization slot")
-			}
-			if tc.userID != "" && !TokenDataExistsKeychainForIdentity(corpID, tc.userID) {
-				t.Fatal("v1.0.44 known identity slot was not created")
-			}
-		})
-	}
-}
-
-func TestCrossPlatformCoverageV1050AndV1051GlobalSlotWithV1ProfilesMigratesIdentity(t *testing.T) {
-	tests := []struct {
-		name        string
-		corpID      string
-		corpName    string
-		userID      string
-		userName    string
-		tokenHasUID bool
-	}{
-		{
-			name:        "v1.0.50 token and profile both carry userId",
-			corpID:      "ding_v1050",
-			corpName:    "V1050 Org",
-			userID:      "legacy-user-v1050",
-			userName:    "V1050 User",
-			tokenHasUID: true,
-		},
-		{
-			name:        "v1.0.51 profile supplies omitted token userId",
-			corpID:      "ding_v1051",
-			corpName:    "V1051 Org",
-			userID:      "legacy-user-v1051",
-			userName:    "V1051 User",
-			tokenHasUID: false,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			cleanupHistoricalKeychain(t)
-			configDir := t.TempDir()
-			writeHistoricalV1Profiles(t, configDir, []historicalV1Profile{{
-				name:     tc.corpName,
-				corpID:   tc.corpID,
-				corpName: tc.corpName,
-				userID:   tc.userID,
-				userName: tc.userName,
-				clientID: "ding-client-" + tc.corpID,
-			}}, tc.corpID, "", tc.corpID)
-
-			tokenUserID, tokenUserName := "", ""
-			if tc.tokenHasUID {
-				tokenUserID, tokenUserName = tc.userID, tc.userName
-			}
-			seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-				t,
-				"global-"+tc.corpID,
-				tc.corpID,
-				tc.corpName,
-				tokenUserID,
-				tokenUserName,
-			))
-
-			// An ordinary first read is the upgrade trigger. A recoverable global
-			// token must populate both the organization and exact-identity slots
-			// even when a version-1 profiles registry already exists.
-			if _, err := LoadTokenData(configDir); err != nil {
-				t.Fatalf("LoadTokenData() error = %v", err)
-			}
-			migrated, err := LoadTokenDataKeychainForIdentity(tc.corpID, tc.userID)
-			if err != nil {
-				t.Fatalf("LoadTokenDataKeychainForIdentity(%q, %q) error = %v", tc.corpID, tc.userID, err)
-			}
-			if migrated.CorpID != tc.corpID || migrated.UserID != tc.userID {
-				t.Fatalf("migrated identity token = %#v", migrated)
-			}
-			if migrated.AccessToken != "global-"+tc.corpID ||
-				migrated.RefreshToken != "refresh-global-"+tc.corpID ||
-				migrated.PersistentCode != "persistent-global-"+tc.corpID ||
-				migrated.ClientID != "ding-client-historical" ||
-				migrated.Source != "mcp" {
-				t.Fatalf("migrated token fields were not preserved: %#v", migrated)
-			}
-			orgMirror, err := LoadTokenDataKeychainForCorpID(tc.corpID)
-			if err != nil {
-				t.Fatalf("LoadTokenDataKeychainForCorpID(%q) error = %v", tc.corpID, err)
-			}
-			if orgMirror.AccessToken != "global-"+tc.corpID {
-				t.Fatalf("organization token slot %q = %#v", TokenAccountForCorpID(tc.corpID), orgMirror)
-			}
-			if !tc.tokenHasUID && orgMirror.UserID != "" {
-				t.Fatalf("organization mirror inferred userId %q; want untouched historical blob", orgMirror.UserID)
-			}
-		})
-	}
-
-}
-
-func TestCrossPlatformCoverageV1052RawMultiOrganizationSlotsMigrateEveryIdentity(t *testing.T) {
-	cleanupHistoricalKeychain(t)
-	configDir := t.TempDir()
-	organizations := seedHistoricalV1052MultiOrganizationState(t, configDir)
-
-	// Reading only the current organization must upgrade the complete registry,
-	// including inactive organizations that are not selected.
-	loaded, err := LoadTokenData(configDir)
-	if err != nil {
-		t.Fatalf("LoadTokenData() error = %v", err)
-	}
-	if loaded.CorpID != organizations[1].corpID || loaded.UserID != organizations[1].userID {
-		t.Fatalf("current token after migration = %#v", loaded)
-	}
-	assertHistoricalV1052IdentitySlots(t, organizations, nil)
-}
-
-func TestCrossPlatformCoverageV1052UnresolvedMultiOrganizationProfilesRemainUsable(t *testing.T) {
-	cleanupHistoricalKeychain(t)
-	configDir := t.TempDir()
-	organizations := []historicalV1052Organization{
-		{corpID: "ding_v1052_external_a", corpName: "External Org A", accessToken: "external-access-a"},
-		{corpID: "ding_v1052_external_b", corpName: "External Org B", accessToken: "external-access-b"},
-		{corpID: "ding_v1052_external_c", corpName: "External Org C", accessToken: "external-access-c"},
-	}
-	profiles := make([]historicalV1Profile, 0, len(organizations))
-	for _, organization := range organizations {
-		profiles = append(profiles, historicalV1Profile{
-			name: organization.corpName, corpID: organization.corpID, corpName: organization.corpName,
-		})
-		seedHistoricalTokenSlot(t, TokenAccountForCorpID(organization.corpID), historicalTokenJSON(
-			t, organization.accessToken, organization.corpID, organization.corpName, "", "",
-		))
-	}
-	writeHistoricalV1Profiles(
-		t,
-		configDir,
-		profiles,
-		organizations[0].corpID,
-		organizations[0].corpID,
-		organizations[1].corpID,
-	)
-
-	if err := EnsureProfilesMigration(configDir); err != nil {
-		t.Fatalf("EnsureProfilesMigration() error = %v", err)
-	}
-	for _, organization := range organizations {
-		loaded, err := LoadTokenDataForProfile(configDir, organization.corpID)
-		if err != nil {
-			t.Fatalf("LoadTokenDataForProfile(%q) error = %v", organization.corpID, err)
-		}
-		if loaded.AccessToken != organization.accessToken || loaded.CorpID != organization.corpID || loaded.UserID != "" {
-			t.Fatalf("unresolved organization token for %q = %#v", organization.corpID, loaded)
-		}
-	}
-}
-
-func TestCrossPlatformCoverageV1052FirstSaveMigratesAllOrganizationsBeforeV2Commit(t *testing.T) {
-	cleanupHistoricalKeychain(t)
-	configDir := t.TempDir()
-	organizations := seedHistoricalV1052MultiOrganizationState(t, configDir)
-
-	// A login or refresh can make SaveTokenData the first new-version action.
-	// It must migrate every old organization before profiles.json becomes v2,
-	// otherwise the remaining organization mirrors are stranded permanently.
-	firstWrite := &TokenData{
-		AccessToken:    "new-first-action-access",
-		RefreshToken:   "new-first-action-refresh",
-		PersistentCode: "new-first-action-persistent",
-		CorpID:         organizations[1].corpID,
-		CorpName:       organizations[1].corpName,
-		UserID:         organizations[1].userID,
-		UserName:       organizations[1].userName,
-		ClientID:       "ding-client-new-first-action",
-		Source:         "mcp",
-	}
-	if err := SaveTokenData(configDir, firstWrite); err != nil {
-		t.Fatalf("SaveTokenData(first new-version action) error = %v", err)
-	}
-
-	assertHistoricalV1052IdentitySlots(t, organizations, map[string]string{
-		organizations[1].corpID: firstWrite.AccessToken,
-	})
-	migratedCurrent, err := LoadTokenDataKeychainForIdentity(firstWrite.CorpID, firstWrite.UserID)
-	if err != nil {
-		t.Fatalf("LoadTokenDataKeychainForIdentity(first write) error = %v", err)
-	}
-	if migratedCurrent.RefreshToken != firstWrite.RefreshToken ||
-		migratedCurrent.PersistentCode != firstWrite.PersistentCode ||
-		migratedCurrent.ClientID != firstWrite.ClientID ||
-		migratedCurrent.Source != firstWrite.Source {
-		t.Fatalf("first-write identity token fields were not preserved: %#v", migratedCurrent)
-	}
-	cfg, err := LoadProfiles(configDir)
-	if err != nil {
-		t.Fatalf("LoadProfiles() error = %v", err)
-	}
-	if cfg.Version != profilesVersion || len(cfg.Profiles) != len(organizations) {
-		t.Fatalf("profiles after first save = %#v", cfg)
-	}
-}
-
-func TestCrossPlatformCoverageLegacyGlobalFallbackIsStrictlyScoped(t *testing.T) {
-	t.Run("different organization is never reused", func(t *testing.T) {
-		cleanupHistoricalKeychain(t)
-		configDir := t.TempDir()
-		writeHistoricalV1Profiles(t, configDir, []historicalV1Profile{{
-			name:     "Expected Org",
-			corpID:   "ding_expected",
-			corpName: "Expected Org",
-			userID:   "expected-user",
-			userName: "Expected User",
-			clientID: "ding-client-expected",
-		}}, "ding_expected", "", "ding_expected")
-		seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-			t,
-			"wrong-org-access",
-			"ding_other",
-			"Other Org",
-			"other-user",
-			"Other User",
-		))
-
-		if err := EnsureProfilesMigration(configDir); err != nil {
-			t.Fatalf("EnsureProfilesMigration() error = %v", err)
-		}
-		if TokenDataExistsKeychainForCorpID("ding_expected") ||
-			TokenDataExistsKeychainForIdentity("ding_expected", "expected-user") {
-			t.Fatal("global token from another organization was reused")
-		}
-	})
-
-	t.Run("version 2 empty tombstone never imports global slot", func(t *testing.T) {
-		cleanupHistoricalKeychain(t)
-		configDir := t.TempDir()
-		if err := SaveProfiles(configDir, &ProfilesConfig{Version: profilesVersion}); err != nil {
-			t.Fatalf("SaveProfiles() error = %v", err)
-		}
-		seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-			t,
-			"stale-v2-global",
-			"ding_v2",
-			"V2 Org",
-			"v2-user",
-			"V2 User",
-		))
-
-		if err := EnsureProfilesMigration(configDir); err != nil {
-			t.Fatalf("EnsureProfilesMigration() error = %v", err)
-		}
-		if TokenDataExistsKeychainForCorpID("ding_v2") ||
-			TokenDataExistsKeychainForIdentity("ding_v2", "v2-user") {
-			t.Fatal("version 2 logout tombstone imported the stale global slot")
-		}
-	})
-
-	t.Run("multiple same organization accounts never receive guessed identity", func(t *testing.T) {
-		cleanupHistoricalKeychain(t)
-		configDir := t.TempDir()
-		writeHistoricalV1Profiles(t, configDir, []historicalV1Profile{
-			{
-				name:     "Shared Org One",
-				corpID:   "ding_shared",
-				corpName: "Shared Org",
-				userID:   "shared-user-one",
-				userName: "Shared User One",
-				clientID: "ding-client-shared",
-			},
-			{
-				name:     "Shared Org Two",
-				corpID:   "ding_shared",
-				corpName: "Shared Org",
-				userID:   "shared-user-two",
-				userName: "Shared User Two",
-				clientID: "ding-client-shared",
-			},
-		}, "ding_shared", "", "ding_shared")
-		seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-			t,
-			"shared-without-user",
-			"ding_shared",
-			"Shared Org",
-			"",
-			"",
-		))
-
-		if err := EnsureProfilesMigration(configDir); err != nil {
-			t.Fatalf("EnsureProfilesMigration() error = %v", err)
-		}
-		if !TokenDataExistsKeychainForCorpID("ding_shared") {
-			t.Fatal("matching organization mirror was not restored")
-		}
-		for _, userID := range []string{"shared-user-one", "shared-user-two"} {
-			if TokenDataExistsKeychainForIdentity("ding_shared", userID) {
-				t.Fatalf("ambiguous global token was copied to identity %q", userID)
-			}
-		}
-	})
-}
-
-func TestCrossPlatformCoverageV1053PartialV2RegistryRepairsFromMatchingGlobalSlot(t *testing.T) {
-	tests := []struct {
-		name          string
-		profileUserID string
-		tokenUserID   string
-	}{
-		{
-			name:          "matching token identity",
-			profileUserID: "user_v1053_matching",
-			tokenUserID:   "user_v1053_matching",
-		},
-		{name: "token omitted identity", profileUserID: "user_v1053_token_omitted"},
-		{name: "sole unresolved profile"},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			cleanupHistoricalKeychain(t)
-			configDir := t.TempDir()
-			suffix := strings.ReplaceAll(tc.name, " ", "_")
-			corpID := "ding_v1053_partial_" + suffix
-			profile := Profile{
-				Name:     "V1053 Partial Org",
-				CorpID:   corpID,
-				CorpName: "V1053 Partial Org",
-				UserID:   tc.profileUserID,
-				UserName: "V1053 Partial User",
-			}
-			identityLoads := 0
-			if profile.UserID == "" {
-				originalLoadIdentity := profilesLoadIdentity
-				profilesLoadIdentity = func(corpID, userID string) (*TokenData, error) {
-					identityLoads++
-					return originalLoadIdentity(corpID, userID)
-				}
-				t.Cleanup(func() { profilesLoadIdentity = originalLoadIdentity })
-			}
-			selector := ProfileSelector(profile)
-			if err := SaveProfiles(configDir, &ProfilesConfig{
-				Version:            profilesVersion,
-				CurrentProfile:     selector,
-				OrgCurrentProfiles: map[string]string{corpID: selector},
-				Profiles:           []Profile{profile},
-			}); err != nil {
-				t.Fatalf("SaveProfiles() error = %v", err)
-			}
-			seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-				t,
-				"v1053-global-"+suffix,
-				corpID,
-				profile.CorpName,
-				tc.tokenUserID,
-				"",
-			))
-
-			if TokenDataExistsKeychainForCorpID(corpID) {
-				t.Fatal("partial v2 fixture unexpectedly contained an organization or identity slot")
-			}
-			if profile.UserID != "" && TokenDataExistsKeychainForIdentity(corpID, profile.UserID) {
-				t.Fatal("partial v2 fixture unexpectedly contained an identity slot")
-			}
-			loaded, err := LoadTokenDataForProfile(configDir, selector)
-			if err != nil {
-				t.Fatalf("LoadTokenDataForProfile() error = %v", err)
-			}
-			if loaded.AccessToken != "v1053-global-"+suffix ||
-				loaded.CorpID != corpID || loaded.UserID != profile.UserID {
-				t.Fatalf("repaired v2 token = %#v", loaded)
-			}
-
-			if profile.UserID != "" {
-				identityToken, identityErr := LoadTokenDataKeychainForIdentity(corpID, profile.UserID)
-				if identityErr != nil {
-					t.Fatalf("LoadTokenDataKeychainForIdentity() error = %v", identityErr)
-				}
-				if identityToken.AccessToken != loaded.AccessToken || identityToken.UserID != profile.UserID {
-					t.Fatalf("repaired identity token = %#v", identityToken)
-				}
-			}
-			orgMirror, err := LoadTokenDataKeychainForCorpID(corpID)
-			if err != nil {
-				t.Fatalf("LoadTokenDataKeychainForCorpID() error = %v", err)
-			}
-			if orgMirror.AccessToken != loaded.AccessToken || orgMirror.UserID != tc.tokenUserID {
-				t.Fatalf("repaired organization mirror = %#v", orgMirror)
-			}
-			if identityLoads != 0 {
-				t.Fatalf("unresolved profile caused %d identity-slot reads; want 0", identityLoads)
-			}
-		})
-	}
-
-	t.Run("matching organization among multiple organizations", func(t *testing.T) {
-		cleanupHistoricalKeychain(t)
-		configDir := t.TempDir()
-		profiles := []Profile{
-			{Name: "Partial Org A", CorpID: "ding_v1053_partial_a", UserID: "user_v1053_partial_a"},
-			{Name: "Partial Org B", CorpID: "ding_v1053_partial_b", UserID: "user_v1053_partial_b"},
-		}
-		if err := SaveProfiles(configDir, &ProfilesConfig{
-			Version:        profilesVersion,
-			CurrentProfile: ProfileSelector(profiles[1]),
-			Profiles:       profiles,
-		}); err != nil {
-			t.Fatalf("SaveProfiles() error = %v", err)
-		}
-		seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-			t,
-			"v1053-global-multi-org",
-			profiles[1].CorpID,
-			profiles[1].Name,
-			profiles[1].UserID,
-			"",
-		))
-
-		if err := EnsureProfilesMigration(configDir); err != nil {
-			t.Fatalf("EnsureProfilesMigration() error = %v", err)
-		}
-		if TokenDataExistsKeychainForCorpID(profiles[0].CorpID) ||
-			TokenDataExistsKeychainForIdentity(profiles[0].CorpID, profiles[0].UserID) {
-			t.Fatal("global token was copied into the non-matching organization")
-		}
-		repaired, err := LoadTokenDataKeychainForIdentity(profiles[1].CorpID, profiles[1].UserID)
-		if err != nil {
-			t.Fatalf("LoadTokenDataKeychainForIdentity(matching organization) error = %v", err)
-		}
-		if repaired.AccessToken != "v1053-global-multi-org" || repaired.UserID != profiles[1].UserID {
-			t.Fatalf("multi-organization v2 repair token = %#v", repaired)
-		}
-	})
-}
-
-func TestCrossPlatformCoverageV1053PartialV2RegistryRejectsUnsafeGlobalSlot(t *testing.T) {
-	t.Run("global token organization differs", func(t *testing.T) {
-		cleanupHistoricalKeychain(t)
-		configDir := t.TempDir()
-		profile := Profile{Name: "Expected Org", CorpID: "ding_v2_expected", UserID: "user_v2_expected"}
-		if err := SaveProfiles(configDir, &ProfilesConfig{
-			Version:        profilesVersion,
-			CurrentProfile: ProfileSelector(profile),
-			Profiles:       []Profile{profile},
-		}); err != nil {
-			t.Fatalf("SaveProfiles() error = %v", err)
-		}
-		seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-			t, "cross-corp-global", "ding_v2_other", "Other Org", profile.UserID, "",
-		))
-
-		if err := EnsureProfilesMigration(configDir); err != nil {
-			t.Fatalf("EnsureProfilesMigration() error = %v", err)
-		}
-		if TokenDataExistsKeychainForCorpID(profile.CorpID) ||
-			TokenDataExistsKeychainForIdentity(profile.CorpID, profile.UserID) {
-			t.Fatal("cross-organization global token was imported")
-		}
-	})
-
-	t.Run("unresolved profile rejects global token identity", func(t *testing.T) {
-		cleanupHistoricalKeychain(t)
-		configDir := t.TempDir()
-		profile := Profile{Name: "Unresolved External", CorpID: "ding_v2_unresolved"}
-		if err := SaveProfiles(configDir, &ProfilesConfig{
-			Version:        profilesVersion,
-			CurrentProfile: ProfileSelector(profile),
-			Profiles:       []Profile{profile},
-		}); err != nil {
-			t.Fatalf("SaveProfiles() error = %v", err)
-		}
-		seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-			t, "unexpected-identity-global", profile.CorpID, profile.Name, "user_v2_unexpected", "",
-		))
-
-		if err := EnsureProfilesMigration(configDir); err != nil {
-			t.Fatalf("EnsureProfilesMigration() error = %v", err)
-		}
-		if TokenDataExistsKeychainForCorpID(profile.CorpID) {
-			t.Fatal("global token userId was attached to an unresolved profile")
-		}
-	})
-
-	t.Run("global token identity differs", func(t *testing.T) {
-		cleanupHistoricalKeychain(t)
-		configDir := t.TempDir()
-		profile := Profile{Name: "Expected User", CorpID: "ding_v2_uid", UserID: "user_v2_expected"}
-		if err := SaveProfiles(configDir, &ProfilesConfig{
-			Version:        profilesVersion,
-			CurrentProfile: ProfileSelector(profile),
-			Profiles:       []Profile{profile},
-		}); err != nil {
-			t.Fatalf("SaveProfiles() error = %v", err)
-		}
-		seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-			t, "wrong-user-global", profile.CorpID, profile.Name, "user_v2_other", "",
-		))
-
-		if err := EnsureProfilesMigration(configDir); err != nil {
-			t.Fatalf("EnsureProfilesMigration() error = %v", err)
-		}
-		if TokenDataExistsKeychainForCorpID(profile.CorpID) ||
-			TokenDataExistsKeychainForIdentity(profile.CorpID, profile.UserID) {
-			t.Fatal("global token with a different userId was imported")
-		}
-	})
-
-	t.Run("multiple accounts in one organization stay unresolved", func(t *testing.T) {
-		cleanupHistoricalKeychain(t)
-		configDir := t.TempDir()
-		corpID := "ding_v2_shared"
-		profiles := []Profile{
-			{Name: "Shared User One", CorpID: corpID, UserID: "user_v2_shared_one"},
-			{Name: "Shared User Two", CorpID: corpID, UserID: "user_v2_shared_two"},
-		}
-		if err := SaveProfiles(configDir, &ProfilesConfig{
-			Version:        profilesVersion,
-			CurrentProfile: ProfileSelector(profiles[0]),
-			Profiles:       profiles,
-		}); err != nil {
-			t.Fatalf("SaveProfiles() error = %v", err)
-		}
-		seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-			t, "ambiguous-global", corpID, "Shared Org", profiles[0].UserID, "",
-		))
-
-		if err := EnsureProfilesMigration(configDir); err != nil {
-			t.Fatalf("EnsureProfilesMigration() error = %v", err)
-		}
-		if TokenDataExistsKeychainForCorpID(corpID) {
-			t.Fatal("multi-account organization imported the mutable global mirror")
-		}
-		for _, profile := range profiles {
-			if TokenDataExistsKeychainForIdentity(corpID, profile.UserID) {
-				t.Fatalf("multi-account global token was copied to identity %q", profile.UserID)
-			}
-		}
-	})
-
-	t.Run("existing exact identity is not overwritten", func(t *testing.T) {
-		cleanupHistoricalKeychain(t)
-		configDir := t.TempDir()
-		profile := Profile{Name: "Existing User", CorpID: "ding_v2_existing", UserID: "user_v2_existing"}
-		if err := SaveProfiles(configDir, &ProfilesConfig{
-			Version:        profilesVersion,
-			CurrentProfile: ProfileSelector(profile),
-			Profiles:       []Profile{profile},
-		}); err != nil {
-			t.Fatalf("SaveProfiles() error = %v", err)
-		}
-		seedHistoricalTokenSlot(t, TokenAccountForIdentity(profile.CorpID, profile.UserID), historicalTokenJSON(
-			t, "existing-exact", profile.CorpID, profile.Name, profile.UserID, "",
-		))
-		seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-			t, "stale-global", profile.CorpID, profile.Name, profile.UserID, "",
-		))
-
-		if err := EnsureProfilesMigration(configDir); err != nil {
-			t.Fatalf("EnsureProfilesMigration() error = %v", err)
-		}
-		if TokenDataExistsKeychainForCorpID(profile.CorpID) {
-			t.Fatal("global mirror recreated an organization slot beside an existing exact identity")
-		}
-		exact, err := LoadTokenDataKeychainForIdentity(profile.CorpID, profile.UserID)
-		if err != nil {
-			t.Fatalf("LoadTokenDataKeychainForIdentity() error = %v", err)
-		}
-		if exact.AccessToken != "existing-exact" {
-			t.Fatalf("existing exact identity was overwritten: %#v", exact)
-		}
-	})
-}
-
-func TestCrossPlatformCoverageLegacyMigrationPersistenceErrors(t *testing.T) {
-	oldLoad := profilesLoad
-	oldSave := profilesSave
-	oldLoadLegacy := profilesLoadLegacy
-	oldSaveCorp := profilesSaveCorp
-	oldLoadCorp := profilesLoadCorp
-	oldLoadIdentity := profilesLoadIdentity
-	oldSaveIdentity := profilesSaveIdentity
-	t.Cleanup(func() {
-		profilesLoad = oldLoad
-		profilesSave = oldSave
-		profilesLoadLegacy = oldLoadLegacy
-		profilesSaveCorp = oldSaveCorp
-		profilesLoadCorp = oldLoadCorp
-		profilesLoadIdentity = oldLoadIdentity
-		profilesSaveIdentity = oldSaveIdentity
-	})
-
-	fail := errors.New("legacy migration persistence failed")
-	baseConfig := func(version int) *ProfilesConfig {
-		return &ProfilesConfig{
-			Version: version,
-			Profiles: []Profile{{
-				Name: "Legacy User", CorpID: "ding_legacy_error", UserID: "legacy-user",
-			}},
-		}
-	}
-	profilesSave = func(string, *ProfilesConfig) error { return nil }
-	profilesLoadCorp = func(string) (*TokenData, error) { return nil, ErrTokenDataNotFound }
-	profilesLoadIdentity = func(string, string) (*TokenData, error) { return nil, ErrTokenDataNotFound }
-	profilesSaveIdentity = func(string, string, *TokenData) error { return nil }
-
-	t.Run("global compatibility slot read", func(t *testing.T) {
-		profilesLoad = func(string) (*ProfilesConfig, error) { return baseConfig(1), nil }
-		profilesLoadLegacy = func() (*TokenData, error) { return nil, fail }
-		profilesSaveCorp = func(string, *TokenData) error { return nil }
-		if err := ensureProfilesMigrationLocked("cfg"); !errors.Is(err, fail) {
-			t.Fatalf("ensureProfilesMigrationLocked() error = %v, want %v", err, fail)
-		}
-	})
-
-	t.Run("restored organization slot write", func(t *testing.T) {
-		profilesLoad = func(string) (*ProfilesConfig, error) { return baseConfig(1), nil }
-		profilesLoadLegacy = func() (*TokenData, error) {
-			return &TokenData{CorpID: "ding_legacy_error", AccessToken: "legacy-access"}, nil
-		}
-		profilesSaveCorp = func(string, *TokenData) error { return fail }
-		if err := ensureProfilesMigrationLocked("cfg"); !errors.Is(err, fail) {
-			t.Fatalf("ensureProfilesMigrationLocked() error = %v, want %v", err, fail)
-		}
-	})
-
-	t.Run("repaired identity slot write", func(t *testing.T) {
-		profilesLoad = func(string) (*ProfilesConfig, error) { return baseConfig(profilesVersion), nil }
-		profilesLoadCorp = func(string) (*TokenData, error) {
-			return &TokenData{CorpID: "ding_legacy_error", AccessToken: "legacy-access"}, nil
-		}
-		profilesSaveIdentity = func(string, string, *TokenData) error { return fail }
-		if err := ensureProfilesMigrationLocked("cfg"); !errors.Is(err, fail) {
-			t.Fatalf("ensureProfilesMigrationLocked() error = %v, want %v", err, fail)
-		}
-	})
-
-	t.Run("partial v2 identity slot read", func(t *testing.T) {
-		profilesLoad = func(string) (*ProfilesConfig, error) { return baseConfig(profilesVersion), nil }
-		profilesLoadCorp = func(string) (*TokenData, error) { return nil, ErrTokenDataNotFound }
-		profilesLoadIdentity = func(string, string) (*TokenData, error) { return nil, fail }
-		if err := ensureProfilesMigrationLocked("cfg"); !errors.Is(err, fail) {
-			t.Fatalf("ensureProfilesMigrationLocked() error = %v, want %v", err, fail)
-		}
-	})
-}
-
-type historicalV1Profile struct {
-	name     string
-	corpID   string
-	corpName string
-	userID   string
-	userName string
-	clientID string
-}
-
-type historicalV1052Organization struct {
-	corpID      string
-	corpName    string
-	userID      string
-	userName    string
-	accessToken string
-}
-
-func seedHistoricalV1052MultiOrganizationState(t *testing.T, configDir string) []historicalV1052Organization {
-	t.Helper()
-	organizations := []historicalV1052Organization{
-		{corpID: "ding_v1052_a", corpName: "V1052 Org A", userID: "legacy-user-v1052-a", userName: "V1052 User A", accessToken: "v1052-access-a"},
-		{corpID: "ding_v1052_b", corpName: "V1052 Org B", userID: "legacy-user-v1052-b", userName: "V1052 User B", accessToken: "v1052-access-b"},
-		{corpID: "ding_v1052_c", corpName: "V1052 Org C", userID: "legacy-user-v1052-c", userName: "V1052 User C", accessToken: "v1052-access-c"},
-	}
-	profiles := make([]historicalV1Profile, 0, len(organizations))
-	for _, organization := range organizations {
-		profiles = append(profiles, historicalV1Profile{
-			name:     organization.corpName,
-			corpID:   organization.corpID,
-			corpName: organization.corpName,
-			userID:   organization.userID,
-			userName: organization.userName,
-			clientID: "ding-client-v1052",
-		})
-	}
-	writeHistoricalV1Profiles(
-		t,
-		configDir,
-		profiles,
-		organizations[0].corpID,
-		organizations[0].corpID,
-		organizations[1].corpID,
-	)
-
-	for _, organization := range organizations {
-		// v1.0.52 MCP responses commonly omitted userId while profiles.json
-		// retained a uniquely known identity.
-		seedHistoricalTokenSlot(t, TokenAccountForCorpID(organization.corpID), historicalTokenJSON(
-			t,
-			organization.accessToken,
-			organization.corpID,
-			organization.corpName,
-			"",
-			"",
-		))
-	}
-	// v1.0.52 also mirrored the selected organization into the global account.
-	current := organizations[1]
-	seedHistoricalTokenSlot(t, keychain.AccountToken, historicalTokenJSON(
-		t,
-		current.accessToken,
-		current.corpID,
-		current.corpName,
-		"",
-		"",
-	))
-	return organizations
-}
-
-func assertHistoricalV1052IdentitySlots(
-	t *testing.T,
-	organizations []historicalV1052Organization,
-	accessOverrides map[string]string,
-) {
-	t.Helper()
-	for _, organization := range organizations {
-		migrated, err := LoadTokenDataKeychainForIdentity(organization.corpID, organization.userID)
-		if err != nil {
-			t.Errorf("LoadTokenDataKeychainForIdentity(%q, %q) error = %v", organization.corpID, organization.userID, err)
-			continue
-		}
-		wantAccess := organization.accessToken
-		if override := accessOverrides[organization.corpID]; override != "" {
-			wantAccess = override
-		}
-		if migrated.AccessToken != wantAccess ||
-			migrated.CorpID != organization.corpID ||
-			migrated.UserID != organization.userID {
-			t.Errorf(
-				"migrated token for %q = %#v, want access=%q userId=%q",
-				organization.corpID,
-				migrated,
-				wantAccess,
-				organization.userID,
-			)
-		}
-		if accessOverrides[organization.corpID] == "" &&
-			(migrated.RefreshToken != "refresh-"+organization.accessToken ||
-				migrated.PersistentCode != "persistent-"+organization.accessToken ||
-				migrated.ClientID != "ding-client-historical" ||
-				migrated.Source != "mcp") {
-			t.Errorf("historical token fields for %q were not preserved: %#v", organization.corpID, migrated)
-		}
-	}
-}
-
-func historicalTokenJSON(t *testing.T, accessToken, corpID, corpName, userID, userName string) string {
-	t.Helper()
-	fixture := map[string]any{
-		"access_token":       accessToken,
-		"refresh_token":      "refresh-" + accessToken,
-		"persistent_code":    "persistent-" + accessToken,
-		"expires_at":         "2030-01-02T03:04:05Z",
-		"refresh_expires_at": "2030-02-02T03:04:05Z",
-		"corp_id":            corpID,
-		"corp_name":          corpName,
-		"client_id":          "ding-client-historical",
-		"source":             "mcp",
-	}
-	if userID != "" {
-		fixture["user_id"] = userID
-	}
-	if userName != "" {
-		fixture["user_name"] = userName
-	}
-	data, err := json.MarshalIndent(fixture, "", "  ")
-	if err != nil {
-		t.Fatalf("marshal historical token fixture: %v", err)
-	}
-	return string(data)
-}
-
-func writeHistoricalV1Profiles(
-	t *testing.T,
-	configDir string,
-	profiles []historicalV1Profile,
-	primaryProfile string,
-	previousProfile string,
-	currentProfile string,
-) {
-	t.Helper()
-	rawProfiles := make([]map[string]any, 0, len(profiles))
-	for _, profile := range profiles {
-		rawProfiles = append(rawProfiles, map[string]any{
-			"name":         profile.name,
-			"corpId":       profile.corpID,
-			"corpName":     profile.corpName,
-			"userId":       profile.userID,
-			"userName":     profile.userName,
-			"clientId":     profile.clientID,
-			"status":       "active",
-			"expiresAt":    "2030-01-02T03:04:05Z",
-			"refreshExpAt": "2030-02-02T03:04:05Z",
-		})
-	}
-	fixture := map[string]any{
-		"version":         1,
-		"primaryProfile":  primaryProfile,
-		"currentProfile":  currentProfile,
-		"previousProfile": previousProfile,
-		"profiles":        rawProfiles,
-	}
-	data, err := json.MarshalIndent(fixture, "", "  ")
-	if err != nil {
-		t.Fatalf("marshal historical profiles fixture: %v", err)
-	}
-	if err := os.MkdirAll(configDir, 0o700); err != nil {
-		t.Fatalf("create historical config directory: %v", err)
-	}
-	if err := os.WriteFile(ProfilesPath(configDir), append(data, '\n'), 0o600); err != nil {
-		t.Fatalf("write historical profiles.json: %v", err)
-	}
-}
-
-func seedHistoricalTokenSlot(t *testing.T, account, raw string) {
-	t.Helper()
-	if err := keychain.Set(keychain.Service, account, raw); err != nil {
-		t.Fatalf("seed historical keychain account %q: %v", account, err)
-	}
-}
-
-func cleanupHistoricalKeychain(t *testing.T) {
-	t.Helper()
-	t.Setenv(keychain.DisableKeychainEnv, "1")
-	cleanupKeychain(t)
-}

internal/auth/manager.go

@@ -47,10 +47,8 @@ func (m *Manager) GetToken() (string, string, error) {
 		}
 		return token, "file", nil
 	}
-	if err != nil && !os.IsNotExist(err) {
-		return "", "", fmt.Errorf("load legacy token: %w", err)
-	}
-	return "", "", fmt.Errorf("%s: %w", i18n.T("未找到认证信息，请运行 dws auth login"), ErrTokenDataNotFound)
+
+	return "", "", fmt.Errorf("%s", i18n.T("未找到认证信息，请运行 dws auth login"))
 }
 
 func (m *Manager) GetMCPURL() (string, error) {

internal/auth/oauth_helpers.go

@@ -27,6 +27,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/i18n"
 	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/config"
 )
 
@@ -38,6 +39,10 @@ var (
 )
 
 func (p *OAuthProvider) exchangeCode(ctx context.Context, code string) (*TokenData, error) {
+	if err := preflightTokenPersistence(p.configDir); err != nil {
+		return nil, fmt.Errorf("%s: %w", i18n.T("本地登录态无法安全更新"), err)
+	}
+
 	// Use MCP mode if clientID is from MCP server
 	if IsClientIDFromMCP() {
 		return p.exchangeCodeViaMCP(ctx, code)
@@ -74,21 +79,13 @@ func (p *OAuthProvider) exchangeCode(ctx context.Context, code string) (*TokenDa
 // the currently configured client credentials.  This is a convenience wrapper
 // around OAuthProvider.exchangeCode for callers outside the auth package.
 func ExchangeCodeForToken(ctx context.Context, configDir, code string) (*TokenData, error) {
-	if err := prepareLoginPersistence(configDir); err != nil {
-		return nil, fmt.Errorf("local login state cannot be safely updated before token exchange: %w", err)
-	}
 	p := &OAuthProvider{
 		configDir:  configDir,
 		clientID:   ClientID(),
 		Output:     io.Discard,
 		httpClient: oauthHTTPClient,
 	}
-	data, err := p.exchangeCode(ctx, code)
-	if err != nil {
-		return nil, err
-	}
-	data.FreshAuthorization = true
-	return data, nil
+	return p.exchangeCode(ctx, code)
 }
 
 // exchangeCodeViaMCP exchanges auth code for token via MCP proxy.
@@ -240,21 +237,12 @@ func (p *OAuthProvider) postJSON(ctx context.Context, endpoint string, body any)
 	}
 	defer resp.Body.Close()
 
-	data, readErr := io.ReadAll(io.LimitReader(resp.Body, config.MaxResponseBodySize))
-	if resp.StatusCode != http.StatusOK {
-		// Preserve structured HTTP status semantics even when the response
-		// body is truncated. The body is diagnostic-only here, so read it
-		// best-effort and classify retryability from the status code.
-		if readErr != nil {
-			data = nil
-		}
-		return nil, &HTTPStatusError{
-			StatusCode:   resp.StatusCode,
-			responseBody: truncateBody(data, 200),
-		}
+	data, err := io.ReadAll(io.LimitReader(resp.Body, config.MaxResponseBodySize))
+	if err != nil {
+		return nil, fmt.Errorf("reading response: %w", err)
 	}
-	if readErr != nil {
-		return nil, fmt.Errorf("reading response: %w", readErr)
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("HTTP %d: %s", resp.StatusCode, truncateBody(data, 200))
 	}
 	return data, nil
 }
@@ -293,24 +281,6 @@ func (p *OAuthProvider) parseTokenResponse(body []byte) (*TokenData, error) {
 	return data, nil
 }
 
-const legacyMCPRefreshRejectedCode = "invalidParameter.authCode.notFound"
-
-// MCPTokenExchangeError preserves the backend business code so refresh callers
-// can distinguish a legacy credential that requires a new authorization from
-// transient transport failures.
-type MCPTokenExchangeError struct {
-	Code    string
-	Message string
-}
-
-func (e *MCPTokenExchangeError) Error() string {
-	return fmt.Sprintf("MCP token exchange failed: %s - %s", e.Code, e.Message)
-}
-
-func (e *MCPTokenExchangeError) requiresReauthorization() bool {
-	return strings.TrimSpace(e.Code) == legacyMCPRefreshRejectedCode
-}
-
 // parseMCPTokenResponse parses token response from MCP proxy.
 // MCP OAuth response format: {"accessToken": "...", "refreshToken": "...", "expiresIn": 7200, "corpId": "...", "corpName": "..."}
 func (p *OAuthProvider) parseMCPTokenResponse(body []byte) (*TokenData, error) {
@@ -334,7 +304,7 @@ func (p *OAuthProvider) parseMCPTokenResponse(body []byte) (*TokenData, error) {
 	}
 	// Check for error response
 	if resp.ErrorCode != "" || resp.ErrorMsg != "" {
-		return nil, &MCPTokenExchangeError{Code: resp.ErrorCode, Message: resp.ErrorMsg}
+		return nil, fmt.Errorf("MCP token exchange failed: %s - %s", resp.ErrorCode, resp.ErrorMsg)
 	}
 	if resp.AccessToken == "" {
 		return nil, fmt.Errorf("MCP token response missing accessToken (body: %s)", string(body))

internal/auth/oauth_postjson_test.go

@@ -1,69 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package auth
-
-import (
-	"context"
-	"errors"
-	"io"
-	"net/http"
-	"testing"
-)
-
-type postJSONRoundTripFunc func(*http.Request) (*http.Response, error)
-
-func (f postJSONRoundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return f(req)
-}
-
-type oauthBrokenBody struct{}
-
-func (oauthBrokenBody) Read([]byte) (int, error) { return 0, io.ErrUnexpectedEOF }
-func (oauthBrokenBody) Close() error             { return nil }
-
-func TestCrossPlatformCoveragePostJSONTruncatedErrorBodyKeepsHTTPStatus(t *testing.T) {
-	for _, status := range []int{http.StatusTooManyRequests, http.StatusServiceUnavailable} {
-		t.Run(http.StatusText(status), func(t *testing.T) {
-			provider := &OAuthProvider{httpClient: &http.Client{Transport: postJSONRoundTripFunc(func(*http.Request) (*http.Response, error) {
-				return &http.Response{StatusCode: status, Body: oauthBrokenBody{}, Header: make(http.Header)}, nil
-			})}}
-
-			_, err := provider.postJSON(context.Background(), "https://oauth.test/token", map[string]string{"grantType": "refresh_token"})
-			var statusErr *HTTPStatusError
-			if !errors.As(err, &statusErr) || statusErr.StatusCode != status {
-				t.Fatalf("postJSON() error = %v, want HTTPStatusError %d", err, status)
-			}
-			if errors.Is(err, io.ErrUnexpectedEOF) {
-				t.Fatalf("HTTP status error should not expose diagnostic body read failure: %v", err)
-			}
-			if got := ClassifyRefreshFailure(err); got != RefreshFailureTransient {
-				t.Fatalf("ClassifyRefreshFailure() = %s, want transient", got)
-			}
-		})
-	}
-}
-
-func TestCrossPlatformCoveragePostJSONOKTruncatedBodyIsTransient(t *testing.T) {
-	provider := &OAuthProvider{httpClient: &http.Client{Transport: postJSONRoundTripFunc(func(*http.Request) (*http.Response, error) {
-		return &http.Response{StatusCode: http.StatusOK, Body: oauthBrokenBody{}, Header: make(http.Header)}, nil
-	})}}
-
-	_, err := provider.postJSON(context.Background(), "https://oauth.test/token", map[string]string{"grantType": "refresh_token"})
-	if !errors.Is(err, io.ErrUnexpectedEOF) {
-		t.Fatalf("postJSON() error = %v, want io.ErrUnexpectedEOF", err)
-	}
-	if got := ClassifyRefreshFailure(err); got != RefreshFailureTransient {
-		t.Fatalf("ClassifyRefreshFailure() = %s, want transient", got)
-	}
-}

internal/auth/oauth_provider.go

@@ -18,13 +18,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"html"
 	"io"
 	"log/slog"
 	"net"
 	"net/http"
 	"os"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -117,15 +115,6 @@ func (p *OAuthProvider) Login(ctx context.Context, force bool) (*TokenData, erro
 	// Smart degradation: try silent refresh before opening browser.
 	if !force {
 		data, err := oauthLoadToken(p.configDir)
-		if err != nil && !errors.Is(err, ErrTokenDataNotFound) && !os.IsNotExist(err) {
-			// A damaged selected slot must not make browser reauthorization
-			// impossible. The target identity is unknown until token exchange, so
-			// continue into the full flow and let the target-only preflight reject
-			// an unsafe overwrite after identity enrichment.
-			if p.logger != nil {
-				p.logger.Warn(i18n.T("读取现有登录态失败，将尝试扫码登录"), "error", err)
-			}
-		}
 		if err == nil {
 			// Case 1: access_token still valid — no action needed.
 			if data.IsAccessTokenValid() {
@@ -154,7 +143,7 @@ func (p *OAuthProvider) Login(ctx context.Context, force bool) (*TokenData, erro
 			}
 		}
 	}
-	if err := prepareLoginPersistence(p.configDir); err != nil {
+	if err := preflightTokenPersistence(p.configDir); err != nil {
 		return nil, fmt.Errorf("%s: %w", i18n.T("本地登录态无法安全更新"), err)
 	}
 
@@ -306,7 +295,7 @@ func (p *OAuthProvider) Login(ctx context.Context, force bool) (*TokenData, erro
 			callbackTokenMu.Unlock()
 
 			w.Header().Set("Content-Type", "text/html; charset=utf-8")
-			_, _ = fmt.Fprintf(w, "<html><body><h1>授权失败</h1><p>%s</p></body></html>", html.EscapeString(oauthExchangeDisplayError(exchangeErr)))
+			_, _ = fmt.Fprintf(w, "<html><body><h1>授权失败</h1><p>%s</p></body></html>", exchangeErr.Error())
 			select {
 			case resultCh <- callbackResult{err: exchangeErr}:
 			default:
@@ -647,85 +636,36 @@ continueLogin:
 	return tokenData, nil
 }
 
-func oauthExchangeDisplayError(err error) string {
-	var statusErr *HTTPStatusError
-	if errors.As(err, &statusErr) && statusErr != nil {
-		return fmt.Sprintf("HTTP %d: token exchange failed", statusErr.StatusCode)
-	}
-	return err.Error()
-}
-
-// GetTokenSnapshot returns a valid token together with its expiry metadata.
-// Storage and refresh failures retain their original cause; only a confirmed
-// missing credential is reported as ErrTokenDataNotFound.
-func (p *OAuthProvider) GetTokenSnapshot(ctx context.Context) (*TokenData, error) {
+// GetAccessToken returns a valid access token, auto-refreshing if needed.
+// Uses a file lock with double-check pattern to prevent concurrent refresh
+// from multiple CLI processes.
+func (p *OAuthProvider) GetAccessToken(ctx context.Context) (string, error) {
 	data, err := oauthLoadToken(p.configDir)
 	if err != nil {
-		if errors.Is(err, ErrTokenDataNotFound) || os.IsNotExist(err) {
-			return nil, fmt.Errorf("%s: %w", i18n.T("未登录，请运行 dws auth login"), ErrTokenDataNotFound)
-		}
-		return nil, fmt.Errorf("load access token: %w", err)
+		return "", errors.New(i18n.T("未登录，请运行 dws auth login"))
 	}
-	profileSelector := StableTokenProfileSelector(p.configDir, data)
 
 	// Fast path: access_token still valid — no lock needed.
 	if data.IsAccessTokenValid() {
-		return data, nil
+		return data.AccessToken, nil
 	}
 
 	// Slow path: token expired — try locked refresh.
 	if data.IsRefreshTokenValid() {
 		refreshed, rErr := p.lockedRefresh(ctx)
 		if rErr == nil {
-			return refreshed, nil
-		}
-		// A network, timeout, rate-limit or 5xx failure does not invalidate the
-		// refresh credential. Keep the profile active so a long-running source
-		// can retry after backoff. Terminal and unknown failures remain fatal.
-		if ClassifyRefreshFailure(rErr) != RefreshFailureTransient {
-			_ = oauthMarkProfile(p.configDir, profileSelector, ProfileStatusExpired)
+			return refreshed.AccessToken, nil
 		}
+		_ = oauthMarkProfile(p.configDir, TokenProfileSelector(data), ProfileStatusExpired)
 		if p.logger != nil {
 			p.logger.Warn(i18n.T("refresh_token 刷新失败"), "error", rErr)
 		}
-		var exchangeErr *MCPTokenExchangeError
-		if errors.As(rErr, &exchangeErr) && exchangeErr.requiresReauthorization() {
-			return nil, fmt.Errorf(
-				"%s: %w",
-				legacyRefreshReauthorizationGuidance(profileSelector),
-				rErr,
-			)
-		}
-		return nil, fmt.Errorf("%s: %w", i18n.T("refresh_token 刷新失败"), rErr)
+		return "", fmt.Errorf("%s: %w", i18n.T("refresh_token 刷新失败"), rErr)
 	} else {
-		_ = oauthMarkProfile(p.configDir, profileSelector, ProfileStatusExpired)
+		_ = oauthMarkProfile(p.configDir, TokenProfileSelector(data), ProfileStatusExpired)
 	}
 
-	return nil, fmt.Errorf("%s: %w", i18n.T("所有凭证已失效，请运行 dws auth login 重新登录"), ErrTokenDataNotFound)
-}
-
-func legacyRefreshReauthorizationGuidance(profileSelector string) string {
-	guidance := "旧版登录态已无法由当前认证服务刷新；本地 profile 已保留，请重新运行 dws auth login 完成一次重新授权"
-	profileSelector = strings.TrimSpace(profileSelector)
-	if profileSelector == "" {
-		return guidance
-	}
-	return fmt.Sprintf(
-		"%s；为保留原身份，请把 --profile 参数设置为下方 profile 标识（标识仅作数据展示，不是可执行命令）:\nprofile: %s",
-		guidance,
-		strconv.Quote(profileSelector),
-	)
-}
-
-// GetAccessToken returns a valid access token, auto-refreshing if needed.
-// Uses a file lock with double-check pattern to prevent concurrent refresh
-// from multiple CLI processes.
-func (p *OAuthProvider) GetAccessToken(ctx context.Context) (string, error) {
-	data, err := p.GetTokenSnapshot(ctx)
-	if err != nil {
-		return "", err
-	}
-	return strings.TrimSpace(data.AccessToken), nil
+	return "", errors.New(i18n.T("所有凭证已失效，请运行 dws auth login 重新登录"))
 }
 
 // lockedRefresh attempts to refresh the token while holding dual-layer locks.
@@ -757,7 +697,7 @@ func (p *OAuthProvider) lockedRefresh(ctx context.Context) (*TokenData, error) {
 
 	// Double-check: re-load from disk — another goroutine/process may have refreshed
 	// while we were waiting for the lock.
-	data, err := loadOAuthTokenUnderHeldLock(p.configDir, RuntimeProfile())
+	data, err := oauthLoadTokenLocked(p.configDir, RuntimeProfile())
 	if err != nil {
 		return nil, err
 	}
@@ -789,9 +729,6 @@ func (p *OAuthProvider) lockedRefresh(ctx context.Context) (*TokenData, error) {
 // ExchangeAuthCode takes an AuthCode and an optional UserID provided by an
 // external host, exchanges it for tokens, and persists them.
 func (p *OAuthProvider) ExchangeAuthCode(ctx context.Context, authCode, uid string) (*TokenData, error) {
-	if err := prepareLoginPersistence(p.configDir); err != nil {
-		return nil, fmt.Errorf("%s: %w", i18n.T("本地登录态无法安全更新"), err)
-	}
 	tokenData, err := oauthExchange(p, ctx, authCode)
 	if err != nil {
 		return nil, fmt.Errorf("%s: %w", i18n.T("换取 token 失败"), err)
@@ -831,9 +768,6 @@ func (p *OAuthProvider) persistLoginToken(ctx context.Context, tokenData *TokenD
 		"user_id", strings.TrimSpace(tokenData.UserID),
 		"user_name", strings.TrimSpace(tokenData.UserName),
 	)
-	if err := preflightTokenWritePersistence(p.configDir, tokenData); err != nil {
-		return fmt.Errorf("%s: %w", i18n.T("本地登录态无法安全更新"), err)
-	}
 	if err := oauthSaveToken(p.configDir, tokenData); err != nil {
 		return err
 	}
@@ -844,18 +778,14 @@ func (p *OAuthProvider) prepareLoginToken(ctx context.Context, tokenData *TokenD
 	if tokenData == nil {
 		return fmt.Errorf("token data is empty")
 	}
-	tokenData.FreshAuthorization = true
 	if p != nil && p.IdentityEnricher != nil {
 		if err := p.IdentityEnricher(ctx, tokenData); err != nil {
 			return fmt.Errorf("resolve login identity: %w", err)
 		}
 	}
-	// v1.0.52 and earlier deliberately persisted the freshly exchanged token
-	// before best-effort contact enrichment. External-worker accounts can have a
-	// valid organization token while contact cannot return a userId, so rejecting
-	// that shape here makes an otherwise successful reauthorization impossible.
-	// SaveTokenData remains the safety boundary: an unresolved organization token
-	// cannot overwrite an organization that already has exact account identities.
+	if strings.TrimSpace(tokenData.CorpID) != "" && strings.TrimSpace(tokenData.UserID) == "" {
+		return fmt.Errorf("resolve login identity: userId is required for corpId %q", tokenData.CorpID)
+	}
 	return nil
 }
 
@@ -866,9 +796,6 @@ func (p *OAuthProvider) persistKnownLoginToken(tokenData *TokenData) error {
 	if strings.TrimSpace(tokenData.CorpID) != "" && strings.TrimSpace(tokenData.UserID) == "" {
 		return fmt.Errorf("resolve login identity: userId is required for corpId %q", tokenData.CorpID)
 	}
-	if err := preflightTokenWritePersistence(p.configDir, tokenData); err != nil {
-		return fmt.Errorf("%s: %w", i18n.T("本地登录态无法安全更新"), err)
-	}
 	return oauthSaveToken(p.configDir, tokenData)
 }
 

internal/auth/oauth_provider_coverage_test.go

@@ -303,72 +303,6 @@ func TestCrossPlatformCoverageOAuthLoginCallbackAndAPIs(t *testing.T) {
 	}
 }
 
-func TestOAuthForcedLoginIgnoresUnreadableUnrelatedProfile(t *testing.T) {
-	f := newOAuthLoginFixture(t, func(int32) CLIAuthStatus {
-		return CLIAuthStatus{Success: true, Result: &CLIAuthResult{CLIAuthEnabled: true}}
-	})
-	if err := SaveProfiles(f.configDir, &ProfilesConfig{
-		Version: profilesVersion,
-		Profiles: []Profile{{
-			Name:   "unrelated",
-			CorpID: "corp-unrelated",
-			UserID: "user-unrelated",
-		}},
-	}); err != nil {
-		t.Fatalf("SaveProfiles() error = %v", err)
-	}
-
-	oldGet := authKeychainGet
-	oldValidate := authValidateEntries
-	t.Cleanup(func() {
-		authKeychainGet = oldGet
-		authValidateEntries = oldValidate
-	})
-	var unrelatedReads atomic.Int32
-	var inventoryCalls atomic.Int32
-	authKeychainGet = func(service, account string) (string, error) {
-		if account == TokenAccountForCorpID("corp-unrelated") ||
-			account == TokenAccountForIdentity("corp-unrelated", "user-unrelated") {
-			unrelatedReads.Add(1)
-			return "", errors.New("unrelated profile ciphertext is unreadable")
-		}
-		return oldGet(service, account)
-	}
-	authValidateEntries = func(string) error {
-		inventoryCalls.Add(1)
-		return errors.New("unrelated orphan ciphertext is unreadable")
-	}
-
-	loginDone := startOAuthLogin(t, context.Background(), f)
-	callbackDone := make(chan oauthHTTPResult, 1)
-	go func() {
-		callbackDone <- getHTTPBody(f.callbackBase + CallbackPath + "?code=unrelated-safe")
-	}()
-	waitOAuthSignal(t, f.exchangeEntered, loginDone, "token exchange")
-	closeOAuthRelease(f.exchangeRelease)
-	waitOAuthSignal(t, f.statusEntered, loginDone, "CLI auth status check")
-	closeOAuthRelease(f.statusRelease)
-
-	select {
-	case callback := <-callbackDone:
-		if callback.err != nil || !strings.Contains(callback.body, "<html") {
-			t.Fatalf("OAuth callback body = %q, %v", callback.body, callback.err)
-		}
-	case <-time.After(oauthTestWaitTimeout):
-		t.Fatal("timed out waiting for OAuth callback")
-	}
-	result := awaitOAuthLogin(t, loginDone)
-	if result.err != nil || result.token == nil || result.token.AccessToken != "access" {
-		t.Fatalf("OAuthProvider.Login() = %#v, %v", result.token, result.err)
-	}
-	if got := unrelatedReads.Load(); got != 0 {
-		t.Fatalf("unrelated profile token reads = %d, want 0", got)
-	}
-	if got := inventoryCalls.Load(); got != 0 {
-		t.Fatalf("full inventory validation calls = %d, want 0", got)
-	}
-}
-
 func TestCrossPlatformCoverageOAuthLoginMissingCallbackCode(t *testing.T) {
 	f := newOAuthLoginFixture(t, func(int32) CLIAuthStatus {
 		return CLIAuthStatus{Success: true, Result: &CLIAuthResult{CLIAuthEnabled: true}}
@@ -751,10 +685,7 @@ func TestCrossPlatformCoverageOAuthRefreshAndParsingEdges(t *testing.T) {
 	resetAppConfigCache()
 	oauthHTTPClient = mcpSrv.Client()
 	mcpProvider := &OAuthProvider{configDir: configDir, httpClient: mcpSrv.Client()}
-	mcpOriginal := &TokenData{
-		ClientID: "mcp-client", Source: "mcp", RefreshToken: "refresh",
-		CorpID: "corp", UserID: "user",
-	}
+	mcpOriginal := &TokenData{ClientID: "mcp-client", Source: "mcp", RefreshToken: "refresh", CorpID: "corp"}
 	if updated, err := mcpProvider.refreshViaMCP(context.Background(), mcpOriginal); err != nil || updated.Source != "mcp" {
 		t.Fatalf("MCP refresh = %#v, %v", updated, err)
 	}
@@ -1089,10 +1020,6 @@ func TestCrossPlatformCoverageOAuthHelperRemainingEdges(t *testing.T) {
 	if _, err := p.exchangeCode(context.Background(), "code"); !errors.Is(err, fail) {
 		t.Fatalf("direct exchange request error = %v", err)
 	}
-	oauthHTTPClient = networkClient
-	if _, err := ExchangeCodeForToken(context.Background(), p.configDir, "code"); !errors.Is(err, fail) {
-		t.Fatalf("exchange wrapper request error = %v", err)
-	}
 	p.httpClient = responseClient("{")
 	if _, err := p.exchangeCode(context.Background(), "code"); err == nil {
 		t.Fatal("malformed direct exchange succeeded")

internal/auth/oauth_reauthorization_guidance_test.go

@@ -1,62 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package auth
-
-import (
-	"strconv"
-	"strings"
-	"testing"
-)
-
-func TestLegacyRefreshReauthorizationGuidanceTreatsProfileAsDisplayData(t *testing.T) {
-	tests := []struct {
-		name     string
-		selector string
-	}{
-		{name: "command substitution", selector: `external-$(touch marker)`},
-		{name: "backticks", selector: "external-`touch marker`"},
-		{name: "newline", selector: "external\ndws auth reset"},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			guidance := legacyRefreshReauthorizationGuidance(tt.selector)
-
-			if !strings.Contains(guidance, "dws auth login") ||
-				!strings.Contains(guidance, "--profile") ||
-				!strings.Contains(guidance, "profile 标识") {
-				t.Fatalf("guidance lacks stable reauthorization instructions: %q", guidance)
-			}
-			if strings.Contains(guidance, "dws auth login --profile") ||
-				strings.Contains(guidance, "--profile "+strconv.Quote(tt.selector)) {
-				t.Fatalf("guidance embeds untrusted selector in an executable command: %q", guidance)
-			}
-			if !strings.Contains(guidance, "profile: "+strconv.Quote(tt.selector)) {
-				t.Fatalf("guidance does not preserve selector as display data: %q", guidance)
-			}
-			if strings.Contains(tt.selector, "\n") && strings.Contains(guidance, tt.selector) {
-				t.Fatalf("guidance retained a raw selector newline: %q", guidance)
-			}
-		})
-	}
-}
-
-func TestLegacyRefreshReauthorizationGuidanceWithoutProfileStillExplainsLogin(t *testing.T) {
-	guidance := legacyRefreshReauthorizationGuidance("")
-	if !strings.Contains(guidance, "dws auth login") {
-		t.Fatalf("guidance = %q, want login instruction", guidance)
-	}
-	if strings.Contains(guidance, "--profile") || strings.Contains(guidance, "profile:") {
-		t.Fatalf("guidance = %q, should not invent an empty profile value", guidance)
-	}
-}

internal/auth/profiles.go

@@ -15,7 +15,6 @@ package auth
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -76,11 +75,8 @@ func withProfilesLock(configDir string, fn func() error) error {
 }
 
 const (
-	profilesJSONFile                  = "profiles.json"
-	profilesVersion                   = 2
-	profilesUnresolvedSelectorVersion = 3
-	profilesMaxVersion                = profilesUnresolvedSelectorVersion
-	unresolvedProfileSelectorPrefix   = "@legacy/"
+	profilesJSONFile = "profiles.json"
+	profilesVersion  = 2
 )
 
 const (
@@ -173,7 +169,6 @@ func SaveProfiles(configDir string, cfg *ProfilesConfig) error {
 		return err
 	}
 	normalizeProfilesConfig(cfg)
-	normalizeProfilesVersionForSelectors(cfg)
 	if err := profilesMkdirAll(configDir, config.DirPerm); err != nil {
 		return fmt.Errorf("create config dir: %w", err)
 	}
@@ -212,16 +207,13 @@ func ensureProfilesMigrationLocked(configDir string) error {
 	if err != nil {
 		return err
 	}
-	if cfg.Version > profilesMaxVersion {
+	if cfg.Version > profilesVersion {
 		return nil
 	}
 	if len(cfg.Profiles) == 0 {
 		// Version 2 with no profiles is an intentional logged-out tombstone.
 		// Never resurrect a stale legacy mirror after logout/reset.
 		if cfg.Version >= profilesVersion {
-			if normalizeProfilesVersionForSelectors(cfg) {
-				return profilesSave(configDir, cfg)
-			}
 			return nil
 		}
 		if !profilesTokenExists() {
@@ -248,9 +240,6 @@ func ensureProfilesMigrationLocked(configDir string) error {
 		cfg.OrgCurrentProfiles = make(map[string]string)
 	}
 	orgTokens := make(map[string]*TokenData)
-	var legacyToken *TokenData
-	var legacyTokenErr error
-	legacyTokenLoaded := false
 	for i := range cfg.Profiles {
 		p := &cfg.Profiles[i]
 		corpID := strings.TrimSpace(p.CorpID)
@@ -266,75 +255,12 @@ func ensureProfilesMigrationLocked(configDir string) error {
 			if loadErr != nil {
 				token = nil
 			}
-			var v2RepairProfile *Profile
-			if !legacySelectionState && errors.Is(loadErr, ErrTokenDataNotFound) {
-				v2RepairProfile = uniqueV2GlobalRepairProfile(cfg, corpID)
-				if v2RepairProfile != nil && strings.TrimSpace(v2RepairProfile.UserID) != "" {
-					_, identityErr := profilesLoadIdentity(corpID, v2RepairProfile.UserID)
-					switch {
-					case identityErr == nil:
-						// The exact identity is already usable. Do not let a stale
-						// global compatibility mirror recreate the organization slot.
-						v2RepairProfile = nil
-					case !errors.Is(identityErr, ErrTokenDataNotFound):
-						return identityErr
-					}
-				}
-			}
-			if (legacySelectionState || v2RepairProfile != nil) && errors.Is(loadErr, ErrTokenDataNotFound) {
-				// v1.0.50/1.0.51 installations can retain the selected
-				// organization only in the global compatibility slot. Consult
-				// that slot while migrating v1, or while repairing a non-empty
-				// v2 registry left half-migrated by an earlier CLI. The v2 path
-				// additionally requires one unambiguous profile, a missing exact
-				// slot when its userId is known, and a non-conflicting token userId.
-				// Persist the untouched organization mirror before identity
-				// enrichment below.
-				if !legacyTokenLoaded {
-					legacyToken, legacyTokenErr = profilesLoadLegacy()
-					legacyTokenLoaded = true
-				}
-				if legacyTokenErr != nil && !errors.Is(legacyTokenErr, ErrTokenDataNotFound) {
-					return legacyTokenErr
-				}
-				legacyMatchesProfile := legacySelectionState ||
-					legacyTokenMatchesV2RepairProfile(legacyToken, v2RepairProfile)
-				if legacyTokenErr == nil &&
-					legacyToken != nil &&
-					strings.TrimSpace(legacyToken.CorpID) == corpID &&
-					legacyMatchesProfile {
-					token = legacyToken
-					if err := profilesSaveCorp(corpID, token); err != nil {
-						return err
-					}
-				}
-			}
 			orgToken = token
 			orgTokens[corpID] = orgToken
 		}
 		if orgToken == nil {
 			continue
 		}
-		// v1.0.52 stored one token per organization. Some of those token blobs
-		// predate userId persistence even though profiles.json already recorded
-		// the account identity. Version 2 loads exact identities and therefore
-		// cannot safely use an organization mirror with no userId. A single
-		// profile with a known userId makes that association unambiguous,
-		// including when an earlier migration already bumped profiles.json to v2
-		// but failed before writing the identity slot. Enrich only the copy saved
-		// to that exact slot; never infer an identity for an organization with
-		// multiple accounts.
-		identityToken := orgToken
-		if strings.TrimSpace(orgToken.UserID) == "" &&
-			strings.TrimSpace(p.UserID) != "" &&
-			len(profilesForCorpID(cfg, corpID)) == 1 {
-			enriched := *orgToken
-			enriched.UserID = strings.TrimSpace(p.UserID)
-			if strings.TrimSpace(enriched.UserName) == "" {
-				enriched.UserName = strings.TrimSpace(p.UserName)
-			}
-			identityToken = &enriched
-		}
 		if strings.TrimSpace(p.UserID) == "" && strings.TrimSpace(orgToken.UserID) != "" {
 			if existing := findExactProfile(cfg, corpID, orgToken.UserID); existing != nil && existing != p {
 				p.CorpID = ""
@@ -347,12 +273,12 @@ func ensureProfilesMigrationLocked(configDir string) error {
 			}
 			changed = true
 		}
-		if strings.TrimSpace(p.UserID) == "" || strings.TrimSpace(identityToken.UserID) != strings.TrimSpace(p.UserID) {
+		if strings.TrimSpace(p.UserID) == "" || strings.TrimSpace(orgToken.UserID) != strings.TrimSpace(p.UserID) {
 			continue
 		}
 		_, identityErr := profilesLoadIdentity(corpID, p.UserID)
 		if errors.Is(identityErr, ErrTokenDataNotFound) {
-			if err := profilesSaveIdentity(corpID, p.UserID, identityToken); err != nil {
+			if err := profilesSaveIdentity(corpID, p.UserID, orgToken); err != nil {
 				return err
 			}
 		} else if identityErr != nil {
@@ -398,10 +324,6 @@ func ensureProfilesMigrationLocked(configDir string) error {
 		cfg.CurrentProfile = exact
 		changed = true
 	}
-	if exact := canonicalStoredSelector(cfg, cfg.PrimaryProfile); exact != "" && exact != cfg.PrimaryProfile {
-		cfg.PrimaryProfile = exact
-		changed = true
-	}
 	if legacySelectionState && cfg.CurrentProfile == "" {
 		if exact := canonicalStoredSelector(cfg, cfg.PrimaryProfile); exact != "" {
 			cfg.CurrentProfile = exact
@@ -423,38 +345,12 @@ func ensureProfilesMigrationLocked(configDir string) error {
 		cfg.Version = profilesVersion
 		changed = true
 	}
-	if normalizeProfilesVersionForSelectors(cfg) {
-		changed = true
-	}
 	if changed {
 		return profilesSave(configDir, cfg)
 	}
 	return nil
 }
 
-// uniqueV2GlobalRepairProfile returns the only profile that may safely be
-// recovered from the legacy global token mirror. A v2 registry with multiple
-// accounts in one organization is deliberately ineligible, even if one token
-// happens to carry a matching userId: the global slot is a mutable compatibility
-// mirror and is not authoritative account-selection state. A sole unresolved
-// profile is eligible only for organization-slot repair; the token matcher below
-// rejects any global token that tries to attach a userId to it.
-func uniqueV2GlobalRepairProfile(cfg *ProfilesConfig, corpID string) *Profile {
-	profiles := profilesForCorpID(cfg, corpID)
-	if len(profiles) != 1 {
-		return nil
-	}
-	return profiles[0]
-}
-
-func legacyTokenMatchesV2RepairProfile(data *TokenData, profile *Profile) bool {
-	if data == nil || strings.TrimSpace(data.CorpID) != strings.TrimSpace(profile.CorpID) {
-		return false
-	}
-	tokenUserID := strings.TrimSpace(data.UserID)
-	return tokenUserID == "" || tokenUserID == strings.TrimSpace(profile.UserID)
-}
-
 // UpsertProfileFromToken updates profiles.json after a successful login or refresh.
 func UpsertProfileFromToken(configDir string, data *TokenData) error {
 	return UpsertProfileFromTokenWithCurrent(configDir, data, true)
@@ -488,9 +384,7 @@ func upsertProfileFromToken(configDir string, cfg *ProfilesConfig, data *TokenDa
 		return err
 	}
 	normalizeProfilesConfig(cfg)
-	if cfg.Version < profilesVersion {
-		cfg.Version = profilesVersion
-	}
+	cfg.Version = profilesVersion
 	now := time.Now().Format(time.RFC3339)
 	userID := strings.TrimSpace(data.UserID)
 	var previousCurrent *Profile
@@ -498,11 +392,7 @@ func upsertProfileFromToken(configDir string, cfg *ProfilesConfig, data *TokenDa
 		previousCurrent, _, _ = resolveProfileSelection(configDir, cfg, cfg.CurrentProfile)
 	}
 	idx := profileIndexByIdentity(cfg, corpID, userID)
-	if idx < 0 && userID != "" && len(profilesForCorpID(cfg, corpID)) == 1 {
-		// Upgrade an organization-scoped v1 profile only when it is the sole
-		// account in that organization. If exact identities already coexist
-		// with a blank profile, consuming the blank profile here would silently
-		// discard that unresolved historical account.
+	if idx < 0 && userID != "" {
 		idx = legacyProfileIndexByCorpID(cfg, corpID)
 	}
 	if idx < 0 {
@@ -519,7 +409,6 @@ func upsertProfileFromToken(configDir string, cfg *ProfilesConfig, data *TokenDa
 			UpdatedAt:   now,
 		}
 		cfg.Profiles = append(cfg.Profiles, profile)
-		idx = len(cfg.Profiles) - 1
 	} else {
 		p := &cfg.Profiles[idx]
 		if userID != "" {
@@ -542,33 +431,17 @@ func upsertProfileFromToken(configDir string, cfg *ProfilesConfig, data *TokenDa
 		p.LastUsedAt = now
 		p.UpdatedAt = now
 	}
-	storedProfile := &cfg.Profiles[idx]
-	if userID == "" && len(profilesForCorpID(cfg, corpID)) > 1 &&
-		(strings.TrimSpace(storedProfile.Name) == corpID || profileNameTakenByOtherIdentity(cfg, storedProfile.Name, corpID, "")) {
-		// A blank profile needs a stable name when exact identities coexist in
-		// the same organization; the corpId selector denotes the organization
-		// as a whole and is therefore not an exact account selector.
-		storedProfile.Name = chooseProfileName(cfg, data)
-	}
 	if makeCurrent {
-		newSelector := storedProfileSelector(cfg, storedProfile)
-		if previousCurrent != nil && storedProfileSelector(cfg, previousCurrent) != newSelector {
-			cfg.PreviousProfile = storedProfileSelector(cfg, previousCurrent)
+		newSelector := profileSelector(corpID, userID)
+		if previousCurrent != nil && ProfileSelector(*previousCurrent) != newSelector {
+			cfg.PreviousProfile = ProfileSelector(*previousCurrent)
 		}
 		cfg.CurrentProfile = newSelector
-		if userID == "" {
-			delete(cfg.OrgCurrentProfiles, corpID)
-		} else {
-			setOrgCurrentProfile(cfg, corpID, newSelector)
-		}
+		setOrgCurrentProfile(cfg, corpID, newSelector)
 	}
 	if cfg.CurrentProfile == "" {
-		cfg.CurrentProfile = storedProfileSelector(cfg, storedProfile)
-		if userID == "" {
-			delete(cfg.OrgCurrentProfiles, corpID)
-		} else {
-			setOrgCurrentProfile(cfg, corpID, cfg.CurrentProfile)
-		}
+		cfg.CurrentProfile = profileSelector(corpID, userID)
+		setOrgCurrentProfile(cfg, corpID, cfg.CurrentProfile)
 	}
 	return profilesSave(configDir, cfg)
 }
@@ -579,87 +452,6 @@ func ProfileSelector(profile Profile) string {
 	return profileSelector(profile.CorpID, profile.UserID)
 }
 
-// storedProfileSelector returns a selector that remains exact inside
-// profiles.json. A blank userId has only an organization selector in the
-// public compatibility surface; when other accounts share that organization,
-// use the profile's unique local name so current/previous pointers do not
-// accidentally resolve to an exact account through OrgCurrentProfiles.
-func storedProfileSelector(cfg *ProfilesConfig, profile *Profile) string {
-	if profile == nil {
-		return ""
-	}
-	if strings.TrimSpace(profile.UserID) != "" {
-		return ProfileSelector(*profile)
-	}
-	if cfg == nil {
-		return strings.TrimSpace(profile.CorpID)
-	}
-	if len(profilesForCorpID(cfg, profile.CorpID)) <= 1 {
-		return strings.TrimSpace(profile.CorpID)
-	}
-	name := strings.TrimSpace(profile.Name)
-	if localProfileSelectorIsSafe(cfg, profile, name) {
-		return name
-	}
-	return unresolvedProfileSelector(profile.CorpID)
-}
-
-// ProfileSelectionSelector returns the stable selector used for one profile.
-// Exact identities use corpId:userId. A historical profile without userId
-// keeps the organization selector while it is the only account, and otherwise
-// uses either an unambiguous local name or a reserved, reversible selector.
-func ProfileSelectionSelector(profile Profile, cfg *ProfilesConfig) string {
-	return storedProfileSelector(cfg, &profile)
-}
-
-func localProfileSelectorIsSafe(cfg *ProfilesConfig, profile *Profile, name string) bool {
-	if cfg == nil || profile == nil {
-		return false
-	}
-	name = strings.TrimSpace(name)
-	if name == "" || strings.Contains(name, ":") || strings.HasPrefix(name, unresolvedProfileSelectorPrefix) {
-		return false
-	}
-	nameMatches := 0
-	for i := range cfg.Profiles {
-		candidate := &cfg.Profiles[i]
-		if strings.TrimSpace(candidate.Name) == name {
-			nameMatches++
-		}
-		// Organization selectors are resolved before ordinary local names.
-		// Never persist a local selector that can be captured by that grammar.
-		if strings.TrimSpace(candidate.CorpID) == name || strings.TrimSpace(candidate.CorpName) == name {
-			return false
-		}
-	}
-	return nameMatches == 1
-}
-
-func unresolvedProfileSelector(corpID string) string {
-	corpID = strings.TrimSpace(corpID)
-	if corpID == "" {
-		return ""
-	}
-	return unresolvedProfileSelectorPrefix + base64.RawURLEncoding.EncodeToString([]byte(corpID))
-}
-
-func parseUnresolvedProfileSelector(selector string) (string, bool) {
-	selector = strings.TrimSpace(selector)
-	if !strings.HasPrefix(selector, unresolvedProfileSelectorPrefix) {
-		return "", false
-	}
-	encoded := strings.TrimPrefix(selector, unresolvedProfileSelectorPrefix)
-	decoded, err := base64.RawURLEncoding.DecodeString(encoded)
-	if err != nil {
-		return "", false
-	}
-	corpID := strings.TrimSpace(string(decoded))
-	if corpID == "" || unresolvedProfileSelector(corpID) != selector {
-		return "", false
-	}
-	return corpID, true
-}
-
 // TokenProfileSelector returns the exact identity selector for token data when
 // its userId is known, otherwise it returns the historical corpId selector.
 func TokenProfileSelector(data *TokenData) string {
@@ -669,34 +461,6 @@ func TokenProfileSelector(data *TokenData) string {
 	return profileSelector(data.CorpID, data.UserID)
 }
 
-// StableTokenProfileSelector preserves the exact selector that loaded a token.
-// This matters for an unresolved historical account sharing an organization
-// with exact identities: reducing its selector to corpId would follow
-// OrgCurrentProfiles and could mark or reauthorize a different account.
-func StableTokenProfileSelector(configDir string, data *TokenData) string {
-	if selector := strings.TrimSpace(RuntimeProfile()); selector != "" {
-		return selector
-	}
-	fallback := TokenProfileSelector(data)
-	if data == nil {
-		return fallback
-	}
-	cfg, err := LoadProfiles(configDir)
-	if err != nil || cfg == nil || strings.TrimSpace(cfg.CurrentProfile) == "" {
-		return fallback
-	}
-	selector := canonicalStoredSelector(cfg, cfg.CurrentProfile)
-	if selector == "" {
-		selector = strings.TrimSpace(cfg.CurrentProfile)
-	}
-	profile, _, err := resolveProfileSelection(configDir, cfg, selector)
-	if err != nil || profile == nil ||
-		!sameProfileIdentity(profile.CorpID, profile.UserID, data.CorpID, data.UserID) {
-		return fallback
-	}
-	return storedProfileSelector(cfg, profile)
-}
-
 func profileSelector(corpID, userID string) string {
 	corpID = strings.TrimSpace(corpID)
 	userID = strings.TrimSpace(userID)
@@ -845,13 +609,7 @@ func setCurrentProfileLocked(configDir, selector string) (*Profile, error) {
 		return nil, err
 	}
 	originalCfg := cloneProfilesConfig(cfg)
-	syncOrganization := shouldSyncOrganizationMirror(cfg, *p)
-	if !syncOrganization {
-		if err := validateIdentityOnlyProfileToken(*p); err != nil {
-			return nil, err
-		}
-	}
-	mirrors, err := snapshotProfileSelectionMirrors(configDir, p.CorpID, syncOrganization)
+	mirrors, err := snapshotProfileSelectionMirrors(configDir, p.CorpID)
 	if err != nil {
 		return nil, err
 	}
@@ -859,26 +617,20 @@ func setCurrentProfileLocked(configDir, selector string) (*Profile, error) {
 	if strings.TrimSpace(cfg.CurrentProfile) != "" {
 		previousCurrent, _, _ = resolveProfileSelection(configDir, cfg, cfg.CurrentProfile)
 	}
-	storedSelector := storedProfileSelector(cfg, p)
+	storedSelector := ProfileSelector(*p)
 	if cfg.CurrentProfile != storedSelector {
 		if previousCurrent != nil {
-			cfg.PreviousProfile = storedProfileSelector(cfg, previousCurrent)
+			cfg.PreviousProfile = ProfileSelector(*previousCurrent)
 		}
 		cfg.CurrentProfile = storedSelector
 	}
-	if strings.TrimSpace(p.UserID) == "" {
-		delete(cfg.OrgCurrentProfiles, strings.TrimSpace(p.CorpID))
-	} else {
-		setOrgCurrentProfile(cfg, p.CorpID, storedSelector)
-	}
+	setOrgCurrentProfile(cfg, p.CorpID, storedSelector)
 	touchProfileUsage(p)
 	if err := profilesSave(configDir, cfg); err != nil {
 		return nil, err
 	}
-	if syncOrganization {
-		if err := syncOrganizationTokenMirrorForProfile(*p); err != nil {
-			return nil, rollbackProfileSelection(configDir, originalCfg, p.CorpID, mirrors, err)
-		}
+	if err := syncOrganizationTokenMirrorForProfile(*p); err != nil {
+		return nil, rollbackProfileSelection(configDir, originalCfg, p.CorpID, mirrors, err)
 	}
 	if err := profilesSyncLegacyMirror(configDir); err != nil {
 		return nil, rollbackProfileSelection(configDir, originalCfg, p.CorpID, mirrors, err)
@@ -917,13 +669,7 @@ func usePreviousProfileLocked(configDir string) (*Profile, error) {
 		return nil, fmt.Errorf("resolve previous profile %q: %w", prev, err)
 	}
 	originalCfg := cloneProfilesConfig(cfg)
-	syncOrganization := shouldSyncOrganizationMirror(cfg, *p)
-	if !syncOrganization {
-		if err := validateIdentityOnlyProfileToken(*p); err != nil {
-			return nil, err
-		}
-	}
-	mirrors, err := snapshotProfileSelectionMirrors(configDir, p.CorpID, syncOrganization)
+	mirrors, err := snapshotProfileSelectionMirrors(configDir, p.CorpID)
 	if err != nil {
 		return nil, err
 	}
@@ -931,25 +677,19 @@ func usePreviousProfileLocked(configDir string) (*Profile, error) {
 	if strings.TrimSpace(cfg.CurrentProfile) != "" {
 		current, _, _ = resolveProfileSelection(configDir, cfg, cfg.CurrentProfile)
 	}
-	cfg.CurrentProfile = storedProfileSelector(cfg, p)
+	cfg.CurrentProfile = ProfileSelector(*p)
 	if current != nil {
-		cfg.PreviousProfile = storedProfileSelector(cfg, current)
+		cfg.PreviousProfile = ProfileSelector(*current)
 	} else {
 		cfg.PreviousProfile = ""
 	}
-	if strings.TrimSpace(p.UserID) == "" {
-		delete(cfg.OrgCurrentProfiles, strings.TrimSpace(p.CorpID))
-	} else {
-		setOrgCurrentProfile(cfg, p.CorpID, ProfileSelector(*p))
-	}
+	setOrgCurrentProfile(cfg, p.CorpID, ProfileSelector(*p))
 	touchProfileUsage(p)
 	if err := profilesSave(configDir, cfg); err != nil {
 		return nil, err
 	}
-	if syncOrganization {
-		if err := syncOrganizationTokenMirrorForProfile(*p); err != nil {
-			return nil, rollbackProfileSelection(configDir, originalCfg, p.CorpID, mirrors, err)
-		}
+	if err := syncOrganizationTokenMirrorForProfile(*p); err != nil {
+		return nil, rollbackProfileSelection(configDir, originalCfg, p.CorpID, mirrors, err)
 	}
 	if err := profilesSyncLegacyMirror(configDir); err != nil {
 		return nil, rollbackProfileSelection(configDir, originalCfg, p.CorpID, mirrors, err)
@@ -993,21 +733,6 @@ func removeProfileLocked(configDir, selector string) (*Profile, error) {
 		return nil, err
 	}
 	removed := *p
-	originalCurrentSelector := strings.TrimSpace(cfg.CurrentProfile)
-	originalOrganizationCurrent := strings.TrimSpace(cfg.OrgCurrentProfiles[strings.TrimSpace(removed.CorpID)])
-	pointers := []*string{&cfg.PrimaryProfile, &cfg.CurrentProfile, &cfg.PreviousProfile}
-	pointerMatches := make([]bool, len(pointers))
-	for i, pointer := range pointers {
-		selected, _, resolveErr := resolveProfileSelection(configDir, cfg, *pointer)
-		if resolveErr == nil && selected != nil {
-			if exact {
-				pointerMatches[i] =
-					sameProfileIdentity(selected.CorpID, selected.UserID, removed.CorpID, removed.UserID)
-			} else {
-				pointerMatches[i] = strings.TrimSpace(selected.CorpID) == strings.TrimSpace(removed.CorpID)
-			}
-		}
-	}
 	kept := cfg.Profiles[:0]
 	for _, profile := range cfg.Profiles {
 		remove := profile.CorpID == removed.CorpID
@@ -1023,7 +748,7 @@ func removeProfileLocked(configDir, selector string) (*Profile, error) {
 	if exact && len(profilesForCorpID(cfg, removed.CorpID)) > 0 {
 		remaining := profilesForCorpID(cfg, removed.CorpID)
 		if len(remaining) == 1 {
-			replacementSelector = storedProfileSelector(cfg, remaining[0])
+			replacementSelector = ProfileSelector(*remaining[0])
 		}
 	}
 	if exact {
@@ -1037,14 +762,15 @@ func removeProfileLocked(configDir, selector string) (*Profile, error) {
 	} else {
 		delete(cfg.OrgCurrentProfiles, removed.CorpID)
 	}
-	for i, pointer := range pointers {
+	pointers := []*string{&cfg.PrimaryProfile, &cfg.CurrentProfile, &cfg.PreviousProfile}
+	for _, pointer := range pointers {
 		if exact {
-			if pointerMatches[i] {
+			if selectorMatchesIdentity(*pointer, removed) {
 				*pointer = replacementSelector
 			}
 			continue
 		}
-		if pointerMatches[i] || selectorTargetsCorp(*pointer, removed.CorpID) {
+		if selectorTargetsCorp(*pointer, removed.CorpID) {
 			*pointer = ""
 		}
 	}
@@ -1053,35 +779,7 @@ func removeProfileLocked(configDir, selector string) (*Profile, error) {
 			cfg.CurrentProfile = previous
 			cfg.PreviousProfile = ""
 		} else if len(cfg.Profiles) == 1 {
-			cfg.CurrentProfile = storedProfileSelector(cfg, &cfg.Profiles[0])
-		}
-	}
-	if cfg.PreviousProfile != "" && cfg.PreviousProfile == cfg.CurrentProfile {
-		cfg.PreviousProfile = ""
-	}
-	currentSelectionChanged := strings.TrimSpace(cfg.CurrentProfile) != originalCurrentSelector
-	organizationCurrentChanged := strings.TrimSpace(cfg.OrgCurrentProfiles[strings.TrimSpace(removed.CorpID)]) != originalOrganizationCurrent
-	if strings.TrimSpace(cfg.CurrentProfile) != "" {
-		if current, _, resolveErr := resolveProfileSelection(configDir, cfg, cfg.CurrentProfile); resolveErr == nil && current != nil {
-			if (currentSelectionChanged || organizationCurrentChanged) &&
-				strings.TrimSpace(current.CorpID) == strings.TrimSpace(removed.CorpID) &&
-				unresolvedProfileForCorp(cfg, removed.CorpID) != nil {
-				if strings.TrimSpace(current.UserID) == "" {
-					delete(cfg.OrgCurrentProfiles, strings.TrimSpace(current.CorpID))
-				} else {
-					setOrgCurrentProfile(cfg, current.CorpID, storedProfileSelector(cfg, current))
-				}
-			}
-		}
-	}
-	// Removing the exact identity that forced a blank sibling to use the v3
-	// reserved selector can make that blank profile the sole account in its
-	// organization. Re-canonicalize every surviving pointer against the final
-	// profile set before SaveProfiles derives the schema version, so the pointer
-	// collapses back to the v2 corpId grammar instead of pinning the file at v3.
-	for _, pointer := range pointers {
-		if canonical := canonicalStoredSelector(cfg, *pointer); canonical != "" {
-			*pointer = canonical
+			cfg.CurrentProfile = ProfileSelector(cfg.Profiles[0])
 		}
 	}
 	if cfg.PreviousProfile != "" && cfg.PreviousProfile == cfg.CurrentProfile {
@@ -1110,9 +808,6 @@ func selectorTargetsCorp(selector, corpID string) bool {
 	if selector == corpID {
 		return true
 	}
-	if selectedCorpID, unresolved := parseUnresolvedProfileSelector(selector); unresolved {
-		return selectedCorpID == corpID
-	}
 	selectedCorpID, _, exact := ParseIdentitySelector(selector)
 	return exact && selectedCorpID == corpID
 }
@@ -1145,72 +840,28 @@ func markProfileStatusLocked(configDir, selector, status string) error {
 }
 
 func ensureProfilesWritable(cfg *ProfilesConfig) error {
-	if cfg != nil && cfg.Version > profilesMaxVersion {
+	if cfg != nil && cfg.Version > profilesVersion {
 		return fmt.Errorf(
 			"profiles.json version %d is newer than supported version %d; upgrade dws before changing profiles",
 			cfg.Version,
-			profilesMaxVersion,
+			profilesVersion,
 		)
 	}
 	return nil
 }
 
-// normalizeProfilesVersionForSelectors derives the persisted schema version
-// from the final normalized selector grammar. Keep v3 only while a legal
-// reserved unresolved-identity selector remains on disk; once completion,
-// deletion, or canonicalization removes that grammar, the file is again safe
-// for v2 clients and should downgrade to v2.
-func normalizeProfilesVersionForSelectors(cfg *ProfilesConfig) bool {
-	if cfg == nil || cfg.Version > profilesMaxVersion {
-		return false
-	}
-
-	target := cfg.Version
-	if profilesConfigContainsUnresolvedSelector(cfg) {
-		target = profilesUnresolvedSelectorVersion
-	} else if cfg.Version >= profilesVersion {
-		target = profilesVersion
-	}
-	if target == cfg.Version {
-		return false
-	}
-	cfg.Version = target
-	return true
-}
-
-func profilesConfigContainsUnresolvedSelector(cfg *ProfilesConfig) bool {
-	if cfg == nil {
-		return false
-	}
-	for _, selector := range []string{cfg.PrimaryProfile, cfg.CurrentProfile, cfg.PreviousProfile} {
-		if _, unresolved := parseUnresolvedProfileSelector(selector); unresolved {
-			return true
-		}
-	}
-	for _, selector := range cfg.OrgCurrentProfiles {
-		if _, unresolved := parseUnresolvedProfileSelector(selector); unresolved {
-			return true
-		}
-	}
-	return false
-}
-
 type profileSelectionMirrorSnapshot struct {
 	organization tokenSlotSnapshot
 	legacy       tokenSlotSnapshot
 	marker       tokenMarkerSnapshot
 }
 
-func snapshotProfileSelectionMirrors(configDir, corpID string, includeOrganization bool) (profileSelectionMirrorSnapshot, error) {
-	var organization tokenSlotSnapshot
-	if includeOrganization {
-		var err error
-		organization, err = snapshotTokenSlot(func() (*TokenData, error) {
-			return profilesLoadCorp(corpID)
-		})
-		if err != nil {
-			return profileSelectionMirrorSnapshot{}, err
-		}
+func snapshotProfileSelectionMirrors(configDir, corpID string) (profileSelectionMirrorSnapshot, error) {
+	organization, err := snapshotTokenSlot(func() (*TokenData, error) {
+		return profilesLoadCorp(corpID)
+	})
+	if err != nil {
+		return profileSelectionMirrorSnapshot{}, err
 	}
 	legacy, err := snapshotTokenSlot(profilesLoadLegacy)
 	if err != nil {
@@ -1238,14 +889,12 @@ func rollbackProfileSelection(
 	if err := profilesSave(configDir, cloneProfilesConfig(cfg)); err != nil {
 		rollbackErr = errors.Join(rollbackErr, err)
 	}
-	if mirrors.organization.known {
-		if mirrors.organization.exists {
-			if err := profilesSaveCorp(corpID, mirrors.organization.token); err != nil {
-				rollbackErr = errors.Join(rollbackErr, err)
-			}
-		} else if err := profilesDeleteCorp(corpID); err != nil {
+	if mirrors.organization.exists {
+		if err := profilesSaveCorp(corpID, mirrors.organization.token); err != nil {
 			rollbackErr = errors.Join(rollbackErr, err)
 		}
+	} else if err := profilesDeleteCorp(corpID); err != nil {
+		rollbackErr = errors.Join(rollbackErr, err)
 	}
 	if mirrors.legacy.exists {
 		if err := profilesSaveLegacy(mirrors.legacy.token); err != nil {
@@ -1326,48 +975,33 @@ func syncOrganizationTokenMirrorForProfile(profile Profile) error {
 }
 
 func loadTokenForProfileIdentity(profile Profile) (*TokenData, error) {
-	if strings.TrimSpace(profile.UserID) == "" {
-		data, err := profilesLoadCorp(profile.CorpID)
-		if err != nil {
+	if strings.TrimSpace(profile.UserID) != "" {
+		data, err := profilesLoadIdentity(profile.CorpID, profile.UserID)
+		if err == nil {
+			return data, nil
+		}
+		if !errors.Is(err, ErrTokenDataNotFound) {
 			return nil, err
 		}
-		if data == nil {
-			return nil, ErrTokenDataNotFound
+		orgData, orgErr := profilesLoadCorp(profile.CorpID)
+		if orgErr != nil {
+			if errors.Is(orgErr, ErrTokenDataNotFound) {
+				return nil, err
+			}
+			return nil, orgErr
 		}
-		if strings.TrimSpace(data.UserID) != "" {
-			return nil, fmt.Errorf(
-				"organization token mirror for corpId %q belongs to userId %q; cannot use it for unresolved profile %q",
-				profile.CorpID,
-				data.UserID,
-				profile.Name,
-			)
+		if strings.TrimSpace(orgData.UserID) == "" {
+			return nil, fmt.Errorf("organization token mirror for corpId %q has no userId; cannot use it for profile %q", profile.CorpID, ProfileSelector(profile))
 		}
-		return data, nil
-	}
-	data, err := profilesLoadIdentity(profile.CorpID, profile.UserID)
-	if err == nil {
-		return data, nil
-	}
-	if !errors.Is(err, ErrTokenDataNotFound) {
-		return nil, err
-	}
-	orgData, orgErr := profilesLoadCorp(profile.CorpID)
-	if orgErr != nil {
-		if errors.Is(orgErr, ErrTokenDataNotFound) {
+		if strings.TrimSpace(orgData.UserID) != strings.TrimSpace(profile.UserID) {
 			return nil, err
 		}
-		return nil, orgErr
+		if saveErr := profilesSaveIdentity(profile.CorpID, profile.UserID, orgData); saveErr != nil {
+			return nil, saveErr
+		}
+		return orgData, nil
 	}
-	if strings.TrimSpace(orgData.UserID) == "" {
-		return nil, fmt.Errorf("organization token mirror for corpId %q has no userId; cannot use it for profile %q", profile.CorpID, ProfileSelector(profile))
-	}
-	if strings.TrimSpace(orgData.UserID) != strings.TrimSpace(profile.UserID) {
-		return nil, err
-	}
-	if saveErr := profilesSaveIdentity(profile.CorpID, profile.UserID, orgData); saveErr != nil {
-		return nil, saveErr
-	}
-	return orgData, nil
+	return profilesLoadCorp(profile.CorpID)
 }
 
 func normalizeProfilesConfig(cfg *ProfilesConfig) {
@@ -1493,12 +1127,6 @@ func resolveProfileSelection(_ string, cfg *ProfilesConfig, selector string) (*P
 	if selector == "" {
 		return nil, false, fmt.Errorf("profile selector is empty")
 	}
-	if corpID, unresolved := parseUnresolvedProfileSelector(selector); unresolved {
-		if profile := unresolvedProfileForCorp(cfg, corpID); profile != nil {
-			return profile, true, nil
-		}
-		return nil, true, fmt.Errorf("historical profile for organization %q not found", corpID)
-	}
 
 	if organization, account, compound := ParseIdentitySelector(selector); compound {
 		corpID, err := resolveOrganizationCorpID(cfg, organization)
@@ -1590,12 +1218,6 @@ func resolveProfileDeletionSelection(cfg *ProfilesConfig, selector string) (*Pro
 	if selector == "" {
 		return nil, false, fmt.Errorf("profile selector is empty")
 	}
-	if corpID, unresolved := parseUnresolvedProfileSelector(selector); unresolved {
-		if profile := unresolvedProfileForCorp(cfg, corpID); profile != nil {
-			return profile, true, nil
-		}
-		return nil, true, fmt.Errorf("historical profile for organization %q not found", corpID)
-	}
 	if _, _, compound := ParseIdentitySelector(selector); compound {
 		return resolveProfileSelection("", cfg, selector)
 	}
@@ -1681,12 +1303,6 @@ func resolveOrganizationDefault(cfg *ProfilesConfig, corpID, displaySelector str
 			return p, false, nil
 		}
 	}
-	if unresolved := unresolvedProfileForCorp(cfg, corpID); unresolved != nil {
-		// With no exact organization-current selection, the organization slot
-		// belongs to the sole unresolved historical account. Do not choose an
-		// arbitrary exact identity merely because it shares the corpId.
-		return unresolved, false, nil
-	}
 	if len(profiles) == 1 {
 		return profiles[0], false, nil
 	}
@@ -1698,18 +1314,12 @@ func resolveOrganizationDefault(cfg *ProfilesConfig, corpID, displaySelector str
 }
 
 func profileSelectorCandidates(profiles []*Profile) []string {
-	cfg := &ProfilesConfig{Profiles: make([]Profile, 0, len(profiles))}
-	for _, profile := range profiles {
-		if profile != nil {
-			cfg.Profiles = append(cfg.Profiles, *profile)
-		}
-	}
 	candidates := make([]string, 0, len(profiles))
 	for _, p := range profiles {
 		if p == nil {
 			continue
 		}
-		candidates = append(candidates, storedProfileSelector(cfg, p))
+		candidates = append(candidates, ProfileSelector(*p))
 	}
 	sort.Strings(candidates)
 	return candidates
@@ -1731,39 +1341,18 @@ func canonicalStoredSelector(cfg *ProfilesConfig, selector string) string {
 	if selector == "" {
 		return ""
 	}
-	if corpID, unresolved := parseUnresolvedProfileSelector(selector); unresolved {
-		if profile := unresolvedProfileForCorp(cfg, corpID); profile != nil {
-			return storedProfileSelector(cfg, profile)
-		}
-		return ""
-	}
 	if corpID, userID, exact := ParseIdentitySelector(selector); exact {
 		if p := findExactProfile(cfg, corpID, userID); p != nil {
 			return ProfileSelector(*p)
 		}
-		// A colon-containing legacy local name is recoverable only when it does
-		// not name a real exact identity. Exact corpId:userId always wins.
-		if profile := unresolvedProfileForLocalName(cfg, selector); profile != nil {
-			return storedProfileSelector(cfg, profile)
-		}
 		return ""
 	}
-	// Older multi-account writers stored the unresolved profile's local name.
-	// Recover it only when no profile gives the same text organization-selector
-	// meaning. CorpId and CorpName have always outranked local names in the
-	// public resolver; migration must preserve that precedence instead of
-	// silently redirecting one organization's selector to another blank profile.
-	if !selectorConflictsWithOrganizationGrammar(cfg, selector) {
-		if profile := unresolvedProfileForLocalName(cfg, selector); profile != nil {
-			return storedProfileSelector(cfg, profile)
-		}
-	}
 	if profiles := profilesForCorpID(cfg, selector); len(profiles) > 0 {
 		if exact := exactProfileSelectorForCorp(cfg, selector, cfg.OrgCurrentProfiles[selector]); exact != "" {
 			return exact
 		}
 		if len(profiles) == 1 {
-			return storedProfileSelector(cfg, profiles[0])
+			return ProfileSelector(*profiles[0])
 		}
 		return ""
 	}
@@ -1771,21 +1360,7 @@ func canonicalStoredSelector(cfg *ProfilesConfig, selector string) string {
 	if err != nil || p == nil {
 		return ""
 	}
-	return storedProfileSelector(cfg, p)
-}
-
-func selectorConflictsWithOrganizationGrammar(cfg *ProfilesConfig, selector string) bool {
-	if cfg == nil {
-		return false
-	}
-	selector = strings.TrimSpace(selector)
-	for i := range cfg.Profiles {
-		if strings.TrimSpace(cfg.Profiles[i].CorpID) == selector ||
-			strings.TrimSpace(cfg.Profiles[i].CorpName) == selector {
-			return true
-		}
-	}
-	return false
+	return ProfileSelector(*p)
 }
 
 func setOrgCurrentProfile(cfg *ProfilesConfig, corpID, selector string) {
@@ -1870,79 +1445,6 @@ func profilesForCorpID(cfg *ProfilesConfig, corpID string) []*Profile {
 	return result
 }
 
-func unresolvedProfileForCorp(cfg *ProfilesConfig, corpID string) *Profile {
-	if cfg == nil {
-		return nil
-	}
-	corpID = strings.TrimSpace(corpID)
-	for i := range cfg.Profiles {
-		profile := &cfg.Profiles[i]
-		if strings.TrimSpace(profile.CorpID) == corpID && strings.TrimSpace(profile.UserID) == "" {
-			return profile
-		}
-	}
-	return nil
-}
-
-func unresolvedProfileForLocalName(cfg *ProfilesConfig, name string) *Profile {
-	if cfg == nil {
-		return nil
-	}
-	name = strings.TrimSpace(name)
-	if name == "" {
-		return nil
-	}
-	var match *Profile
-	for i := range cfg.Profiles {
-		profile := &cfg.Profiles[i]
-		if strings.TrimSpace(profile.UserID) != "" || strings.TrimSpace(profile.Name) != name ||
-			len(profilesForCorpID(cfg, profile.CorpID)) <= 1 {
-			continue
-		}
-		if match != nil {
-			return nil
-		}
-		match = profile
-	}
-	return match
-}
-
-// When a blank profile coexists with exact accounts, the organization slot is
-// that unresolved profile's only canonical credential. Exact identities must
-// remain in their identity slots and may still become global current without
-// overwriting the organization slot.
-func shouldSyncOrganizationMirror(cfg *ProfilesConfig, profile Profile) bool {
-	return strings.TrimSpace(profile.UserID) == "" || unresolvedProfileForCorp(cfg, profile.CorpID) == nil
-}
-
-// validateIdentityOnlyProfileToken verifies the canonical token slot before a
-// profile selection is persisted. This path is used only when an unresolved
-// profile owns the organization slot, so an exact identity must not fall back
-// to that slot. It is deliberately read-only: a rejected switch leaves every
-// selection pointer and compatibility mirror untouched.
-func validateIdentityOnlyProfileToken(profile Profile) error {
-	corpID := strings.TrimSpace(profile.CorpID)
-	userID := strings.TrimSpace(profile.UserID)
-	if corpID == "" || userID == "" {
-		return ErrTokenDataNotFound
-	}
-	data, err := profilesLoadIdentity(corpID, userID)
-	if err != nil {
-		return fmt.Errorf("load token for profile %q: %w", ProfileSelector(profile), err)
-	}
-	if data == nil {
-		return fmt.Errorf("load token for profile %q: %w", ProfileSelector(profile), ErrTokenDataNotFound)
-	}
-	if !sameProfileIdentity(data.CorpID, data.UserID, corpID, userID) {
-		return fmt.Errorf(
-			"token in profile slot %q belongs to %q; identity does not match selected profile",
-			ProfileSelector(profile),
-			profileSelector(data.CorpID, data.UserID),
-		)
-	}
-	return nil
-}
-
 func profileSelectorReferenceExists(cfg *ProfilesConfig, selector string) bool {
 	if cfg == nil {
 		return false
@@ -1951,12 +1453,6 @@ func profileSelectorReferenceExists(cfg *ProfilesConfig, selector string) bool {
 	if selector == "" {
 		return false
 	}
-	if corpID, unresolved := parseUnresolvedProfileSelector(selector); unresolved {
-		return unresolvedProfileForCorp(cfg, corpID) != nil
-	}
-	if unresolvedProfileForLocalName(cfg, selector) != nil {
-		return true
-	}
 	if corpID, userID, exact := ParseIdentitySelector(selector); exact {
 		if findExactProfile(cfg, corpID, userID) != nil {
 			return true

internal/auth/refresh_failure.go

@@ -1,89 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package auth
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-)
-
-// RefreshFailureClass separates refresh failures that may recover after a
-// delay from failures that require new credentials or local intervention.
-type RefreshFailureClass string
-
-const (
-	RefreshFailureUnknown   RefreshFailureClass = "unknown"
-	RefreshFailureTransient RefreshFailureClass = "transient"
-	RefreshFailureTerminal  RefreshFailureClass = "terminal"
-)
-
-// HTTPStatusError preserves an OAuth endpoint status for structured retry
-// decisions without copying an untrusted response body into logs.
-type HTTPStatusError struct {
-	StatusCode   int
-	responseBody string
-}
-
-func (e *HTTPStatusError) Error() string {
-	if e == nil {
-		return "OAuth endpoint request failed"
-	}
-	return fmt.Sprintf("HTTP %d", e.StatusCode)
-}
-
-func httpStatusResponseBody(err error) string {
-	var statusErr *HTTPStatusError
-	if !errors.As(err, &statusErr) || statusErr == nil {
-		return ""
-	}
-	return statusErr.responseBody
-}
-
-// ClassifyRefreshFailure uses only structured transport and HTTP signals.
-// Unknown errors, including parse, keychain and persistence failures, remain
-// fatal so a long-running source cannot retry an error that needs user action.
-func ClassifyRefreshFailure(err error) RefreshFailureClass {
-	if err == nil {
-		return RefreshFailureUnknown
-	}
-	if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
-		return RefreshFailureTransient
-	}
-	if errors.Is(err, io.ErrUnexpectedEOF) {
-		return RefreshFailureTransient
-	}
-	var netErr net.Error
-	if errors.As(err, &netErr) {
-		return RefreshFailureTransient
-	}
-	var statusErr *HTTPStatusError
-	if !errors.As(err, &statusErr) || statusErr == nil {
-		return RefreshFailureUnknown
-	}
-	if statusErr.StatusCode == http.StatusRequestTimeout ||
-		statusErr.StatusCode == http.StatusTooManyRequests ||
-		statusErr.StatusCode >= http.StatusInternalServerError {
-		return RefreshFailureTransient
-	}
-	if statusErr.StatusCode == http.StatusBadRequest ||
-		statusErr.StatusCode == http.StatusUnauthorized ||
-		statusErr.StatusCode == http.StatusForbidden {
-		return RefreshFailureTerminal
-	}
-	return RefreshFailureUnknown
-}

internal/auth/refresh_failure_test.go

@@ -1,255 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-
-package auth
-
-import (
-	"context"
-	"errors"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/edition"
-)
-
-func TestCrossPlatformCoverageClassifyRefreshFailureUsesStructuredSignals(t *testing.T) {
-	tests := []struct {
-		name string
-		err  error
-		want RefreshFailureClass
-	}{
-		{name: "deadline", err: context.DeadlineExceeded, want: RefreshFailureTransient},
-		{name: "network", err: &url.Error{Op: "Post", URL: "https://oauth.test", Err: context.DeadlineExceeded}, want: RefreshFailureTransient},
-		{name: "request timeout", err: &HTTPStatusError{StatusCode: http.StatusRequestTimeout}, want: RefreshFailureTransient},
-		{name: "rate limited", err: &HTTPStatusError{StatusCode: http.StatusTooManyRequests}, want: RefreshFailureTransient},
-		{name: "server unavailable", err: &HTTPStatusError{StatusCode: http.StatusServiceUnavailable}, want: RefreshFailureTransient},
-		{name: "refresh rejected", err: &HTTPStatusError{StatusCode: http.StatusUnauthorized}, want: RefreshFailureTerminal},
-		{name: "invalid grant", err: &HTTPStatusError{StatusCode: http.StatusBadRequest}, want: RefreshFailureTerminal},
-		{name: "forbidden", err: &HTTPStatusError{StatusCode: http.StatusForbidden}, want: RefreshFailureTerminal},
-		{name: "local persistence", err: errors.New("save refreshed token failed"), want: RefreshFailureUnknown},
-		{name: "nil error", err: nil, want: RefreshFailureUnknown},
-		{name: "dns failure", err: &net.DNSError{Err: "no such host", Name: "oauth.test"}, want: RefreshFailureTransient},
-		{name: "redirect status", err: &HTTPStatusError{StatusCode: http.StatusFound}, want: RefreshFailureUnknown},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := ClassifyRefreshFailure(tt.err); got != tt.want {
-				t.Fatalf("ClassifyRefreshFailure() = %q, want %q", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestCrossPlatformCoverageHTTPStatusErrorRetainsStatusThroughWrapping(t *testing.T) {
-	want := &HTTPStatusError{StatusCode: http.StatusTooManyRequests}
-	err := errors.Join(errors.New("refresh failed"), want)
-	if got := ClassifyRefreshFailure(err); got != RefreshFailureTransient {
-		t.Fatalf("ClassifyRefreshFailure() = %q, want transient", got)
-	}
-	var statusErr *HTTPStatusError
-	if !errors.As(err, &statusErr) || statusErr.StatusCode != http.StatusTooManyRequests {
-		t.Fatalf("HTTP status error not retained: %v", err)
-	}
-	if got, want := statusErr.Error(), "HTTP 429"; got != want {
-		t.Fatalf("HTTP status error = %q, want %q", got, want)
-	}
-	var nilStatus *HTTPStatusError
-	if got, want := nilStatus.Error(), "OAuth endpoint request failed"; got != want {
-		t.Fatalf("nil HTTP status error = %q, want %q", got, want)
-	}
-}
-
-func TestCrossPlatformCoverageOAuthExchangeDisplayErrorFallsBackToPlainError(t *testing.T) {
-	if got, want := oauthExchangeDisplayError(&HTTPStatusError{StatusCode: http.StatusBadGateway}), "HTTP 502: token exchange failed"; got != want {
-		t.Fatalf("status display error = %q, want %q", got, want)
-	}
-	if got, want := oauthExchangeDisplayError(errors.New("exchange failed")), "exchange failed"; got != want {
-		t.Fatalf("plain display error = %q, want %q", got, want)
-	}
-}
-
-func TestCrossPlatformCoveragePostJSONClassifiesStatusWithoutLoggingResponseBody(t *testing.T) {
-	const secretBody = `{"refreshToken":"must-not-reach-logs"}`
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		w.WriteHeader(http.StatusServiceUnavailable)
-		_, _ = w.Write([]byte(secretBody))
-	}))
-	defer server.Close()
-
-	provider := &OAuthProvider{httpClient: server.Client()}
-	_, err := provider.postJSON(context.Background(), server.URL, map[string]string{"grantType": "refresh_token"})
-	if got := ClassifyRefreshFailure(err); got != RefreshFailureTransient {
-		t.Fatalf("ClassifyRefreshFailure() = %q, want transient: %v", got, err)
-	}
-	if strings.Contains(err.Error(), "must-not-reach-logs") {
-		t.Fatalf("postJSON error leaked response body: %v", err)
-	}
-	if got := httpStatusResponseBody(err); !strings.Contains(got, "must-not-reach-logs") {
-		t.Fatalf("postJSON did not retain bounded response details for internal classification: %q", got)
-	}
-}
-
-func TestCrossPlatformCoverageGetTokenSnapshotOnlyExpiresProfileForNonTransientRefreshFailures(t *testing.T) {
-	oldLoad := oauthLoadToken
-	oldLoadLocked := oauthLoadTokenLocked
-	oldAcquire := oauthAcquireLock
-	oldRefresh := oauthRefreshToken
-	oldMark := oauthMarkProfile
-	oldEdition := edition.Get()
-	t.Cleanup(func() {
-		oauthLoadToken = oldLoad
-		oauthLoadTokenLocked = oldLoadLocked
-		oauthAcquireLock = oldAcquire
-		oauthRefreshToken = oldRefresh
-		oauthMarkProfile = oldMark
-		edition.Override(oldEdition)
-	})
-	edition.Override(&edition.Hooks{})
-
-	expired := &TokenData{
-		AccessToken:  "expired-access",
-		ExpiresAt:    time.Now().Add(-time.Hour),
-		RefreshToken: "refresh",
-		RefreshExpAt: time.Now().Add(time.Hour),
-		CorpID:       "corp",
-		UserID:       "user",
-	}
-	oauthLoadToken = func(string) (*TokenData, error) { return expired, nil }
-	oauthLoadTokenLocked = func(string, string) (*TokenData, error) { return expired, nil }
-	oauthAcquireLock = func(context.Context, string) (*DualLock, error) { return &DualLock{}, nil }
-
-	markCalls := 0
-	oauthMarkProfile = func(_, _, status string) error {
-		if status != ProfileStatusExpired {
-			t.Fatalf("profile status = %q, want %q", status, ProfileStatusExpired)
-		}
-		markCalls++
-		return nil
-	}
-	provider := NewOAuthProvider(t.TempDir(), nil)
-
-	oauthRefreshToken = func(*OAuthProvider, context.Context, *TokenData) (*TokenData, error) {
-		return nil, &HTTPStatusError{StatusCode: http.StatusServiceUnavailable}
-	}
-	if _, err := provider.GetTokenSnapshot(context.Background()); ClassifyRefreshFailure(err) != RefreshFailureTransient {
-		t.Fatalf("transient refresh error = %v", err)
-	}
-	if markCalls != 0 {
-		t.Fatalf("transient refresh marked profile expired %d times", markCalls)
-	}
-
-	oauthRefreshToken = func(*OAuthProvider, context.Context, *TokenData) (*TokenData, error) {
-		return nil, &HTTPStatusError{StatusCode: http.StatusUnauthorized}
-	}
-	if _, err := provider.GetTokenSnapshot(context.Background()); ClassifyRefreshFailure(err) != RefreshFailureTerminal {
-		t.Fatalf("terminal refresh error = %v", err)
-	}
-	if markCalls != 1 {
-		t.Fatalf("terminal refresh marked profile expired %d times, want 1", markCalls)
-	}
-
-	oauthRefreshToken = func(*OAuthProvider, context.Context, *TokenData) (*TokenData, error) {
-		return nil, &MCPTokenExchangeError{
-			Code:    legacyMCPRefreshRejectedCode,
-			Message: "不合法的临时授权码",
-		}
-	}
-	_, err := provider.GetTokenSnapshot(context.Background())
-	if err == nil || !strings.Contains(err.Error(), "dws auth login") ||
-		!strings.Contains(err.Error(), "--profile") ||
-		!strings.Contains(err.Error(), `profile: "corp:user"`) ||
-		strings.Contains(err.Error(), `dws auth login --profile "corp:user"`) ||
-		!strings.Contains(err.Error(), legacyMCPRefreshRejectedCode) {
-		t.Fatalf("legacy MCP refresh guidance = %v", err)
-	}
-	var exchangeErr *MCPTokenExchangeError
-	if !errors.As(err, &exchangeErr) || !exchangeErr.requiresReauthorization() {
-		t.Fatalf("legacy MCP refresh cause was not preserved: %v", err)
-	}
-	if markCalls != 2 {
-		t.Fatalf("legacy MCP rejection marked profile expired %d times, want 2", markCalls)
-	}
-
-	SetRuntimeProfile("External Worker")
-	_, err = provider.GetTokenSnapshot(context.Background())
-	SetRuntimeProfile("")
-	if err == nil || !strings.Contains(err.Error(), "dws auth login") ||
-		!strings.Contains(err.Error(), `profile: "External Worker"`) ||
-		strings.Contains(err.Error(), `dws auth login --profile "External Worker"`) {
-		t.Fatalf("legacy MCP refresh guidance did not isolate spaced selector as display data: %v", err)
-	}
-	if markCalls != 3 {
-		t.Fatalf("spaced legacy MCP rejection marked profile expired %d times, want 3", markCalls)
-	}
-}
-
-func TestCrossPlatformCoverageLegacyRefreshFailureKeepsBlankCurrentSelectorIsolated(t *testing.T) {
-	fixture := seedBlankProfileSelectorFixture(t, "Fixture Organization", "Fixture Organization", true)
-	expired := *fixture.blankToken
-	expired.ExpiresAt = time.Now().Add(-time.Hour)
-	expired.RefreshExpAt = time.Now().Add(time.Hour)
-
-	oldLoad := oauthLoadToken
-	oldLoadLocked := oauthLoadTokenLocked
-	oldAcquire := oauthAcquireLock
-	oldRefresh := oauthRefreshToken
-	oldMark := oauthMarkProfile
-	oldEdition := edition.Get()
-	t.Cleanup(func() {
-		oauthLoadToken = oldLoad
-		oauthLoadTokenLocked = oldLoadLocked
-		oauthAcquireLock = oldAcquire
-		oauthRefreshToken = oldRefresh
-		oauthMarkProfile = oldMark
-		edition.Override(oldEdition)
-	})
-	edition.Override(&edition.Hooks{})
-	oauthLoadToken = func(string) (*TokenData, error) { return &expired, nil }
-	oauthLoadTokenLocked = func(string, string) (*TokenData, error) { return &expired, nil }
-	oauthAcquireLock = func(context.Context, string) (*DualLock, error) { return &DualLock{}, nil }
-	oauthRefreshToken = func(*OAuthProvider, context.Context, *TokenData) (*TokenData, error) {
-		return nil, &MCPTokenExchangeError{
-			Code:    legacyMCPRefreshRejectedCode,
-			Message: "legacy refresh rejected",
-		}
-	}
-	var markedSelector string
-	oauthMarkProfile = func(configDir, selector, status string) error {
-		markedSelector = selector
-		return MarkProfileStatus(configDir, selector, status)
-	}
-
-	provider := NewOAuthProvider(fixture.configDir, nil)
-	_, err := provider.GetTokenSnapshot(context.Background())
-	if err == nil || !strings.Contains(err.Error(), "dws auth login") ||
-		!strings.Contains(err.Error(), "--profile") ||
-		!strings.Contains(err.Error(), "profile: "+strconv.Quote(fixture.blankSelector)) ||
-		strings.Contains(err.Error(), "dws auth login --profile") {
-		t.Fatalf("legacy blank refresh guidance = %v, want selector %q", err, fixture.blankSelector)
-	}
-	if markedSelector != fixture.blankSelector {
-		t.Fatalf("marked selector = %q, want blank %q", markedSelector, fixture.blankSelector)
-	}
-	cfg, loadErr := LoadProfiles(fixture.configDir)
-	if loadErr != nil {
-		t.Fatalf("LoadProfiles() error = %v", loadErr)
-	}
-	for _, profile := range cfg.Profiles {
-		switch profile.UserID {
-		case "":
-			if profile.Status != ProfileStatusExpired {
-				t.Fatalf("blank profile status = %q, want expired", profile.Status)
-			}
-		case fixture.exactUserID:
-			if profile.Status != ProfileStatusActive {
-				t.Fatalf("exact profile status = %q, want active", profile.Status)
-			}
-		}
-	}
-}

internal/auth/rejected_token_refresh_test.go

@@ -1,510 +0,0 @@
-// Copyright 2026 Alibaba Group
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package auth
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/DingTalk-Real-AI/dingtalk-workspace-cli/pkg/edition"
-)
-
-type rejectedTokenHookStore struct {
-	mu      sync.Mutex
-	data    TokenData
-	deletes int
-}
-
-func (s *rejectedTokenHookStore) load(string) ([]byte, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return json.Marshal(s.data)
-}
-
-func (s *rejectedTokenHookStore) save(_ string, blob []byte) error {
-	var data TokenData
-	if err := json.Unmarshal(blob, &data); err != nil {
-		return err
-	}
-	s.mu.Lock()
-	s.data = data
-	s.mu.Unlock()
-	return nil
-}
-
-func (s *rejectedTokenHookStore) delete(string) error {
-	s.mu.Lock()
-	s.data = TokenData{}
-	s.deletes++
-	s.mu.Unlock()
-	return nil
-}
-
-func (s *rejectedTokenHookStore) snapshot() (TokenData, int) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.data, s.deletes
-}
-
-func installRejectedTokenHookStore(t *testing.T, data TokenData) *rejectedTokenHookStore {
-	t.Helper()
-	store := &rejectedTokenHookStore{data: data}
-	previousHooks := edition.Get()
-	edition.Override(&edition.Hooks{
-		LoadToken:   store.load,
-		SaveToken:   store.save,
-		DeleteToken: store.delete,
-	})
-	t.Cleanup(func() { edition.Override(previousHooks) })
-	return store
-}
-
-func installOAuthRefreshStub(t *testing.T, fn func(*OAuthProvider, context.Context, *TokenData) (*TokenData, error)) {
-	t.Helper()
-	resetRejectedTokenRefreshCoordinator(t)
-	previous := oauthRefreshToken
-	oauthRefreshToken = fn
-	t.Cleanup(func() { oauthRefreshToken = previous })
-}
-
-func resetRejectedTokenRefreshCoordinator(t *testing.T) {
-	t.Helper()
-	reset := func() {
-		rejectedTokenRefreshCoordinator.Lock()
-		rejectedTokenRefreshCoordinator.inFlight = make(map[rejectedTokenRefreshKey]*rejectedTokenRefreshCall)
-		rejectedTokenRefreshCoordinator.failures = make(map[rejectedTokenRefreshKey]rejectedTokenRefreshFailure)
-		rejectedTokenRefreshCoordinator.now = time.Now
-		rejectedTokenRefreshCoordinator.Unlock()
-	}
-	reset()
-	t.Cleanup(reset)
-}
-
-func waitForRejectedTokenRefreshParticipants(t *testing.T, key rejectedTokenRefreshKey, want int) {
-	t.Helper()
-	deadline := time.Now().Add(2 * time.Second)
-	for {
-		rejectedTokenRefreshCoordinator.Lock()
-		call := rejectedTokenRefreshCoordinator.inFlight[key]
-		got := 0
-		if call != nil {
-			got = call.participants
-		}
-		rejectedTokenRefreshCoordinator.Unlock()
-		if got >= want {
-			return
-		}
-		if time.Now().After(deadline) {
-			t.Fatalf("refresh participants = %d, want %d", got, want)
-		}
-		time.Sleep(time.Millisecond)
-	}
-}
-
-func installProfilesAcquireProbe(t *testing.T) <-chan struct{} {
-	t.Helper()
-	previous := profilesAcquireDualLock
-	attempted := make(chan struct{}, 1)
-	profilesAcquireDualLock = func(ctx context.Context, configDir string) (*DualLock, error) {
-		attempted <- struct{}{}
-		return previous(ctx, configDir)
-	}
-	t.Cleanup(func() { profilesAcquireDualLock = previous })
-	return attempted
-}
-
-func waitForProfilesAcquire(t *testing.T, attempted <-chan struct{}) {
-	t.Helper()
-	select {
-	case <-attempted:
-	case <-time.After(2 * time.Second):
-		t.Fatal("public opaque token mutation did not enter the Core dual lock")
-	}
-}
-
-func validRejectedTokenData(accessToken string) TokenData {
-	return TokenData{
-		AccessToken:  accessToken,
-		RefreshToken: "refresh-token",
-		ExpiresAt:    time.Now().Add(time.Hour),
-		RefreshExpAt: time.Now().Add(24 * time.Hour),
-		Source:       "mcp",
-		ClientID:     "client-id",
-	}
-}
-
-func TestCrossPlatformCoverageForceRefreshRejectedTokenConcurrentCallersExchangeOnce(t *testing.T) {
-	store := installRejectedTokenHookStore(t, validRejectedTokenData("old-access"))
-	var refreshCalls atomic.Int32
-	started := make(chan struct{})
-	release := make(chan struct{})
-	installOAuthRefreshStub(t, func(p *OAuthProvider, _ context.Context, data *TokenData) (*TokenData, error) {
-		if refreshCalls.Add(1) == 1 {
-			close(started)
-		}
-		<-release
-		updated := *data
-		updated.AccessToken = "new-access"
-		updated.ExpiresAt = time.Now().Add(time.Hour)
-		if err := saveTokenDataLocked(p.configDir, &updated); err != nil {
-			return nil, err
-		}
-		return &updated, nil
-	})
-
-	provider := NewOAuthProvider(t.TempDir(), nil)
-	const workers = 8
-	results := make(chan string, workers)
-	errs := make(chan error, workers)
-	var wg sync.WaitGroup
-	wg.Add(workers)
-	for range workers {
-		go func() {
-			defer wg.Done()
-			token, err := provider.ForceRefreshRejectedToken(context.Background(), "old-access")
-			results <- token
-			errs <- err
-		}()
-	}
-	<-started
-	close(release)
-	wg.Wait()
-	close(results)
-	close(errs)
-
-	for err := range errs {
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-	for token := range results {
-		if token != "new-access" {
-			t.Fatalf("token = %q, want new-access", token)
-		}
-	}
-	if got := refreshCalls.Load(); got != 1 {
-		t.Fatalf("refresh calls = %d, want 1", got)
-	}
-	stored, deletes := store.snapshot()
-	if stored.AccessToken != "new-access" || deletes != 0 {
-		t.Fatalf("stored token = %q, deletes = %d", stored.AccessToken, deletes)
-	}
-}
-
-func TestCrossPlatformCoverageForceRefreshRejectedTokenFailurePreservesCredential(t *testing.T) {
-	store := installRejectedTokenHookStore(t, validRejectedTokenData("old-access"))
-	refreshErr := errors.New("temporary refresh failure")
-	installOAuthRefreshStub(t, func(*OAuthProvider, context.Context, *TokenData) (*TokenData, error) {
-		return nil, refreshErr
-	})
-
-	_, err := NewOAuthProvider(t.TempDir(), nil).ForceRefreshRejectedToken(context.Background(), "old-access")
-	if !errors.Is(err, refreshErr) {
-		t.Fatalf("error = %v, want refresh cause", err)
-	}
-	stored, deletes := store.snapshot()
-	if stored.AccessToken != "old-access" || stored.RefreshToken != "refresh-token" || deletes != 0 {
-		t.Fatalf("credential changed after transient failure: %#v, deletes=%d", stored, deletes)
-	}
-}
-
-func TestCrossPlatformCoverageForceRefreshRejectedTokenFailureIsSingleflightAndCooledDown(t *testing.T) {
-	store := installRejectedTokenHookStore(t, validRejectedTokenData("old-access"))
-	previousProfile := RuntimeProfile()
-	SetRuntimeProfile("")
-	t.Cleanup(func() { SetRuntimeProfile(previousProfile) })
-
-	refreshErr := errors.New("temporary refresh failure")
-	var refreshCalls atomic.Int32
-	started := make(chan struct{})
-	release := make(chan struct{})
-	baseNow := time.Now()
-	var nowNanos atomic.Int64
-	nowNanos.Store(baseNow.UnixNano())
-	installOAuthRefreshStub(t, func(p *OAuthProvider, _ context.Context, data *TokenData) (*TokenData, error) {
-		call := refreshCalls.Add(1)
-		if call == 1 {
-			close(started)
-			<-release
-			return nil, refreshErr
-		}
-		updated := *data
-		updated.AccessToken = "recovered-access"
-		updated.ExpiresAt = time.Now().Add(time.Hour)
-		if err := saveTokenDataLocked(p.configDir, &updated); err != nil {
-			return nil, err
-		}
-		return &updated, nil
-	})
-	rejectedTokenRefreshCoordinator.Lock()
-	rejectedTokenRefreshCoordinator.now = func() time.Time {
-		return time.Unix(0, nowNanos.Load())
-	}
-	rejectedTokenRefreshCoordinator.Unlock()
-
-	configDir := t.TempDir()
-	provider := NewOAuthProvider(configDir, nil)
-	const workers = 8
-	start := make(chan struct{})
-	ready := make(chan struct{}, workers)
-	errs := make(chan error, workers)
-	var wg sync.WaitGroup
-	wg.Add(workers)
-	for range workers {
-		go func() {
-			defer wg.Done()
-			ready <- struct{}{}
-			<-start
-			_, err := provider.ForceRefreshRejectedToken(context.Background(), "old-access")
-			errs <- err
-		}()
-	}
-	for range workers {
-		<-ready
-	}
-	close(start)
-	<-started
-	key := newRejectedTokenRefreshKey(configDir, "", "old-access")
-	waitForRejectedTokenRefreshParticipants(t, key, workers)
-	close(release)
-	wg.Wait()
-	close(errs)
-
-	for err := range errs {
-		if !errors.Is(err, refreshErr) {
-			t.Fatalf("shared refresh error = %v, want %v", err, refreshErr)
-		}
-	}
-	if got := refreshCalls.Load(); got != 1 {
-		t.Fatalf("refresh calls after concurrent failure = %d, want 1", got)
-	}
-	stored, deletes := store.snapshot()
-	if stored.AccessToken != "old-access" || stored.RefreshToken != "refresh-token" || deletes != 0 {
-		t.Fatalf("credential changed after shared failure: %#v, deletes=%d", stored, deletes)
-	}
-
-	if _, err := provider.ForceRefreshRejectedToken(context.Background(), "old-access"); !errors.Is(err, refreshErr) {
-		t.Fatalf("cooldown error = %v, want %v", err, refreshErr)
-	}
-	if got := refreshCalls.Load(); got != 1 {
-		t.Fatalf("refresh calls inside cooldown = %d, want 1", got)
-	}
-
-	nowNanos.Store(baseNow.Add(rejectedTokenRefreshFailureCooldown + time.Nanosecond).UnixNano())
-	token, err := provider.ForceRefreshRejectedToken(context.Background(), "old-access")
-	if err != nil || token != "recovered-access" {
-		t.Fatalf("refresh after cooldown = %q, %v", token, err)
-	}
-	if got := refreshCalls.Load(); got != 2 {
-		t.Fatalf("refresh calls after cooldown = %d, want 2", got)
-	}
-	stored, deletes = store.snapshot()
-	if stored.AccessToken != "recovered-access" || deletes != 0 {
-		t.Fatalf("stored token after cooldown recovery = %q, deletes=%d", stored.AccessToken, deletes)
-	}
-}
-
-func TestCrossPlatformCoverageForceRefreshRejectedTokenChangedDuringCooldownUsesNewToken(t *testing.T) {
-	store := installRejectedTokenHookStore(t, validRejectedTokenData("old-access"))
-	previousProfile := RuntimeProfile()
-	SetRuntimeProfile("")
-	t.Cleanup(func() { SetRuntimeProfile(previousProfile) })
-
-	refreshErr := errors.New("temporary refresh failure")
-	var refreshCalls atomic.Int32
-	baseNow := time.Now()
-	installOAuthRefreshStub(t, func(*OAuthProvider, context.Context, *TokenData) (*TokenData, error) {
-		refreshCalls.Add(1)
-		return nil, refreshErr
-	})
-	rejectedTokenRefreshCoordinator.Lock()
-	rejectedTokenRefreshCoordinator.now = func() time.Time { return baseNow }
-	rejectedTokenRefreshCoordinator.Unlock()
-
-	configDir := t.TempDir()
-	provider := NewOAuthProvider(configDir, nil)
-	if _, err := provider.ForceRefreshRejectedToken(context.Background(), "old-access"); !errors.Is(err, refreshErr) {
-		t.Fatalf("initial refresh error = %v, want %v", err, refreshErr)
-	}
-	if got := refreshCalls.Load(); got != 1 {
-		t.Fatalf("initial refresh calls = %d, want 1", got)
-	}
-
-	store.mu.Lock()
-	store.data = validRejectedTokenData("externally-refreshed")
-	store.mu.Unlock()
-	token, err := provider.ForceRefreshRejectedToken(context.Background(), "old-access")
-	if err != nil || token != "externally-refreshed" {
-		t.Fatalf("refresh after external publication = %q, %v", token, err)
-	}
-	if got := refreshCalls.Load(); got != 1 {
-		t.Fatalf("external publication triggered another exchange: calls=%d", got)
-	}
-	key := newRejectedTokenRefreshKey(configDir, "", "old-access")
-	rejectedTokenRefreshCoordinator.Lock()
-	_, failurePresent := rejectedTokenRefreshCoordinator.failures[key]
-	rejectedTokenRefreshCoordinator.Unlock()
-	if failurePresent {
-		t.Fatal("old-token failure cache was not cleared after external publication")
-	}
-}
-
-func TestCrossPlatformCoverageOpaquePublisherWaitsForRejectedTokenRefresh(t *testing.T) {
-	store := installRejectedTokenHookStore(t, validRejectedTokenData("old-access"))
-	started := make(chan struct{})
-	release := make(chan struct{})
-	var releaseOnce sync.Once
-	t.Cleanup(func() { releaseOnce.Do(func() { close(release) }) })
-	installOAuthRefreshStub(t, func(p *OAuthProvider, _ context.Context, data *TokenData) (*TokenData, error) {
-		close(started)
-		<-release
-		updated := *data
-		updated.AccessToken = "refreshed-from-old"
-		updated.ExpiresAt = time.Now().Add(time.Hour)
-		if err := saveTokenDataLocked(p.configDir, &updated); err != nil {
-			return nil, err
-		}
-		return &updated, nil
-	})
-
-	configDir := t.TempDir()
-	provider := NewOAuthProvider(configDir, nil)
-	refreshResult := make(chan struct {
-		token string
-		err   error
-	}, 1)
-	go func() {
-		token, err := provider.ForceRefreshRejectedToken(context.Background(), "old-access")
-		refreshResult <- struct {
-			token string
-			err   error
-		}{token: token, err: err}
-	}()
-	<-started
-
-	acquireAttempted := installProfilesAcquireProbe(t)
-	publishResult := make(chan error, 1)
-	go func() {
-		publishResult <- SaveTokenData(configDir, ptrTokenData(validRejectedTokenData("login-published")))
-	}()
-	waitForProfilesAcquire(t, acquireAttempted)
-	releaseOnce.Do(func() { close(release) })
-
-	refresh := <-refreshResult
-	if refresh.err != nil || refresh.token != "refreshed-from-old" {
-		t.Fatalf("refresh result = %q, %v", refresh.token, refresh.err)
-	}
-	if err := <-publishResult; err != nil {
-		t.Fatalf("publish token: %v", err)
-	}
-	stored, deletes := store.snapshot()
-	if stored.AccessToken != "login-published" || deletes != 0 {
-		t.Fatalf("older refresh overwrote login publication: token=%q deletes=%d", stored.AccessToken, deletes)
-	}
-}
-
-func TestCrossPlatformCoverageOpaqueLogoutWaitsForRejectedTokenRefresh(t *testing.T) {
-	for _, tc := range []struct {
-		name   string
-		logout func(string) error
-	}{
-		{name: "current profile", logout: func(configDir string) error {
-			return DeleteTokenDataForProfile(configDir, "")
-		}},
-		{name: "all profiles", logout: DeleteAllTokenData},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			store := installRejectedTokenHookStore(t, validRejectedTokenData("old-access"))
-			started := make(chan struct{})
-			release := make(chan struct{})
-			var releaseOnce sync.Once
-			t.Cleanup(func() { releaseOnce.Do(func() { close(release) }) })
-			installOAuthRefreshStub(t, func(p *OAuthProvider, _ context.Context, data *TokenData) (*TokenData, error) {
-				close(started)
-				<-release
-				updated := *data
-				updated.AccessToken = "refreshed-before-logout"
-				updated.ExpiresAt = time.Now().Add(time.Hour)
-				if err := saveTokenDataLocked(p.configDir, &updated); err != nil {
-					return nil, err
-				}
-				return &updated, nil
-			})
-
-			configDir := t.TempDir()
-			provider := NewOAuthProvider(configDir, nil)
-			refreshResult := make(chan error, 1)
-			go func() {
-				_, err := provider.ForceRefreshRejectedToken(context.Background(), "old-access")
-				refreshResult <- err
-			}()
-			<-started
-
-			acquireAttempted := installProfilesAcquireProbe(t)
-			logoutResult := make(chan error, 1)
-			go func() { logoutResult <- tc.logout(configDir) }()
-			waitForProfilesAcquire(t, acquireAttempted)
-			releaseOnce.Do(func() { close(release) })
-
-			if err := <-refreshResult; err != nil {
-				t.Fatalf("refresh: %v", err)
-			}
-			if err := <-logoutResult; err != nil {
-				t.Fatalf("logout: %v", err)
-			}
-			stored, deletes := store.snapshot()
-			if stored.AccessToken != "" || stored.RefreshToken != "" || deletes != 1 {
-				t.Fatalf("refresh resurrected logged-out credential: %#v deletes=%d", stored, deletes)
-			}
-		})
-	}
-}
-
-func ptrTokenData(data TokenData) *TokenData {
-	return &data
-}
-
-func TestCrossPlatformCoverageOAuthLockedRefreshReadsOpaqueEditionStore(t *testing.T) {
-	data := validRejectedTokenData("expired-access")
-	data.ExpiresAt = time.Now().Add(-time.Hour)
-	store := installRejectedTokenHookStore(t, data)
-	var refreshCalls atomic.Int32
-	installOAuthRefreshStub(t, func(p *OAuthProvider, _ context.Context, current *TokenData) (*TokenData, error) {
-		refreshCalls.Add(1)
-		updated := *current
-		updated.AccessToken = "proactively-refreshed"
-		updated.ExpiresAt = time.Now().Add(time.Hour)
-		if err := saveTokenDataLocked(p.configDir, &updated); err != nil {
-			return nil, err
-		}
-		return &updated, nil
-	})
-
-	token, err := NewOAuthProvider(t.TempDir(), nil).GetAccessToken(context.Background())
-	if err != nil || token != "proactively-refreshed" {
-		t.Fatalf("GetAccessToken() = %q, %v", token, err)
-	}
-	if refreshCalls.Load() != 1 {
-		t.Fatalf("refresh calls = %d, want 1", refreshCalls.Load())
-	}
-	stored, deletes := store.snapshot()
-	if stored.AccessToken != "proactively-refreshed" || deletes != 0 {
-		t.Fatalf("stored token = %q, deletes = %d", stored.AccessToken, deletes)
-	}
-}

internal/auth/remaining_coverage_test.go

@@ -43,9 +43,6 @@ func TestCrossPlatformCoverageTokenPersistencePreflightRemainingEdges(t *testing
 	})
 
 	edition.Override(&edition.Hooks{SaveToken: func(string, []byte) error { return nil }})
-	if err := prepareLoginPersistence(t.TempDir()); err != nil {
-		t.Fatal(err)
-	}
 	if err := preflightTokenPersistence(t.TempDir()); err != nil {
 		t.Fatal(err)
 	}
@@ -58,9 +55,6 @@ func TestCrossPlatformCoverageTokenPersistencePreflightRemainingEdges(t *testing
 	authValidateEntries = func(string) error { return nil }
 	profileFail := errors.New("profile load failed")
 	profilesReadFile = func(string) ([]byte, error) { return nil, profileFail }
-	if err := prepareLoginPersistence(t.TempDir()); !errors.Is(err, profileFail) {
-		t.Fatalf("schema preflight profile load error = %v", err)
-	}
 	if err := preflightTokenPersistence(t.TempDir()); !errors.Is(err, profileFail) {
 		t.Fatalf("profile load error = %v", err)
 	}

internal/auth/testmain_test.go

@@ -14,7 +14,6 @@
 package auth
 
 import (
-	"fmt"
 	"os"
 	"testing"
 
@@ -35,17 +34,7 @@ func TestMain(m *testing.M) {
 		_ = os.RemoveAll(tmpDir)
 		panic("set " + keychain.StorageDirEnv + ": " + err.Error())
 	}
-	if err := os.Setenv(keychain.TestNamespaceEnv, tmpDir); err != nil {
-		_ = os.RemoveAll(tmpDir)
-		panic("set " + keychain.TestNamespaceEnv + ": " + err.Error())
-	}
 	code := m.Run()
-	if err := keychain.RemoveAuthTokenEntries(keychain.Service); err != nil {
-		fmt.Fprintf(os.Stderr, "internal/auth keychain cleanup: %v\n", err)
-		if code == 0 {
-			code = 1
-		}
-	}
 	_ = os.RemoveAll(tmpDir)
 	os.Exit(code)
 }

internal/auth/token.go

@@ -59,28 +59,27 @@ var (
 		profile, _, err := resolveProfileForLoadLocked(configDir, selector)
 		return profile, err
 	}
-	tokenResolveDeletion         = resolveProfileDeletionSelection
-	tokenResolveSelection        = resolveProfileSelection
-	tokenUpsertProfile           = upsertProfileFromTokenWithCurrentLocked
-	tokenRemoveProfile           = removeProfileLocked
-	tokenSyncLegacyMirror        = syncLegacyTokenMirrorLocked
-	tokenSyncOrganizationMirror  = syncOrganizationTokenMirrorForProfile
-	tokenLoadProfiles            = LoadProfiles
-	tokenEnsureProfilesMigration = ensureProfilesMigrationLocked
-	tokenSaveProfiles            = SaveProfiles
-	tokenWriteMarker             = WriteTokenMarker
-	tokenWriteManualMarker       = WriteManualTokenMarker
-	tokenDeleteMarker            = DeleteTokenMarker
-	tokenParseURL                = url.Parse
-	tokenNewRequest              = http.NewRequestWithContext
-	tokenDefaultConfigDir        = getDefaultConfigDir
-	tokenLoadData                = LoadTokenData
-	tokenRevokeURL               = GetRevokeTokenURL
-	tokenMCPBaseURL              = GetMCPBaseURL
-	tokenLogoutURL               = LogoutURL
-	tokenLogoutContinueURL       = LogoutContinueURL
-	tokenLogoutHTTPClient        = &http.Client{Timeout: 10 * time.Second, CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
-	tokenRevokeHTTPClient        = &http.Client{Timeout: 10 * time.Second}
+	tokenResolveDeletion        = resolveProfileDeletionSelection
+	tokenResolveSelection       = resolveProfileSelection
+	tokenUpsertProfile          = upsertProfileFromTokenWithCurrentLocked
+	tokenRemoveProfile          = removeProfileLocked
+	tokenSyncLegacyMirror       = syncLegacyTokenMirrorLocked
+	tokenSyncOrganizationMirror = syncOrganizationTokenMirrorForProfile
+	tokenLoadProfiles           = LoadProfiles
+	tokenSaveProfiles           = SaveProfiles
+	tokenWriteMarker            = WriteTokenMarker
+	tokenWriteManualMarker      = WriteManualTokenMarker
+	tokenDeleteMarker           = DeleteTokenMarker
+	tokenParseURL               = url.Parse
+	tokenNewRequest             = http.NewRequestWithContext
+	tokenDefaultConfigDir       = getDefaultConfigDir
+	tokenLoadData               = LoadTokenData
+	tokenRevokeURL              = GetRevokeTokenURL
+	tokenMCPBaseURL             = GetMCPBaseURL
+	tokenLogoutURL              = LogoutURL
+	tokenLogoutContinueURL      = LogoutContinueURL
+	tokenLogoutHTTPClient       = &http.Client{Timeout: 10 * time.Second, CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
+	tokenRevokeHTTPClient       = &http.Client{Timeout: 10 * time.Second}
 )
 
 // TokenData holds the OAuth token set persisted to disk.
@@ -97,96 +96,6 @@ type TokenData struct {
 	ClientID       string    `json:"client_id,omitempty"` // Associated app client ID for refresh
 	UpdatedAt      string    `json:"updated_at,omitempty"`
 	Source         string    `json:"source,omitempty"`
-	// LegacyOrgScopedProfile is an in-memory destination for an explicitly
-	// matched historical profile whose userId was never resolved. It is never
-	// persisted as token material.
-	LegacyOrgScopedProfile string `json:"-"`
-	// FreshAuthorization distinguishes a new OAuth/device exchange from a
-	// refresh of the credential already selected locally. Persistence uses this
-	// transient marker to reject ambiguous UID-less logins without breaking
-	// legitimate refreshes of unresolved accounts.
-	FreshAuthorization bool `json:"-"`
-}
-
-// tokenPersistenceWritePlan is the single source of truth for deciding which
-// credential slots a token publication can touch. Both the write path and its
-// read-only preflight must use this plan so a slot cannot be newly written
-// without first being checked for unreadable data.
-//
-// The plan is intentionally pure: callers supply the already-loaded profile
-// registry and process-local runtime selector, and no storage is read or
-// mutated while the decision is made.
-type tokenPersistenceWritePlan struct {
-	CorpID                         string
-	UserID                         string
-	RuntimeSelector                string
-	PersistenceSelector            string
-	ExactSelector                  string
-	MakeCurrent                    bool
-	ExistingIdentity               bool
-	UpgradesLegacyProfile          bool
-	PreserveUnresolvedOrganization bool
-	WriteIdentity                  bool
-	WriteOrganization              bool
-	WriteGlobal                    bool
-}
-
-func planTokenPersistenceWrites(
-	cfg *ProfilesConfig,
-	data *TokenData,
-	runtimeSelector string,
-) tokenPersistenceWritePlan {
-	plan := tokenPersistenceWritePlan{
-		RuntimeSelector: strings.TrimSpace(runtimeSelector),
-		// Manual and organization-bound publications both snapshot the global
-		// compatibility slot before they can replace or resynchronize it.
-		WriteGlobal: true,
-	}
-	if data == nil {
-		return plan
-	}
-
-	plan.CorpID = strings.TrimSpace(data.CorpID)
-	plan.UserID = strings.TrimSpace(data.UserID)
-	if plan.CorpID == "" {
-		return plan
-	}
-
-	plan.PersistenceSelector = plan.RuntimeSelector
-	if plan.PersistenceSelector == "" && plan.UserID == "" {
-		plan.PersistenceSelector = strings.TrimSpace(data.LegacyOrgScopedProfile)
-	}
-	plan.MakeCurrent = plan.PersistenceSelector == ""
-	plan.ExactSelector = profileSelector(plan.CorpID, plan.UserID)
-	plan.ExistingIdentity = profileIndexByIdentity(cfg, plan.CorpID, plan.UserID) >= 0
-	plan.UpgradesLegacyProfile = !plan.ExistingIdentity &&
-		plan.UserID != "" &&
-		len(profilesForCorpID(cfg, plan.CorpID)) == 1 &&
-		legacyProfileIndexByCorpID(cfg, plan.CorpID) >= 0
-	plan.PreserveUnresolvedOrganization = plan.UserID != "" &&
-		unresolvedProfileForCorp(cfg, plan.CorpID) != nil &&
-		!plan.UpgradesLegacyProfile
-	plan.WriteIdentity = plan.UserID != ""
-	orgCurrentSelector := ""
-	if cfg != nil {
-		orgCurrentSelector = cfg.OrgCurrentProfiles[plan.CorpID]
-	}
-
-	// A sole unresolved profile is being completed in place during explicit
-	// reauthorization. Its organization slot must move with the newly exact
-	// identity even when an explicit runtime selector keeps it from becoming
-	// process-global current.
-	plan.WriteOrganization = plan.UserID == "" ||
-		plan.UpgradesLegacyProfile ||
-		(!plan.PreserveUnresolvedOrganization &&
-			(plan.MakeCurrent ||
-				exactProfileSelectorForCorp(
-					cfg,
-					plan.CorpID,
-					orgCurrentSelector,
-				) == plan.ExactSelector))
-
-	return plan
 }
 
 // IsAccessTokenValid returns true if the access token has not expired.
@@ -218,10 +127,6 @@ const tokenJSONFile = "token.json"
 type TokenMarker struct {
 	UpdatedAt   string `json:"updated_at"`
 	ManualToken bool   `json:"manual_token,omitempty"`
-	// Revision changes on every credential publication. Runtime token caches
-	// use it as a cheap cross-process invalidation signal without reading the
-	// platform keychain on every request.
-	Revision string `json:"revision,omitempty"`
 }
 
 // WriteTokenMarker writes a token.json marker containing only an updated_at
@@ -242,7 +147,6 @@ func writeTokenMarker(configDir string, manual bool) error {
 	marker := TokenMarker{
 		UpdatedAt:   time.Now().Format(time.RFC3339),
 		ManualToken: manual,
-		Revision:    uuid.NewString(),
 	}
 	data, _ := tokenJSONMarshalIndent(marker, "", "  ")
 	if err := tokenMkdirAll(configDir, 0o700); err != nil {
@@ -255,27 +159,6 @@ func writeTokenMarker(configDir string, manual bool) error {
 	return tokenRename(tmp, filepath.Join(configDir, tokenJSONFile))
 }
 
-// ReadTokenMarkerRevision returns the current credential publication revision.
-// Existing markers without a revision remain readable, but callers must avoid
-// caching them because they cannot prove that the credential is unchanged.
-func ReadTokenMarkerRevision(configDir string) (revision string, present bool, err error) {
-	data, err := tokenReadFile(filepath.Join(configDir, tokenJSONFile))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return "", false, nil
-		}
-		return "", false, fmt.Errorf("read token marker: %w", err)
-	}
-	var marker TokenMarker
-	if err := json.Unmarshal(data, &marker); err != nil {
-		// The marker is only a cache-coherency hint. A malformed historical or
-		// externally modified marker must disable caching, not make an otherwise
-		// valid credential unusable.
-		return "", true, nil
-	}
-	return strings.TrimSpace(marker.Revision), true, nil
-}
-
 func manualTokenMarkerActive(configDir string) (bool, error) {
 	data, err := tokenReadFile(filepath.Join(configDir, tokenJSONFile))
 	if err != nil {
@@ -301,39 +184,18 @@ func DeleteTokenMarker(configDir string) error {
 	return nil
 }
 
-// SaveTokenData persists TokenData under the auth dual lock. When an edition
-// hook (SaveToken) is registered, the locked write delegates to that hook;
-// otherwise it falls back to the default keychain-based storage.
+// SaveTokenData persists TokenData. When an edition hook (SaveToken) is
+// registered, it delegates entirely to the hook; otherwise it falls back
+// to the default keychain-based storage.
 func SaveTokenData(configDir string, data *TokenData) error {
+	if h := edition.Get(); h.SaveToken != nil {
+		return saveTokenViaHook(h, configDir, data)
+	}
 	return withProfilesLock(configDir, func() error {
 		return saveTokenDataLocked(configDir, data)
 	})
 }
 
-// SaveLoginTokenData is the safe persistence boundary for credentials produced
-// by a new login entry point (OAuth/device/PAT authorization or --token). It
-// repairs a uniquely recoverable half-migrated legacy login before any global
-// mirror can be replaced, marks the incoming credential as a fresh
-// authorization for UID-less account isolation, and preflights every slot the
-// write plan can touch.
-//
-// Refresh paths must continue to use SaveTokenData after their refresh-specific
-// preflight; treating a refresh as a fresh authorization would incorrectly
-// reject the selected unresolved account in a multi-account organization.
-func SaveLoginTokenData(configDir string, data *TokenData) error {
-	if data == nil {
-		return fmt.Errorf("token data is empty")
-	}
-	if err := prepareLoginPersistence(configDir); err != nil {
-		return fmt.Errorf("local login state cannot be safely updated: %w", err)
-	}
-	data.FreshAuthorization = true
-	if err := preflightTokenWritePersistence(configDir, data); err != nil {
-		return fmt.Errorf("local login state cannot be safely updated: %w", err)
-	}
-	return SaveTokenData(configDir, data)
-}
-
 // saveTokenDataLocked performs the keychain + profiles.json + legacy mirror
 // writes assuming the auth dual-layer lock is already held. Callers that
 // already hold the lock (OAuthProvider refresh path, the legacy secure->keychain
@@ -350,56 +212,35 @@ func saveTokenDataLocked(configDir string, data *TokenData) error {
 		if err != nil {
 			return err
 		}
-		// A login may be the first operation after upgrading. Finish a v1
-		// registry migration before an upsert can raise profiles.json to v2;
-		// otherwise untouched organizations would permanently lose their chance
-		// to receive exact identity token slots. Do not re-run v2 repair here:
-		// refresh has already rotated the remote credential at this point, and an
-		// unrelated damaged identity slot must not prevent the new token from
-		// being committed. Normal load/preflight paths repair v2 before exchange.
-		if cfg.Version < profilesVersion {
-			if err := tokenEnsureProfilesMigration(configDir); err != nil {
-				return err
-			}
-			cfg, err = tokenLoadProfiles(configDir)
-			if err != nil {
-				return err
-			}
-		}
 		if err := ensureProfilesWritable(cfg); err != nil {
 			return err
 		}
-		plan := planTokenPersistenceWrites(cfg, data, RuntimeProfile())
-		if err := validateTokenPersistenceWritePlan(cfg, data, plan); err != nil {
-			return err
-		}
+		runtimeSelector := strings.TrimSpace(RuntimeProfile())
+		makeCurrent := runtimeSelector == ""
+		exactSelector := profileSelector(corpID, userID)
+		mirrorOrg := makeCurrent ||
+			exactProfileSelectorForCorp(cfg, corpID, cfg.OrgCurrentProfiles[corpID]) == exactSelector
+		existingIdentity := profileIndexByIdentity(cfg, corpID, userID) >= 0
+		upgradesLegacyProfile := !existingIdentity && userID != "" && legacyProfileIndexByCorpID(cfg, corpID) >= 0
 		logging.AuthDebug(
 			"auth.token.persist.plan",
 			"corp_id", corpID,
 			"user_id", userID,
 			"user_name", strings.TrimSpace(data.UserName),
-			"identity_selector", plan.ExactSelector,
-			"existing_identity", plan.ExistingIdentity,
-			"upgrades_legacy_profile", plan.UpgradesLegacyProfile,
+			"identity_selector", exactSelector,
+			"existing_identity", existingIdentity,
+			"upgrades_legacy_profile", upgradesLegacyProfile,
 			"profiles_before", len(cfg.Profiles),
-			"runtime_profile", plan.RuntimeSelector,
-			"persistence_profile", plan.PersistenceSelector,
-			"write_identity_slot", plan.WriteIdentity,
-			"write_org_mirror", plan.WriteOrganization,
-			"write_global_mirror", plan.WriteGlobal,
-			"publish_incoming_global", plan.MakeCurrent,
-		)
-		snapshot, err := snapshotTokenPersistence(
-			configDir,
-			cfg,
-			plan.CorpID,
-			plan.UserID,
-			plan.WriteOrganization,
+			"runtime_profile", runtimeSelector,
+			"write_identity_slot", userID != "",
+			"write_org_mirror", mirrorOrg,
+			"write_global_mirror", makeCurrent,
 		)
+		snapshot, err := snapshotTokenPersistence(configDir, cfg, corpID, userID, mirrorOrg)
 		if err != nil {
 			return err
 		}
-		preserveManualDefault := !plan.MakeCurrent &&
+		preserveManualDefault := !makeCurrent &&
 			snapshot.marker.known &&
 			snapshot.marker.exists &&
 			snapshot.marker.manual
@@ -409,28 +250,32 @@ func saveTokenDataLocked(configDir string, data *TokenData) error {
 			}
 			return operationErr
 		}
-		if plan.WriteIdentity {
+		if userID != "" {
 			if err := tokenSaveKeychainForIdentity(corpID, userID, data); err != nil {
 				return rollback(err)
 			}
+		} else {
+			for _, profile := range cfg.Profiles {
+				if strings.TrimSpace(profile.CorpID) == corpID && strings.TrimSpace(profile.UserID) != "" {
+					return fmt.Errorf("cannot store profile for corpId %q without userId because account identities already exist", corpID)
+				}
+			}
 		}
-		if err := tokenUpsertProfile(configDir, data, plan.MakeCurrent); err != nil {
+		if err := tokenUpsertProfile(configDir, data, makeCurrent); err != nil {
 			return rollback(err)
 		}
-		if plan.WriteOrganization {
+		if mirrorOrg {
 			if err := tokenSaveKeychainForCorpID(corpID, data); err != nil {
 				return rollback(err)
 			}
 		}
-		if plan.WriteGlobal {
-			if plan.MakeCurrent {
-				if err := tokenSaveKeychain(data); err != nil {
-					return rollback(err)
-				}
-			} else if !preserveManualDefault {
-				if err := tokenSyncLegacyMirror(configDir); err != nil {
-					return rollback(err)
-				}
+		if makeCurrent {
+			if err := tokenSaveKeychain(data); err != nil {
+				return rollback(err)
+			}
+		} else if !preserveManualDefault {
+			if err := tokenSyncLegacyMirror(configDir); err != nil {
+				return rollback(err)
 			}
 		}
 		if preserveManualDefault {
@@ -445,11 +290,10 @@ func saveTokenDataLocked(configDir string, data *TokenData) error {
 			"corp_id", corpID,
 			"user_id", userID,
 			"user_name", strings.TrimSpace(data.UserName),
-			"identity_selector", plan.ExactSelector,
-			"write_identity_slot", plan.WriteIdentity,
-			"write_org_mirror", plan.WriteOrganization,
-			"write_global_mirror", plan.WriteGlobal && !preserveManualDefault,
-			"publish_incoming_global", plan.MakeCurrent,
+			"identity_selector", exactSelector,
+			"write_identity_slot", userID != "",
+			"write_org_mirror", mirrorOrg,
+			"write_global_mirror", makeCurrent,
 		)
 		return nil
 	}
@@ -561,7 +405,7 @@ func loadTokenDataForProfileLocked(configDir, profile string) (*TokenData, error
 		// as a different organization (the legacy mirror may have drifted).
 		if legacy, lerr := tokenLoadKeychain(); lerr == nil && legacy != nil &&
 			strings.TrimSpace(legacy.CorpID) == strings.TrimSpace(selected.CorpID) &&
-			strings.TrimSpace(legacy.UserID) == strings.TrimSpace(selected.UserID) {
+			(strings.TrimSpace(selected.UserID) == "" || strings.TrimSpace(legacy.UserID) == strings.TrimSpace(selected.UserID)) {
 			return legacy, nil
 		} else if lerr != nil && !errors.Is(lerr, ErrTokenDataNotFound) {
 			return nil, lerr
@@ -591,131 +435,38 @@ func loadTokenDataForProfileLocked(configDir, profile string) (*TokenData, error
 }
 
 func tokenLoadProfileIdentity(profile Profile) (*TokenData, error) {
-	corpID := strings.TrimSpace(profile.CorpID)
-	userID := strings.TrimSpace(profile.UserID)
 	if strings.TrimSpace(profile.UserID) == "" {
-		data, err := tokenLoadKeychainForCorpID(corpID)
-		if err != nil {
-			return nil, err
-		}
-		if data == nil {
-			return nil, ErrTokenDataNotFound
-		}
-		if strings.TrimSpace(data.CorpID) != corpID {
-			return nil, fmt.Errorf(
-				"organization token mirror for corpId %q contains token for corpId %q; cannot use it for unresolved profile %q",
-				corpID,
-				data.CorpID,
-				profile.Name,
-			)
-		}
-		if strings.TrimSpace(data.UserID) != "" {
-			return nil, fmt.Errorf(
-				"organization token mirror for corpId %q belongs to userId %q; cannot use it for unresolved profile %q",
-				corpID,
-				data.UserID,
-				profile.Name,
-			)
-		}
-		return data, nil
+		return tokenLoadKeychainForCorpID(profile.CorpID)
 	}
-	data, err := tokenLoadKeychainIdentity(corpID, userID)
+	data, err := tokenLoadKeychainIdentity(profile.CorpID, profile.UserID)
 	if err == nil {
-		if data == nil {
-			return nil, ErrTokenDataNotFound
-		}
-		if strings.TrimSpace(data.CorpID) != corpID || strings.TrimSpace(data.UserID) != userID {
-			return nil, fmt.Errorf(
-				"identity token slot %q contains token for %q; cannot use it for profile %q",
-				TokenAccountForIdentity(corpID, userID),
-				profileSelector(data.CorpID, data.UserID),
-				ProfileSelector(profile),
-			)
-		}
 		return data, nil
 	}
 	if !errors.Is(err, ErrTokenDataNotFound) {
 		return nil, err
 	}
-	orgData, orgErr := tokenLoadKeychainForCorpID(corpID)
+	orgData, orgErr := tokenLoadKeychainForCorpID(profile.CorpID)
 	if orgErr != nil {
 		if errors.Is(orgErr, ErrTokenDataNotFound) {
 			return nil, err
 		}
 		return nil, orgErr
 	}
-	if orgData == nil {
-		return nil, err
-	}
-	if strings.TrimSpace(orgData.CorpID) != corpID {
-		return nil, fmt.Errorf(
-			"organization token mirror for corpId %q contains token for corpId %q; cannot use it for profile %q",
-			corpID,
-			orgData.CorpID,
-			ProfileSelector(profile),
-		)
-	}
 	if strings.TrimSpace(orgData.UserID) == "" {
-		return nil, fmt.Errorf("organization token mirror for corpId %q has no userId; cannot use it for profile %q", corpID, ProfileSelector(profile))
+		return nil, fmt.Errorf("organization token mirror for corpId %q has no userId; cannot use it for profile %q", profile.CorpID, ProfileSelector(profile))
 	}
-	if strings.TrimSpace(orgData.UserID) != userID {
+	if strings.TrimSpace(orgData.UserID) != strings.TrimSpace(profile.UserID) {
 		return nil, err
 	}
-	if saveErr := tokenSaveKeychainForIdentity(corpID, userID, orgData); saveErr != nil {
+	if saveErr := tokenSaveKeychainForIdentity(profile.CorpID, profile.UserID, orgData); saveErr != nil {
 		return nil, saveErr
 	}
 	return orgData, nil
 }
 
-// validateTokenPersistenceWritePlan prevents a freshly authorized UID-less
-// credential from being attached to an existing unresolved sibling merely
-// because both accounts share a corpId. An explicit selector is a storage
-// boundary, but it is not proof that an exact account completed OAuth. The only
-// safe overwrite is when that selector itself resolves to the existing
-// unresolved profile. A blank selector remains allowed for ordinary refreshes
-// of the already-selected unresolved token.
-func validateTokenPersistenceWritePlan(
-	cfg *ProfilesConfig,
-	data *TokenData,
-	plan tokenPersistenceWritePlan,
-) error {
-	if data == nil || plan.CorpID == "" || plan.UserID != "" {
-		return nil
-	}
-	unresolved := unresolvedProfileForCorp(cfg, plan.CorpID)
-	if unresolved == nil {
-		return nil
-	}
-	targetSelector := plan.RuntimeSelector
-	if targetSelector == "" {
-		targetSelector = strings.TrimSpace(data.LegacyOrgScopedProfile)
-	}
-	if targetSelector == "" {
-		if data.FreshAuthorization && len(profilesForCorpID(cfg, plan.CorpID)) > 1 {
-			return fmt.Errorf(
-				"refusing to save a fresh UID-less token over existing unresolved profile %q in multi-account organization %q; retry with that unresolved profile selector or require server-provided userId",
-				storedProfileSelector(cfg, unresolved),
-				plan.CorpID,
-			)
-		}
-		return nil
-	}
-	selected, _, err := resolveProfileSelection("", cfg, targetSelector)
-	if err == nil && selected != nil &&
-		strings.TrimSpace(selected.CorpID) == plan.CorpID &&
-		strings.TrimSpace(selected.UserID) == "" {
-		return nil
-	}
-	return fmt.Errorf(
-		"refusing to save UID-less token selected as profile %q over existing unresolved profile %q in organization %q; retry with the unresolved profile selector or require server-provided userId",
-		targetSelector,
-		storedProfileSelector(cfg, unresolved),
-		plan.CorpID,
-	)
-}
-
-// DeleteTokenData removes token data. Edition hooks and the default keychain
-// path are both serialized with refresh through the auth dual lock.
+// DeleteTokenData removes token data. When an edition hook (DeleteToken) is
+// registered, it delegates entirely to the hook; otherwise it falls back
+// to keychain + legacy cleanup.
 func DeleteTokenData(configDir string) error {
 	return DeleteTokenDataForProfile(configDir, RuntimeProfile())
 }
@@ -727,9 +478,7 @@ func DeleteTokenDataForProfile(configDir, profile string) error {
 		if strings.TrimSpace(profile) != "" {
 			return fmt.Errorf("profile selection is not supported by the current auth backend")
 		}
-		return withProfilesLock(configDir, func() error {
-			return h.DeleteToken(configDir)
-		})
+		return h.DeleteToken(configDir)
 	}
 	return withProfilesLock(configDir, func() error {
 		return deleteTokenDataForProfileLocked(configDir, profile)
@@ -788,20 +537,12 @@ func deleteTokenDataForProfileLocked(configDir, profile string) error {
 		removeSelector := removed.CorpID
 		orgCurrent := false
 		if exact {
-			if strings.TrimSpace(removed.UserID) == "" {
-				// A blank profile is exact only when it was selected by its unique
-				// local name. Converting it back to corpId here would turn a
-				// one-profile logout into whole-organization deletion.
-				removeSelector = effectiveSelector
-				orgCurrent = true
-			} else {
-				removeSelector = ProfileSelector(removed)
-				orgCurrent = exactProfileSelectorForCorp(
-					cfg,
-					removed.CorpID,
-					cfg.OrgCurrentProfiles[removed.CorpID],
-				) == ProfileSelector(removed)
-			}
+			removeSelector = ProfileSelector(removed)
+			orgCurrent = exactProfileSelectorForCorp(
+				cfg,
+				removed.CorpID,
+				cfg.OrgCurrentProfiles[removed.CorpID],
+			) == ProfileSelector(removed)
 		}
 		if _, err := tokenRemoveProfile(configDir, removeSelector); err != nil {
 			return err
@@ -827,8 +568,7 @@ func deleteTokenDataForProfileLocked(configDir, profile string) error {
 				return rollback(loadErr)
 			}
 			replacementSelector := updated.OrgCurrentProfiles[removed.CorpID]
-			preserveUnresolvedOrg := unresolvedProfileForCorp(updated, removed.CorpID) != nil
-			if exact && replacementSelector != "" && !preserveUnresolvedOrg {
+			if exact && replacementSelector != "" {
 				replacement, _, resolveErr := tokenResolveSelection(configDir, updated, replacementSelector)
 				if resolveErr != nil {
 					return rollback(resolveErr)
@@ -836,10 +576,8 @@ func deleteTokenDataForProfileLocked(configDir, profile string) error {
 				if err := tokenSyncOrganizationMirror(*replacement); err != nil {
 					return rollback(err)
 				}
-			} else if !preserveUnresolvedOrg {
-				if err := tokenDeleteKeychainForCorpID(removed.CorpID); err != nil {
-					return rollback(err)
-				}
+			} else if err := tokenDeleteKeychainForCorpID(removed.CorpID); err != nil {
+				return rollback(err)
 			}
 		}
 		preserveManualDefault := markerSnapshot.known &&
@@ -1175,9 +913,7 @@ func restoreTokenMarker(configDir string, marker tokenMarkerSnapshot) error {
 // DeleteAllTokenData removes all profile-scoped and legacy token data.
 func DeleteAllTokenData(configDir string) error {
 	if h := edition.Get(); h.DeleteToken != nil {
-		return withProfilesLock(configDir, func() error {
-			return h.DeleteToken(configDir)
-		})
+		return h.DeleteToken(configDir)
 	}
 	return withProfilesLock(configDir, func() error {
 		var firstErr error

internal/auth/token_preflight_test.go

@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
-	"net"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -211,48 +210,10 @@ func TestExactNonOrgCurrentRefreshIgnoresUnreadableOrgMirror(t *testing.T) {
 	}
 }
 
-func TestCrossPlatformCoverageExactRefreshAndSwitchIgnoreUnreadableReservedBlankOrgSlot(t *testing.T) {
-	t.Setenv(keychain.DisableKeychainEnv, "1")
-	fixture := seedLegacyBlankAndExactIdentitySlots(t)
-	if err := os.WriteFile(profileCiphertextPathForTest(fixture.corpID), []byte("corrupt reserved blank slot"), 0o600); err != nil {
-		t.Fatalf("WriteFile(reserved blank ciphertext) error = %v", err)
-	}
-
-	SetRuntimeProfile("")
-	if err := preflightTokenRefreshPersistence(fixture.configDir, fixture.beta); err != nil {
-		t.Fatalf("preflightTokenRefreshPersistence(current exact with reserved blank) error = %v", err)
-	}
-	refreshed := *fixture.beta
-	refreshed.AccessToken = "at_identity_beta_refreshed"
-	if err := SaveTokenData(fixture.configDir, &refreshed); err != nil {
-		t.Fatalf("SaveTokenData(current exact with reserved blank) error = %v", err)
-	}
-	if raw, err := os.ReadFile(profileCiphertextPathForTest(fixture.corpID)); err != nil || string(raw) != "corrupt reserved blank slot" {
-		t.Fatalf("reserved blank slot changed during exact refresh: %q, %v", raw, err)
-	}
-
-	if selected, err := SetCurrentProfile(fixture.configDir, profileSelector(fixture.alpha.CorpID, fixture.alpha.UserID)); err != nil || selected.UserID != fixture.alpha.UserID {
-		t.Fatalf("SetCurrentProfile(exact with reserved blank) = %#v, %v", selected, err)
-	}
-	if selected, err := UsePreviousProfile(fixture.configDir); err != nil || selected.UserID != fixture.beta.UserID {
-		t.Fatalf("UsePreviousProfile(exact with reserved blank) = %#v, %v", selected, err)
-	}
-	if raw, err := os.ReadFile(profileCiphertextPathForTest(fixture.corpID)); err != nil || string(raw) != "corrupt reserved blank slot" {
-		t.Fatalf("reserved blank slot changed during exact switches: %q, %v", raw, err)
-	}
-
-	blankRefresh := *fixture.blank
-	blankRefresh.LegacyOrgScopedProfile = fixture.blankName
-	SetRuntimeProfile(fixture.blankName)
-	if err := preflightTokenRefreshPersistence(fixture.configDir, &blankRefresh); err == nil ||
-		!strings.Contains(err.Error(), "profile token slot") {
-		t.Fatalf("blank refresh preflight error = %v, want unreadable reserved slot", err)
-	}
-}
-
-func TestFullTokenPersistenceInventoryDetectsOrphanProfileCiphertext(t *testing.T) {
+func TestExchangeAuthCodePreflightsOrphanProfileCiphertextBeforeHTTP(t *testing.T) {
 	cleanupKeychain(t)
 	t.Setenv(keychain.DisableKeychainEnv, "1")
+	setPreflightTestCredentials(t)
 	configDir := t.TempDir()
 	data := testToken("at_orphan", "corp_orphan", "Orphan Org")
 
@@ -269,12 +230,21 @@ func TestFullTokenPersistenceInventoryDetectsOrphanProfileCiphertext(t *testing.
 		t.Fatalf("WriteFile(replacement DEK) error = %v", err)
 	}
 
-	err := preflightTokenPersistence(configDir)
+	var calls atomic.Int32
+	provider := NewOAuthProvider(configDir, nil)
+	provider.httpClient = &http.Client{Transport: preflightRoundTripFunc(func(*http.Request) (*http.Response, error) {
+		calls.Add(1)
+		return nil, errors.New("unexpected HTTP request")
+	})}
+	_, err := provider.ExchangeAuthCode(context.Background(), "auth-code", "")
 	if err == nil || !strings.Contains(err.Error(), "auth token ciphertext inventory") {
-		t.Fatalf("preflightTokenPersistence() error = %v, want orphan ciphertext inventory error", err)
+		t.Fatalf("ExchangeAuthCode() error = %v, want orphan ciphertext preflight error", err)
 	}
 	if !keychain.IsCiphertextKeyMismatch(err) {
-		t.Fatalf("preflightTokenPersistence() error = %v, want ciphertext key mismatch in error chain", err)
+		t.Fatalf("ExchangeAuthCode() error = %v, want ciphertext key mismatch in error chain", err)
+	}
+	if got := calls.Load(); got != 0 {
+		t.Fatalf("HTTP calls = %d, want 0", got)
 	}
 }
 
@@ -334,7 +304,7 @@ func TestRefreshPreflightIgnoresUnreadableUnrelatedProfile(t *testing.T) {
 	}
 }
 
-func TestOAuthLoginUnreadableGlobalFailsClosedBeforeAuthorizationStart(t *testing.T) {
+func TestOAuthLoginPreflightsTokenPersistence(t *testing.T) {
 	setPreflightTestCredentials(t)
 	for _, force := range []bool{false, true} {
 		t.Run("force="+map[bool]string{false: "false", true: "true"}[force], func(t *testing.T) {
@@ -342,60 +312,33 @@ func TestOAuthLoginUnreadableGlobalFailsClosedBeforeAuthorizationStart(t *testin
 			configDir := t.TempDir()
 			seedUnreadableTokenStorage(t, configDir, testToken("at_login", "corp_login", "Login Org"))
 
-			listenErr := errors.New("authorization listener reached")
-			var calls atomic.Int32
-			oldListen := oauthListen
-			oauthListen = func(string, string) (net.Listener, error) {
-				calls.Add(1)
-				return nil, listenErr
-			}
-			t.Cleanup(func() { oauthListen = oldListen })
-
+			ctx, cancel := context.WithCancel(context.Background())
+			cancel()
 			provider := NewOAuthProvider(configDir, nil)
 			provider.NoBrowser = true
-			_, err := provider.Login(context.Background(), force)
-			if err == nil || !strings.Contains(err.Error(), "refusing to overwrite") {
-				t.Fatalf("Login(force=%v) error = %v, want unreadable-global protection", force, err)
-			}
-			if errors.Is(err, listenErr) {
-				t.Fatalf("Login(force=%v) reached authorization listener: %v", force, err)
-			}
-			if got := calls.Load(); got != 0 {
-				t.Fatalf("Login(force=%v) listener calls = %d, want 0", force, got)
+			_, err := provider.Login(ctx, force)
+			if err == nil || !strings.Contains(err.Error(), "legacy token slot") {
+				t.Fatalf("Login(force=%v) error = %v, want token persistence preflight error", force, err)
 			}
 		})
 	}
 }
 
-func TestExchangeAuthCodeRejectsUnreadableGlobalBeforeHTTP(t *testing.T) {
+func TestExchangeAuthCodePreflightsBeforeHTTP(t *testing.T) {
 	cleanupKeychain(t)
 	setPreflightTestCredentials(t)
 	configDir := t.TempDir()
-	existing := testToken("at_exchange", "corp_exchange", "Exchange Org")
-	seedUnreadableTokenStorage(t, configDir, existing)
+	seedUnreadableTokenStorage(t, configDir, testToken("at_exchange", "corp_exchange", "Exchange Org"))
 
 	var calls atomic.Int32
-	var saveCalls atomic.Int32
-	oldSave := oauthSaveToken
-	oauthSaveToken = func(string, *TokenData) error {
-		saveCalls.Add(1)
-		return nil
-	}
-	t.Cleanup(func() { oauthSaveToken = oldSave })
 	provider := NewOAuthProvider(configDir, nil)
 	provider.httpClient = &http.Client{Transport: preflightRoundTripFunc(func(*http.Request) (*http.Response, error) {
 		calls.Add(1)
-		return &http.Response{
-			StatusCode: http.StatusOK,
-			Header:     make(http.Header),
-			Body: io.NopCloser(strings.NewReader(
-				`{"accessToken":"new-access","refreshToken":"new-refresh","expiresIn":7200,"corpId":"corp_exchange"}`,
-			)),
-		}, nil
+		return nil, errors.New("unexpected HTTP request")
 	})}
-	_, err := provider.ExchangeAuthCode(context.Background(), "auth-code", existing.UserID)
+	_, err := provider.ExchangeAuthCode(context.Background(), "auth-code", "")
 	if err == nil || !strings.Contains(err.Error(), "legacy token slot") {
-		t.Fatalf("ExchangeAuthCode() error = %v, want target token persistence error", err)
+		t.Fatalf("ExchangeAuthCode() error = %v, want token persistence preflight error", err)
 	}
 	if !keychain.IsCiphertextKeyMismatch(err) {
 		t.Fatalf("ExchangeAuthCode() error = %v, want ciphertext key mismatch in error chain", err)
@@ -403,12 +346,9 @@ func TestExchangeAuthCodeRejectsUnreadableGlobalBeforeHTTP(t *testing.T) {
 	if got := calls.Load(); got != 0 {
 		t.Fatalf("HTTP calls = %d, want 0", got)
 	}
-	if got := saveCalls.Load(); got != 0 {
-		t.Fatalf("SaveTokenData calls = %d, want 0", got)
-	}
 }
 
-func TestDeviceFlowLoginRejectsUnreadableGlobalBeforeDeviceCodeRequest(t *testing.T) {
+func TestDeviceFlowLoginPreflightsBeforeDeviceCodeRequest(t *testing.T) {
 	cleanupKeychain(t)
 	setPreflightTestCredentials(t)
 	configDir := t.TempDir()
@@ -426,7 +366,7 @@ func TestDeviceFlowLoginRejectsUnreadableGlobalBeforeDeviceCodeRequest(t *testin
 	provider.SetBaseURL(server.URL)
 	_, err := provider.Login(context.Background())
 	if err == nil || !strings.Contains(err.Error(), "legacy token slot") {
-		t.Fatalf("DeviceFlowProvider.Login() error = %v, want unreadable-global protection", err)
+		t.Fatalf("DeviceFlowProvider.Login() error = %v, want token persistence preflight error", err)
 	}
 	if got := calls.Load(); got != 0 {
 		t.Fatalf("device code requests = %d, want 0", got)
@@ -478,7 +418,7 @@ func TestLockedRefreshRejectsFutureProfilesVersionBeforeHTTP(t *testing.T) {
 	if err != nil {
 		t.Fatalf("LoadProfiles() error = %v", err)
 	}
-	cfg.Version = profilesMaxVersion + 1
+	cfg.Version = profilesVersion + 1
 	raw, err := json.Marshal(cfg)
 	if err != nil {
 		t.Fatalf("json.Marshal() error = %v", err)

internal/cli/canonical.go

@@ -304,14 +304,3 @@ func splitSchemaPathTokens(raw string) []string {
 	}
 	return out
 }
-
-// normalizeSchemaQueryCLIPath accepts the historical query spellings while
-// keeping authored Registry CLI paths strict and space-separated. Canonical
-// identity lookup still runs before this compatibility normalization.
-func normalizeSchemaQueryCLIPath(path string) string {
-	parts := splitSchemaPathTokens(strings.TrimSpace(path))
-	if len(parts) > 0 && parts[0] == "dws" {
-		parts = parts[1:]
-	}
-	return strings.Join(parts, " ")
-}