fix(patches): rebase 9 patches for VS Code 1.132.0 - #38
Merged
Conversation
Upstream drift 1.126.0 → 1.132.0 broke 10 of 36 patches (12-update-add-cooldown was cascade-only). Notable ports beyond context re-rolls: - 11-update-use-github-release: merged upstream's mid-check cancellation machinery (checkCancellationTokenSource) and collectGarbage/getWin32UpdateType refactors with the GitHub-release update flow. - 21-policy-use-custom-lib: CopilotManagedSettingsService was renamed upstream to NativeManagedSettingsService; re-ported the @vscodium/policy-watcher vendor-name adapter there. - 51-ext-copilot-remove-it: upstream added new @github/copilot-sdk consumers; shimmed type-only imports (GitHubTelemetryNotification, SectionOverride, SessionEvent, SessionFs*, CopilotClient) and deleted three tests that import SDK runtime values or removed modules. Pins upstream/stable.json at 1.132.0 (df53daab).
Caught by a local build's compile-src typecheck (tsgo), which CI would have
hit the same way:
- Keep copilotTokenFields.ts (import-free) and copilotSystemNotification.ts
(type-only SDK imports, now shimmed) instead of deleting them — new 1.132.0
code in copilotApiService.ts and mapSessionEvents.ts imports both.
- sessionCustomizationDiscovery: tsgo infers unknown (not any) through
raceCancellationError for Promise<any>, so the CopilotClient shim now models
concrete result shapes ({ paths }, { agents }, { sources }, { skills }).
- SessionEventPayload aliases are generic (used as SessionEventPayload<'...'>).
- softAssertNever(kind as never) — any is not assignable to never under tsgo.
src/tsconfig.json now typechecks clean against the full patched tree.
Upstream's build/npm/preinstall.ts now requires Node >= 24.18.0; matches upstream's own .nvmrc at the pinned commit.
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
1 participant
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.
Upstream drift 1.126.0 → 1.132.0 broke 10 of 36 patches (12-update-add-cooldown was cascade-only). Notable ports beyond context re-rolls:
Pins upstream/stable.json at 1.132.0 (df53daab).
Also bumps .nvmrc to 24.18.0 (upstream's preinstall now requires >= 24.18.0) and fixes 10 tsgo typecheck errors found by a local build of the patched tree.
Refs #37
Closes #37