chore(release): v0.6.0-preview.2

.github/workflows/release-sdk.yml

@@ -34,8 +34,7 @@ on:
         default: false
 
 concurrency:
-  # Serialize all release workflows (CLI + SDK) to avoid racing on `main` pushes.
-  group: 'release-main'
+  group: '${{ github.workflow }}'
   cancel-in-progress: false
 
 jobs:
@@ -51,6 +50,7 @@ jobs:
       packages: 'write'
       id-token: 'write'
       issues: 'write'
+      pull-requests: 'write'
     outputs:
       RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
 
@@ -128,13 +128,12 @@ jobs:
           IS_PREVIEW: '${{ steps.vars.outputs.is_preview }}'
           MANUAL_VERSION: '${{ inputs.version }}'
 
-      - name: 'Set SDK package version'
+      - name: 'Set SDK package version (local only)'
         env:
           RELEASE_VERSION: '${{ steps.version.outputs.RELEASE_VERSION }}'
         run: |-
           # Ensure the package version matches the computed release version.
           # This is required for nightly/preview because npm does not allow re-publishing the same version.
-          # Using --no-git-tag-version because we create tags via GitHub Release, not npm.
           npm version -w @qwen-code/sdk "${RELEASE_VERSION}" --no-git-tag-version --allow-same-version
 
       - name: 'Build CLI Bundle'
@@ -169,40 +168,37 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: 'Create and switch to a release branch (stable only)'
+      - name: 'Build SDK'
+        working-directory: 'packages/sdk-typescript'
+        run: |-
+          npm run build
+
+      - name: 'Publish @qwen-code/sdk'
+        working-directory: 'packages/sdk-typescript'
+        run: |-
+          npm publish --access public --tag=${{ steps.version.outputs.NPM_TAG }} ${{ steps.vars.outputs.is_dry_run == 'true' && '--dry-run' || '' }}
+        env:
+          NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
+
+      - name: 'Create and switch to a release branch'
         if: |-
           ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
         id: 'release_branch'
         env:
           RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
         run: |-
-          set -euo pipefail
           BRANCH_NAME="release/sdk-typescript/${RELEASE_TAG}"
-
-          # Make reruns idempotent: reuse an existing remote branch if it already exists.
-          if git show-ref --verify --quiet "refs/heads/${BRANCH_NAME}"; then
-            git switch "${BRANCH_NAME}"
-          elif git ls-remote --exit-code --heads origin "${BRANCH_NAME}" >/dev/null 2>&1; then
-            git fetch origin "${BRANCH_NAME}:${BRANCH_NAME}"
-            git switch "${BRANCH_NAME}"
-          else
-            git switch -c "${BRANCH_NAME}"
-          fi
-
+          git switch -c "${BRANCH_NAME}"
           echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}"
 
-      - name: 'Build SDK'
-        working-directory: 'packages/sdk-typescript'
-        run: |-
-          npm run build
-
-      - name: 'Commit and Push package version to release branch (stable only)'
+      - name: 'Commit and Push package version (stable only)'
         if: |-
           ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
         env:
           BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
           RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
         run: |-
+          # Only persist version bumps after a successful publish.
           git add packages/sdk-typescript/package.json package-lock.json
           if git diff --staged --quiet; then
             echo "No version changes to commit"
@@ -212,47 +208,9 @@ jobs:
           echo "Pushing release branch to remote..."
           git push --set-upstream origin "${BRANCH_NAME}" --follow-tags
 
-      - name: 'Check if @qwen-code/sdk version is already published (rerun safety)'
-        id: 'npm_check'
-        env:
-          RELEASE_VERSION: '${{ steps.version.outputs.RELEASE_VERSION }}'
-        run: |-
-          set -euo pipefail
-          if npm view "@qwen-code/sdk@${RELEASE_VERSION}" version >/dev/null 2>&1; then
-            echo "already_published=true" >> "${GITHUB_OUTPUT}"
-            echo "@qwen-code/sdk@${RELEASE_VERSION} already exists on npm."
-          else
-            echo "already_published=false" >> "${GITHUB_OUTPUT}"
-          fi
-
-      - name: 'Publish @qwen-code/sdk'
-        working-directory: 'packages/sdk-typescript'
-        if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'true' || steps.npm_check.outputs.already_published != 'true' }}
-        run: |-
-          npm publish --access public --tag=${{ steps.version.outputs.NPM_TAG }} ${{ steps.vars.outputs.is_dry_run == 'true' && '--dry-run' || '' }}
-        env:
-          NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
-
-      - name: 'Check if GitHub Release already exists (rerun safety)'
-        if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'false' }}
-        id: 'gh_release_check'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
-        run: |-
-          set -euo pipefail
-          if gh release view "sdk-typescript-${RELEASE_TAG}" >/dev/null 2>&1; then
-            echo "already_exists=true" >> "${GITHUB_OUTPUT}"
-            echo "GitHub Release sdk-typescript-${RELEASE_TAG} already exists."
-          else
-            echo "already_exists=false" >> "${GITHUB_OUTPUT}"
-          fi
-
       - name: 'Create GitHub Release and Tag'
         if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'false' && steps.gh_release_check.outputs.already_exists != 'true' }}
+          ${{ steps.vars.outputs.is_dry_run == 'false' }}
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
           RELEASE_BRANCH: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
@@ -278,26 +236,48 @@ jobs:
             --generate-notes \
             ${PRERELEASE_FLAG}
 
-      - name: 'Merge release changes back to main'
+      - name: 'Create PR to merge release branch into main'
+        if: |-
+          ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
+        id: 'pr'
+        env:
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          RELEASE_BRANCH: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
+          RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
+        run: |-
+          set -euo pipefail
+
+          pr_url="$(gh pr list --head "${RELEASE_BRANCH}" --base main --json url --jq '.[0].url')"
+          if [[ -z "${pr_url}" ]]; then
+            pr_url="$(gh pr create \
+              --base main \
+              --head "${RELEASE_BRANCH}" \
+              --title "chore(release): sdk-typescript ${RELEASE_TAG}" \
+              --body "Automated release PR for sdk-typescript ${RELEASE_TAG}.")"
+          fi
+
+          echo "PR_URL=${pr_url}" >> "${GITHUB_OUTPUT}"
+
+      - name: 'Wait for CI checks to complete'
         if: |-
           ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
-          RELEASE_BRANCH: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
+          PR_URL: '${{ steps.pr.outputs.PR_URL }}'
         run: |-
-          # Checkout main branch
-          git fetch origin main
-          git checkout main
-          git pull origin main
+          set -euo pipefail
+          echo "Waiting for CI checks to complete..."
+          gh pr checks "${PR_URL}" --watch --interval 30
 
-          # Only fast-forward merge back to main.
-          # Purpose: avoid creating silent merge commits in an automated workflow (no PR review),
-          # and fail loudly when history has diverged so a human can resolve it.
-          git merge "${RELEASE_BRANCH}" --ff-only
-
-          # Push changes
-          git push origin main
+      - name: 'Enable auto-merge for release PR'
+        if: |-
+          ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
+        env:
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          PR_URL: '${{ steps.pr.outputs.PR_URL }}'
+        run: |-
+          set -euo pipefail
+          gh pr merge "${PR_URL}" --merge --auto
 
       - name: 'Create Issue on Failure'
         if: |-

.github/workflows/release.yml

@@ -38,11 +38,6 @@ on:
         type: 'boolean'
         default: false
 
-concurrency:
-  # Serialize all release workflows (CLI + SDK) to avoid racing on `main` pushes.
-  group: 'release-main'
-  cancel-in-progress: false
-
 jobs:
   release:
     runs-on: 'ubuntu-latest'
@@ -155,19 +150,8 @@ jobs:
         env:
           RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
         run: |-
-          set -euo pipefail
           BRANCH_NAME="release/${RELEASE_TAG}"
-
-          # Make reruns idempotent: reuse an existing remote branch if it already exists.
-          if git show-ref --verify --quiet "refs/heads/${BRANCH_NAME}"; then
-            git switch "${BRANCH_NAME}"
-          elif git ls-remote --exit-code --heads origin "${BRANCH_NAME}" >/dev/null 2>&1; then
-            git fetch origin "${BRANCH_NAME}:${BRANCH_NAME}"
-            git switch "${BRANCH_NAME}"
-          else
-            git switch -c "${BRANCH_NAME}"
-          fi
-
+          git switch -c "${BRANCH_NAME}"
           echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}"
 
       - name: 'Update package versions'
@@ -207,47 +191,16 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
           scope: '@qwen-code'
 
-      - name: 'Check if @qwen-code/qwen-code version is already published (rerun safety)'
-        id: 'npm_check'
-        env:
-          RELEASE_VERSION: '${{ steps.version.outputs.RELEASE_VERSION }}'
-        run: |-
-          set -euo pipefail
-          if npm view "@qwen-code/qwen-code@${RELEASE_VERSION}" version >/dev/null 2>&1; then
-            echo "already_published=true" >> "${GITHUB_OUTPUT}"
-            echo "@qwen-code/qwen-code@${RELEASE_VERSION} already exists on npm."
-          else
-            echo "already_published=false" >> "${GITHUB_OUTPUT}"
-          fi
-
       - name: 'Publish @qwen-code/qwen-code'
         working-directory: 'dist'
-        if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'true' || steps.npm_check.outputs.already_published != 'true' }}
         run: |-
           npm publish --access public --tag=${{ steps.version.outputs.NPM_TAG }} ${{ steps.vars.outputs.is_dry_run == 'true' && '--dry-run' || '' }}
         env:
           NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
 
-      - name: 'Check if GitHub Release already exists (rerun safety)'
-        if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'false' }}
-        id: 'gh_release_check'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
-        run: |-
-          set -euo pipefail
-          if gh release view "${RELEASE_TAG}" >/dev/null 2>&1; then
-            echo "already_exists=true" >> "${GITHUB_OUTPUT}"
-            echo "GitHub Release ${RELEASE_TAG} already exists."
-          else
-            echo "already_exists=false" >> "${GITHUB_OUTPUT}"
-          fi
-
       - name: 'Create GitHub Release and Tag'
         if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'false' && steps.gh_release_check.outputs.already_exists != 'true' }}
+          ${{ steps.vars.outputs.is_dry_run == 'false' }}
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
           RELEASE_BRANCH: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
@@ -261,33 +214,12 @@ jobs:
             --notes-start-tag "$PREVIOUS_RELEASE_TAG" \
             --generate-notes
 
-      - name: 'Merge release changes back to main'
-        if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
-          RELEASE_BRANCH: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
-        run: |-
-          # Checkout main branch
-          git fetch origin main
-          git checkout main
-          git pull origin main
-
-          # Only fast-forward merge back to main.
-          # Purpose: avoid creating silent merge commits in an automated workflow (no PR review),
-          # and fail loudly when history has diverged so a human can resolve it.
-          git merge "${RELEASE_BRANCH}" --ff-only
-
-          # Push changes
-          git push origin main
-
       - name: 'Create Issue on Failure'
         if: |-
           ${{ failure() }}
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: "${{ steps.version.outputs.RELEASE_TAG || 'N/A' }}"
+          RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }} || "N/A"'
           DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
         run: |-
           gh issue create \

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.6.0",
+  "version": "0.6.0-preview.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@qwen-code/qwen-code",
-      "version": "0.6.0",
+      "version": "0.6.0-preview.2",
       "workspaces": [
         "packages/*"
       ],
@@ -17316,7 +17316,7 @@
     },
     "packages/cli": {
       "name": "@qwen-code/qwen-code",
-      "version": "0.6.0",
+      "version": "0.6.0-preview.2",
       "dependencies": {
         "@google/genai": "1.30.0",
         "@iarna/toml": "^2.2.5",
@@ -17953,7 +17953,7 @@
     },
     "packages/core": {
       "name": "@qwen-code/qwen-code-core",
-      "version": "0.6.0",
+      "version": "0.6.0-preview.2",
       "hasInstallScript": true,
       "dependencies": {
         "@anthropic-ai/sdk": "^0.36.1",
@@ -21413,7 +21413,7 @@
     },
     "packages/test-utils": {
       "name": "@qwen-code/qwen-code-test-utils",
-      "version": "0.6.0",
+      "version": "0.6.0-preview.2",
       "dev": true,
       "license": "Apache-2.0",
       "devDependencies": {
@@ -21425,7 +21425,7 @@
     },
     "packages/vscode-ide-companion": {
       "name": "qwen-code-vscode-ide-companion",
-      "version": "0.6.0",
+      "version": "0.6.0-preview.2",
       "license": "LICENSE",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.25.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.6.0",
+  "version": "0.6.0-preview.2",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/QwenLM/qwen-code.git"
   },
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0-preview.2"
   },
   "scripts": {
     "start": "cross-env node scripts/start.js",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.6.0",
+  "version": "0.6.0-preview.2",
   "description": "Qwen Code",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0-preview.2"
   },
   "dependencies": {
     "@google/genai": "1.30.0",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code-core",
-  "version": "0.6.0",
+  "version": "0.6.0-preview.2",
   "description": "Qwen Code Core",
   "repository": {
     "type": "git",

packages/sdk-typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/sdk",
-  "version": "0.1.1",
+  "version": "0.1.0",
   "description": "TypeScript SDK for programmatic access to qwen-code CLI",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

packages/test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code-test-utils",
-  "version": "0.6.0",
+  "version": "0.6.0-preview.2",
   "private": true,
   "main": "src/index.ts",
   "license": "Apache-2.0",

packages/vscode-ide-companion/package.json

@@ -2,7 +2,7 @@
   "name": "qwen-code-vscode-ide-companion",
   "displayName": "Qwen Code Companion",
   "description": "Enable Qwen Code with direct access to your VS Code workspace.",
-  "version": "0.6.0",
+  "version": "0.6.0-preview.2",
   "publisher": "qwenlm",
   "icon": "assets/icon.png",
   "repository": {