chore: resolve merge conflicts between daemon_mode_b_main and main

Resolve all conflicts from merging origin/main into daemon_mode_b_main
using 84f4080 as the virtual merge base (last sync point from #4469).

Key resolution decisions:
- httpAcpBridge.ts: keep daemon's 102-line re-export shim (code lifted
  to @qwen-code/acp-bridge per F1)
- httpAcpBridge.test.ts: removed (tests moved to acp-bridge/bridge.test.ts)
- TelemetryRuntimeConfig: added isInteractive() and
  getOutboundCorrelationPropagateTraceContext() from main
- btwCommand.ts: keep daemon's clean buildBtwCacheSafeParams delegation
- sessionRecap.ts: main's getHistoryShallow() API + daemon's debug logging
- session-tracing.ts: daemon's ROOT_CONTEXT parent for bounded traces
- Session.ts: daemon's runInToolSpanContext + main's skipClassifierReason rename

Author: doudouOUC

.github/pull_request_template.md

@@ -1,73 +1,66 @@
 <!--
-Help reviewers verify this PR quickly.
+Maintainers prioritize PRs with a clear reviewer test plan — without it, review may be delayed.
 
-Maintainers prioritize PRs that include clear proof of work.
-If a PR does not include enough validation detail to reproduce and verify the change efficiently, review may be delayed.
+Don't hard-wrap paragraphs: GitHub renders single newlines as <br>, so wrapped text shows as a narrow column. Write each paragraph or list item as one long line.
 -->
 
-## Summary
+## What this PR does
 
-- What changed:
-- Why it changed:
-- Reviewer focus:
+<!-- What this PR does. Describe the change in prose, not by file or function names. -->
 
-## Validation
+## Why it's needed
 
-<!--
-Be concrete. Do not write only "tested locally".
-Include the exact commands, prompts, outputs, logs, screenshots, or videos that prove the change was actually run and observed.
+<!-- Why it's needed: the motivation, the problem being solved, or the user-facing benefit. -->
+
+## Reviewer Test Plan
 
-For user-visible changes, bug fixes, CLI / TUI behavior changes, or interaction changes, include key screenshots or a short video.
-When possible, show before/after behavior.
+<!--
+How a reviewer can confirm this PR: reproduction steps, expected vs observed behavior, and evidence. CI runs on macOS, Windows, and Linux — Tested on is what you verified locally.
 
-If helpful, use the `e2e-testing` skill to gather stronger end-to-end validation evidence.
+User-visible / TUI: Before/After with tmux-real-user-testing skill, screenshots, or a short recording.
+Non–user-visible (refactor, types, docs): commands and output below; write N/A under Before/After.
 -->
 
-- Commands run:
-  ```bash
-  # paste commands here
-  ```
-- Prompts / inputs used:
-- Expected result:
-- Observed result:
-- Quickest reviewer verification path:
-- Evidence (output, logs, screenshots, video, JSON, before/after, etc.):
+### How to verify
 
-## Scope / Risk
+<!-- How you reproduced it and what a reviewer should confirm — steps if needed, expected vs observed behavior. Focus on outcomes; paste logs or test output when helpful. -->
 
-- Main risk or tradeoff:
-- Not covered / not validated:
-- Breaking changes / migration notes:
+### Evidence (Before & After)
 
-## Testing Matrix
+<!-- User-visible / TUI changes: paste before-and-after screenshots, tmux logs, or video side by side. Non-UI changes (docs, refactor, types): N/A -->
 
-<!--
-Use:
-- ✅ tested
-- ⚠️ not tested
-- N/A
-If anything is ⚠️, explain why briefly below.
--->
+### Tested on
+
+|     OS     | Status |
+| :--------: | :----: |
+|  🍏 macOS  |        |
+| 🪟 Windows |        |
+|  🐧 Linux  |        |
 
-|          | 🍏  | 🪟  | 🐧  |
-| -------- | --- | --- | --- |
-| npm run  | ⚠️  | ⚠️  | ⚠️  |
-| npx      | ⚠️  | ⚠️  | ⚠️  |
-| Docker   | ⚠️  | ⚠️  | ⚠️  |
-| Podman   | ⚠️  | N/A | N/A |
-| Seatbelt | ⚠️  | N/A | N/A |
+<!-- ✅ tested · ⚠️ not tested · N/A -->
 
-Testing matrix notes:
+### Environment (optional)
 
--
+<!-- Local runtime: e.g. npm run dev, Docker/Podman sandbox, seatbelt. N/A if only unit tests. -->
 
-## Linked Issues / Bugs
+## Risk & Scope
+
+- Main risk or tradeoff:
+- Not validated / out of scope:
+- Breaking changes / migration notes:
+
+## Linked Issues
 
 <!--
-If this PR fully resolves an issue, use one of:
-- Closes #<issue_number>
-- Fixes #<issue_number>
-- Resolves #<issue_number>
+Closes #N / Fixes #N / Resolves #N to auto-close.
+Otherwise reference without a closing keyword.
+-->
+
+<details>
+<summary>中文说明</summary>
 
-Otherwise reference related issues without a closing keyword.
+<!--
+完整翻译上面的英文正文，逐段对应，不要省略或缩写。PR 标题保持英文。
 -->
+
+</details>

.github/workflows/release.yml

@@ -386,63 +386,6 @@ jobs:
           RELEASE_VERSION: '${{ needs.prepare.outputs.release_version }}'
         run: 'npm run package:standalone:release -- --version "${RELEASE_VERSION}" --out-dir dist/standalone'
 
-      - name: 'Verify Installation Release Assets'
-        run: 'npm run verify:installation-release -- --dir dist/standalone'
-
-      - name: 'Package Hosted Installation Assets'
-        env:
-          RELEASE_VERSION: '${{ needs.prepare.outputs.release_version }}'
-        run: 'npm run package:hosted-installation -- --out-dir dist/installation --version "${RELEASE_VERSION}"'
-
-      - name: 'Install ossutil'
-        if: |-
-          ${{ needs.prepare.outputs.is_dry_run == 'false' }}
-        env:
-          OSSUTIL_URL: "${{ vars.OSSUTIL_URL || 'https://gosspublic.alicdn.com/ossutil/1.7.19/ossutil-v1.7.19-linux-amd64.zip' }}"
-          OSSUTIL_SHA256: "${{ vars.OSSUTIL_SHA256 || 'dcc512e4a893e16bbee63bc769339d8e56b21744fd83c8212a9d8baf28767343' }}"
-        run: |-
-          set -euo pipefail
-
-          tmp_dir="$(mktemp -d)"
-          curl -fsSL --connect-timeout 15 --max-time 300 "${OSSUTIL_URL}" -o "${tmp_dir}/ossutil.zip"
-          echo "${OSSUTIL_SHA256}  ${tmp_dir}/ossutil.zip" | sha256sum -c -
-          unzip -q "${tmp_dir}/ossutil.zip" -d "${tmp_dir}"
-
-          ossutil_path="$(find "${tmp_dir}" -type f \( -name 'ossutil' -o -name 'ossutil64' \) -print -quit)"
-          if [[ -z "${ossutil_path}" ]]; then
-            echo "::error::ossutil binary not found in downloaded archive"
-            exit 1
-          fi
-
-          chmod +x "${ossutil_path}"
-          mkdir -p "${HOME}/.local/bin"
-          install -m 0755 "${ossutil_path}" "${HOME}/.local/bin/ossutil"
-          echo "${HOME}/.local/bin" >> "${GITHUB_PATH}"
-          rm -rf "${tmp_dir}"
-          "${HOME}/.local/bin/ossutil" >/dev/null
-
-      - name: 'Configure Aliyun OSS Credentials'
-        if: |-
-          ${{ needs.prepare.outputs.is_dry_run == 'false' }}
-        env:
-          ALIYUN_OSS_ACCESS_KEY_ID: '${{ secrets.ALIYUN_OSS_ACCESS_KEY_ID }}'
-          ALIYUN_OSS_ACCESS_KEY_SECRET: '${{ secrets.ALIYUN_OSS_ACCESS_KEY_SECRET }}'
-          ALIYUN_OSS_ENDPOINT: "${{ vars.ALIYUN_OSS_ENDPOINT || 'https://oss-cn-hangzhou.aliyuncs.com' }}"
-        run: |-
-          set -euo pipefail
-
-          if [[ -z "${ALIYUN_OSS_ACCESS_KEY_ID}" || -z "${ALIYUN_OSS_ACCESS_KEY_SECRET}" ]]; then
-            echo "::error::Missing Aliyun OSS credentials. Set ALIYUN_OSS_ACCESS_KEY_ID and ALIYUN_OSS_ACCESS_KEY_SECRET in the production-release environment secrets."
-            exit 1
-          fi
-
-          ossutil config \
-            -e "${ALIYUN_OSS_ENDPOINT}" \
-            -i "${ALIYUN_OSS_ACCESS_KEY_ID}" \
-            -k "${ALIYUN_OSS_ACCESS_KEY_SECRET}" \
-            -L EN \
-            -c "${RUNNER_TEMP}/.ossutilconfig"
-
       - name: 'Publish @qwen-code/qwen-code'
         working-directory: 'dist'
         run: |-
@@ -457,150 +400,37 @@ jobs:
         env:
           NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
 
+      - name: 'Verify Standalone Archives'
+        run: |-
+          npm run verify:installation-release -- --dir dist/standalone
+
       - name: 'Create GitHub Release and Tag'
         if: |-
           ${{ needs.prepare.outputs.is_dry_run == 'false' }}
         env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          # CI_BOT_PAT required: GITHUB_TOKEN events cannot trigger downstream workflows (sync-release-to-oss.yml).
+          GITHUB_TOKEN: '${{ secrets.CI_BOT_PAT }}'
           RELEASE_BRANCH: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
           RELEASE_TAG: '${{ needs.prepare.outputs.release_tag }}'
           PREVIOUS_RELEASE_TAG: '${{ needs.prepare.outputs.previous_release_tag }}'
           IS_NIGHTLY: '${{ needs.prepare.outputs.is_nightly }}'
           IS_PREVIEW: '${{ needs.prepare.outputs.is_preview }}'
         run: |-
-          set -euo pipefail
-
           PRERELEASE_FLAG=""
           if [[ "${IS_NIGHTLY}" == "true" || "${IS_PREVIEW}" == "true" ]]; then
             PRERELEASE_FLAG="--prerelease"
           fi
 
-          mapfile -t release_assets < <(node scripts/verify-installation-release.js --dir dist/standalone --list-release-asset-paths)
-
           gh release create "${RELEASE_TAG}" \
             dist/cli.js \
-            "${release_assets[@]}" \
+            dist/standalone/qwen-code-* \
+            dist/standalone/SHA256SUMS \
             --target "${RELEASE_BRANCH}" \
             --title "Release ${RELEASE_TAG}" \
             --notes-start-tag "${PREVIOUS_RELEASE_TAG}" \
             --generate-notes \
             ${PRERELEASE_FLAG}
 
-      - name: 'Sync Release Assets to Aliyun OSS'
-        if: |-
-          ${{ needs.prepare.outputs.is_dry_run == 'false' }}
-        env:
-          ALIYUN_OSS_BUCKET: "${{ vars.ALIYUN_OSS_BUCKET || 'qwen-code-assets' }}"
-          RELEASE_TAG: '${{ needs.prepare.outputs.release_tag }}'
-        run: |-
-          set -euo pipefail
-
-          mapfile -t release_assets < <(node scripts/verify-installation-release.js --dir dist/standalone --list-release-asset-paths)
-          node scripts/upload-aliyun-oss-assets.js \
-            --bucket "${ALIYUN_OSS_BUCKET}" \
-            --config "${RUNNER_TEMP}/.ossutilconfig" \
-            --prefix "releases/qwen-code/${RELEASE_TAG}" \
-            "${release_assets[@]}"
-
-      - name: 'Verify Aliyun OSS Release Assets'
-        if: |-
-          ${{ needs.prepare.outputs.is_dry_run == 'false' }}
-        env:
-          ALIYUN_OSS_PUBLIC_BASE_URL: "${{ vars.ALIYUN_OSS_PUBLIC_BASE_URL || 'https://qwen-code-assets.oss-cn-hangzhou.aliyuncs.com' }}"
-          RELEASE_TAG: '${{ needs.prepare.outputs.release_tag }}'
-        run: |-
-          set -euo pipefail
-
-          npm run verify:installation-release -- --base-url "${ALIYUN_OSS_PUBLIC_BASE_URL}/releases/qwen-code/${RELEASE_TAG}"
-
-      - name: 'Sync Hosted Installation Assets to Aliyun OSS'
-        if: |-
-          ${{ needs.prepare.outputs.is_dry_run == 'false' && needs.prepare.outputs.is_nightly == 'false' && needs.prepare.outputs.is_preview == 'false' }}
-        env:
-          ALIYUN_OSS_BUCKET: "${{ vars.ALIYUN_OSS_BUCKET || 'qwen-code-assets' }}"
-          RELEASE_TAG: '${{ needs.prepare.outputs.release_tag }}'
-        run: |-
-          set -euo pipefail
-
-          hosted_assets=(
-            dist/installation/install-qwen-standalone.sh
-            dist/installation/install-qwen-standalone.ps1
-            dist/installation/install-qwen-standalone.bat
-            dist/installation/uninstall-qwen-standalone.sh
-            dist/installation/uninstall-qwen-standalone.ps1
-            dist/installation/SHA256SUMS
-          )
-          node scripts/upload-aliyun-oss-assets.js \
-            --bucket "${ALIYUN_OSS_BUCKET}" \
-            --config "${RUNNER_TEMP}/.ossutilconfig" \
-            --prefix "installation/${RELEASE_TAG}" \
-            "${hosted_assets[@]}"
-          node scripts/upload-aliyun-oss-assets.js \
-            --bucket "${ALIYUN_OSS_BUCKET}" \
-            --config "${RUNNER_TEMP}/.ossutilconfig" \
-            --prefix "installation" \
-            "${hosted_assets[@]}"
-
-      - name: 'Verify Aliyun OSS Hosted Installation Assets'
-        if: |-
-          ${{ needs.prepare.outputs.is_dry_run == 'false' && needs.prepare.outputs.is_nightly == 'false' && needs.prepare.outputs.is_preview == 'false' }}
-        env:
-          ALIYUN_OSS_PUBLIC_BASE_URL: "${{ vars.ALIYUN_OSS_PUBLIC_BASE_URL || 'https://qwen-code-assets.oss-cn-hangzhou.aliyuncs.com' }}"
-          RELEASE_TAG: '${{ needs.prepare.outputs.release_tag }}'
-        run: |-
-          set -euo pipefail
-
-          hosted_tmp_dir="$(mktemp -d)"
-          trap 'rm -rf "${hosted_tmp_dir}"' EXIT
-          mkdir -p "${hosted_tmp_dir}/versioned" "${hosted_tmp_dir}/global"
-          for asset in install-qwen-standalone.sh install-qwen-standalone.ps1 install-qwen-standalone.bat uninstall-qwen-standalone.sh uninstall-qwen-standalone.ps1 SHA256SUMS; do
-            url="${ALIYUN_OSS_PUBLIC_BASE_URL}/installation/${RELEASE_TAG}/${asset}"
-            global_url="${ALIYUN_OSS_PUBLIC_BASE_URL}/installation/${asset}"
-            curl -fsSL --connect-timeout 15 --max-time 300 "${url}" -o "${hosted_tmp_dir}/versioned/${asset}"
-            curl -fsSL --connect-timeout 15 --max-time 300 "${global_url}" -o "${hosted_tmp_dir}/global/${asset}"
-          done
-          cmp -s "dist/installation/SHA256SUMS" "${hosted_tmp_dir}/versioned/SHA256SUMS" || {
-            echo "::error::Hosted installation SHA256SUMS does not match local dist/installation/SHA256SUMS"
-            diff -u "dist/installation/SHA256SUMS" "${hosted_tmp_dir}/versioned/SHA256SUMS" || true
-            exit 1
-          }
-          cmp -s "dist/installation/SHA256SUMS" "${hosted_tmp_dir}/global/SHA256SUMS" || {
-            echo "::error::Global hosted installation SHA256SUMS does not match local dist/installation/SHA256SUMS"
-            diff -u "dist/installation/SHA256SUMS" "${hosted_tmp_dir}/global/SHA256SUMS" || true
-            exit 1
-          }
-          (cd "${hosted_tmp_dir}/versioned" && sha256sum -c SHA256SUMS)
-          (cd "${hosted_tmp_dir}/global" && sha256sum -c SHA256SUMS)
-
-      - name: 'Publish Aliyun OSS Latest VERSION'
-        # Run last so the `latest/VERSION` pointer only flips after every
-        # release asset and hosted installer object has been uploaded and
-        # verified. If any earlier step fails, the pointer keeps referring
-        # to the previously-good release.
-        if: |-
-          ${{ needs.prepare.outputs.is_dry_run == 'false' && needs.prepare.outputs.is_nightly == 'false' && needs.prepare.outputs.is_preview == 'false' }}
-        env:
-          ALIYUN_OSS_BUCKET: "${{ vars.ALIYUN_OSS_BUCKET || 'qwen-code-assets' }}"
-          ALIYUN_OSS_PUBLIC_BASE_URL: "${{ vars.ALIYUN_OSS_PUBLIC_BASE_URL || 'https://qwen-code-assets.oss-cn-hangzhou.aliyuncs.com' }}"
-          RELEASE_TAG: '${{ needs.prepare.outputs.release_tag }}'
-        run: |-
-          set -euo pipefail
-
-          printf '%s\n' "${RELEASE_TAG}" > "${RUNNER_TEMP}/qwen-code-latest-version"
-          ossutil cp "${RUNNER_TEMP}/qwen-code-latest-version" "oss://${ALIYUN_OSS_BUCKET}/releases/qwen-code/latest/VERSION" -c "${RUNNER_TEMP}/.ossutilconfig" -f --acl public-read
-
-          latest_version="$(curl -fsSL --connect-timeout 15 --max-time 300 "${ALIYUN_OSS_PUBLIC_BASE_URL}/releases/qwen-code/latest/VERSION" | tr -d '[:space:]')"
-          if [[ "${latest_version}" != "${RELEASE_TAG}" ]]; then
-            echo "::error::Aliyun latest VERSION points to ${latest_version}, expected ${RELEASE_TAG}"
-            exit 1
-          fi
-
-      - name: 'Cleanup Aliyun OSS Credentials'
-        if: |-
-          ${{ always() && needs.prepare.outputs.is_dry_run == 'false' }}
-        run: |-
-          rm -f "${RUNNER_TEMP}/.ossutilconfig"
-
       - name: 'Create PR to merge release branch into main'
         if: |-
           ${{ needs.prepare.outputs.is_dry_run == 'false' && needs.prepare.outputs.is_nightly == 'false' && needs.prepare.outputs.is_preview == 'false' }}