Merge #633: workbench market failure status (conflicts resolved) - #644
Merged
Merged
Conversation
- src/main/index.ts: keep both desktop-startup-install and workbench-market-recovery imports. - workbenches client.js: keep sortMarketEntries (main) and FailureHint (#633); combine local removal status (#635) with stale-record removal (#633) so the uninstall button honours both. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
Carries #633 onto current main. The fork branch does not allow maintainer edits, so conflicts are resolved here; merging this marks #633 as merged.
Conflict resolution:
src/main/index.ts: keep bothinitializeDesktopInstall(Fix first-run onboarding classification before startup #634) andforgetRemovedWorkbenchMarketInstall(Fix workbench market failure status and error details #633) imports.packages/dsh-desktop-workbenches/client.js: keepsortMarketEntries(main) andFailureHint(Fix workbench market failure status and error details #633); combine local removal status (fix: show local workbenches in sidebar and explain uninstall state #635) with stale-record removal (Fix workbench market failure status and error details #633) —canUninstall = staleRecord || (local ? localRemoval.removable : …), and the button label/title useremovalLabelwhile keeping the local reason fallback.Checks run locally:
npx vitest runworkbench client/market-install/market-recovery/navigation/state + desktop-startup-install: 219 passednpm run typecheck: passednpm test: 1588 passed, 1 failed (test/ppt-personal-template-ui.test.mjs, untouched here; passes 13/13 when run alone twice — load-related flake)git diff --check: cleanNot verified: real app / UI acceptance of the workbench market.
🤖 Generated with Claude Code