Skip to content

chore: sync desktop updates from qwen-code#3

Merged
DragonnZhang merged 7 commits into
mainfrom
chore/sync-openwork-desktop-commit-migrate-20260606
Jun 8, 2026
Merged

chore: sync desktop updates from qwen-code#3
DragonnZhang merged 7 commits into
mainfrom
chore/sync-openwork-desktop-commit-migrate-20260606

Conversation

@DragonnZhang

Copy link
Copy Markdown
Collaborator

What this PR does

This migrates the latest desktop updates from qwen-code into OpenWork as a commit-by-commit patch sync. It brings over the floating pet companion, centralized brand configuration, OpenWork brand rename, Dock icon fixes, floating pet control improvements, and permanent worktree project support while preserving OpenWork-owned repository files.

Why it's needed

qwen-code is now carrying active desktop maintenance, and OpenWork needs the same desktop behavior without replacing repository-specific files. This PR keeps OpenWork current while avoiding the earlier full-tree overwrite behavior that reverted OpenWork metadata.

Reviewer Test Plan

How to verify

Review the seven migrated commits and confirm OpenWork still keeps its repository-specific overlay files. In particular, README.md and .github/ISSUE_TEMPLATE/bug_report.yml should have no diff from main, and the bug report template should still say OpenWork Version. Launch or build validation can be done through the existing OpenWork desktop workflow if desired.

Evidence (Before & After)

Local verification:

  • git rev-list --left-right --count main...HEAD -> 0 7
  • git diff --name-only main..HEAD -- README.md .github/ISSUE_TEMPLATE/bug_report.yml -> no output
  • git diff --check main..HEAD -> no output

Tested on

OS Status
macOS sync verified
Windows not tested
Linux not tested

Environment (optional)

Local sync verification on macOS using the OpenWork checkout at /Users/dragon/Documents/openwork.

Risk & Scope

  • Main risk or tradeoff: The PR carries desktop feature changes without a full application build in this local validation pass.
  • Not validated / out of scope: Release packaging, cross-platform installer validation, and runtime UI smoke testing.
  • Breaking changes / migration notes: None expected from the sync itself.

Linked Issues

N/A

OpenWork-Sync-Mode: export
Qwen-Code-Base: 053cf453dc963e982fbdac5163bc5509a297e5f4
Qwen-Code-Commit: 7295a1b2ff1e6c5ddcf44363f550ec5e34a29565
OpenWork-Base: da290c7
OpenWork-Sync-Mode: export

Qwen-Code-Base: 7295a1b2ff1e6c5ddcf44363f550ec5e34a29565

Qwen-Code-Commit: 076d6b519ad1242d7779304447e4c61c74ed9590

OpenWork-Base: da290c7
OpenWork-Sync-Mode: export
Qwen-Code-Base: 076d6b519ad1242d7779304447e4c61c74ed9590
Qwen-Code-Commit: d39b6b983e8c730dc499a04f03e45c31f9e2d168
OpenWork-Base: da290c7
…orkspaces

OpenWork-Sync-Mode: export
Qwen-Code-Base: d39b6b983e8c730dc499a04f03e45c31f9e2d168
Qwen-Code-Commit: 37e8a6edfda4a077114b0a40d300b9c60a60ba9b
OpenWork-Base: da290c7
OpenWork-Sync-Mode: export
Qwen-Code-Base: 37e8a6edfda4a077114b0a40d300b9c60a60ba9b
Qwen-Code-Commit: 2419040d59cafdd75dd0ec3b7c8d848dd33dce97
OpenWork-Base: da290c7
OpenWork-Sync-Mode: export
Qwen-Code-Base: 2419040d59cafdd75dd0ec3b7c8d848dd33dce97
Qwen-Code-Commit: 3a99bb3f6d164093a482cb146f868e2527c5e356
OpenWork-Base: da290c7
OpenWork-Sync-Mode: export
Qwen-Code-Base: 3a99bb3f6d164093a482cb146f868e2527c5e356
Qwen-Code-Commit: 3968e6dc6b3de8901026ce6b0f32d32793e9ba66
OpenWork-Base: da290c7
@DragonnZhang DragonnZhang merged commit 9f4a1c0 into main Jun 8, 2026
1 check passed
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.

1 participant