Skip to content

🔄 Sync with upstream Qwen Code#10

Closed
davipeterlini wants to merge 144 commits intomainfrom
merge-back
Closed

🔄 Sync with upstream Qwen Code#10
davipeterlini wants to merge 144 commits intomainfrom
merge-back

Conversation

@davipeterlini
Copy link
Copy Markdown
Owner

🔄 Sync with Upstream Repository

This PR syncs the latest changes from the official Qwen Code repository.

📊 Changes Summary

⚠️ Manual Steps Required

Before merging this PR, please:

  1. Review conflicts: Check if there are any merge conflicts with our custom changes
  2. Test locally: Pull the merge-back branch and test the application
    git fetch origin merge-back
    git checkout merge-back
    npm install
    npm run build
    npm test
  3. Verify custom features: Ensure our custom implementations still work:
    • ESC to restore prompt feature
    • SuperClaude features (agents, intelligence, planning, robustness)
    • Custom workflows and examples
    • Documentation updates
  4. Update dependencies: Check if any dependencies need updates
  5. Run full test suite: Ensure all tests pass
    npm run test:all
    npm run lint

🔗 References

📝 Merge Instructions

After verifying everything:

  1. Resolve any conflicts manually
  2. Update the changelog if needed
  3. Merge this PR using merge commit (not squash) to preserve upstream history

🤖 This PR was automatically created by the sync-upstream workflow.

LaZzyMan and others added 30 commits January 26, 2026 15:17
…n matching

Fixes QwenLM#1760

Windows file system is case-insensitive (e:\work equals E:\work),
but string hashing is case-sensitive, causing different session
directories for the same physical path.

Solution: normalize paths to lowercase on Windows before hashing
to ensure consistent session directory across different case variations.
Ensures consistent Windows path normalization across all path hashing.
Previously Storage used its own getFilePathHash() which didn't apply
Windows lowercase normalization, causing test failures on Windows CI.
- Add HTML template for insights display.
- Create JavaScript application logic for rendering insights.
- Introduce CSS styles for layout and design.
- Develop a test generator for validating the static insight generator.
- Define TypeScript interfaces for structured insight data.
- Refactor insight command to generate insights and open in browser.
- Remove the need for a server process by generating static files directly.
- Refine DataProcessor and StaticInsightGenerator logic
- Update StaticInsightTypes definitions
- Enhance insight command implementation
- Update package dependencies
qwen-code-ci-bot and others added 28 commits February 26, 2026 14:43
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
…tching

- Merge coder-model and qwen3.5-plus into a single coder-model with vision capability
- Remove vlmSwitchMode CLI argument and experimental.vlmSwitchMode setting
- Remove useVisionAutoSwitch hook and inline image format checking into useGeminiStream
- Remove ModelSwitchDialog and related vision switch UI components
- Update all related tests to reflect the simplified model structure
- Set DEFAULT_QWEN_MODEL to coder-model

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
- Single-line layout with muted bar, accent stage text
- Inline

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>... in stage messages for cleaner code
- Simplify command intro text
- 将 ModelDialog.test.tsx 中的 MAINLINE_CODER_MODEL 替换为 DEFAULT_QWEN_MODEL
- 修复 modelConfigResolver.test.ts 中 OpenAI auth 类型的默认模型期望
- 统一使用 core 包导出的 MAINLINE_CODER_MODEL 常量

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
- Add backupSettingsFile() utility to create .orig backup before modifying settings
- Update success message to indicate backup was created
- Sync i18n translations for all supported languages
- Update documentation to reflect the change

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Moves export-html and insight templates from cli/assets to a new
dedicated web-templates package. Updates Dockerfile and build scripts
to use consolidated bundle/prepare:package/pack workflow.

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
- Remove unused npmCommand variable from build.mjs
- Add no-undef and .mjs file support to web-templates eslint config

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
feat: Add insight command for personalized programming insights
The test 'blocks write tools in plan mode' was failing because the model
would attempt to exit plan mode via exit_plan_mode tool. By cancelling
switch_mode tool calls in the permission handler, we ensure plan mode
stays active throughout the test.

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
fix(test): keep plan mode active during ACP integration test
- Update integration test environment variable name
- Ensure sandbox container naming works correctly with new variable

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
- Corrected the file path in commands.md mapping table from
  '<project>/commands/git/commit.md' to '<project>/.qwen/commands/git/commit.md'
- Removed trailing blank line in sandbox.md code block

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
docs: fix documentation errors in commands and model-providers

- 测试通过 `<project>/git/commit.md` → `<project>/.qwen/commands/git/commit.md)`
- 修复 develoers/sandbox 文档格式显示问题,代码块显示混乱
Merge coder-model and qwen3.5-plus, remove vision auto-switching
Rename GEMINI_CLI_INTEGRATION_TEST to QWEN_CODE_INTEGRATION_TEST and refactor sandbox user handling
feat(auth): add automatic backup of settings.json before auth modification
…eFolders-capability

fix: change workspaceFolders capability to boolean for LSP servers
…e-pr

fix: unblock input after ESC cancel
Upstream workflows are removed to avoid permission issues when pushing the merge-back branch. Only sync-upstream.yml is kept.

Co-Authored-By: GitHub Actions <github-actions[bot]@users.noreply.github.com>
@davipeterlini davipeterlini deleted the merge-back branch March 2, 2026 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.