merge: integrate upstream desktop v0.2.1 baseline - #38
Merged
Conversation
…efine#787) * fix(desktop): expose explicit backup capabilities * fix(desktop): align titlebar controls with native metrics * release(desktop): prepare portable v0.2.1 * build(desktop): rebuild compiled dist from source 4a67226 Rebuild the compiled-only React Desktop 2.0 renderer from abraxas914/GenericAgent main @4a67226, carrying the v0.2.1 iterations that PR lsdefine#784 was closed to await: live turn-timer persistence across session switch, Mixin image-to-path fallback, folder drag-drop, per-turn duration, and image-thumbnail repair. - dist/**: regenerated 98 manifest assets + entry HTML - build-provenance.json: sourceCommit -> 4a67226, manifest sha256 recomputed - verify-compiled-dist.mjs: expectedSourceCommit -> 4a67226 - dist/README.md: provenance source commit updated - desktop_bridge.py, test_bridge_origin_security.py: synced to 4a67226 - core (agentmain.py, llmcore*, src/**, public/**) remains zero-diff vs upstream --------- Co-authored-by: abraxas914 <abraxas345589144233@outlook.com>
Preserve the fork React source and test superset while recording upstream lsdefine#787 ancestry. Keep the stale compiled renderer out of the source fork and document the release boundary.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
lsdefine/main@efb3bc6/ PR feat(desktop): compiled React Desktop 2.0 v0.2.1 renderer update lsdefine/GenericAgent#787 into the fork historydist@4a67226out of the source fork because it predates fork PR feat(desktop): integrate session state and attachment drag flows #36needless_returnwarnings so all-target/all-feature Clippy passes with-D warningsIntegration decision
The fork already contains every non-dist runtime, bridge, Tauri, security, version, and packaging capability delivered by upstream lsdefine#787, plus later source work. The merge therefore records upstream ancestry while resolving compiled-only/source-tree conflicts in favor of the fork source superset. A future upstream compiled delivery must be rebuilt from the accepted fork
mainSHA rather than reusing the older4a67226renderer.Validation
pwshwarning--all-targets --all-features -D warningspassedFull report:
docs/desktop-upstream-787-integration-report-zh.md