Repository navigation
fix(patches): rebase for VS Code 1.145.0 - #124
Merged
Merged
Conversation
Upstream 1.145.0 (a717861) broke three patches:
- 00-brand-remove-branding: upstream deleted the "New Workspace" setup
tool and the topLevelNewWorkspaceChat start entry. Drop the hunk that
rebranded the tool and keep only the topLevelOpenTunnel removal.
- 21-policy-use-custom-lib: @vscode/policy-watcher bumped 1.6.0 -> 1.7.0;
re-target the package.json/package-lock.json removals.
- 51-ext-copilot-remove-it: @github/copilot-sdk bumped to a new build;
33 deleted agent-host files drifted (re-captured as deletions); four
edited files rebased. Also:
* delete three new upstream SDK-dependent files
(copilotSdkCustomizationDiscovery/copilotSdkNativeAgents integration
tests and copilotSessionLauncherTestHelpers);
* extend the local CopilotClient alias in sessionCustomizationDiscovery
with the hooks/mcp discover endpoints upstream now calls;
* model ICopilotMcpCommandServer locally in
copilotCustomizationCommandDisplay (upstream now derives it from
CopilotSession/CopilotClient SDK types).
Bump upstream/stable.json to 1.145.0 (git tag commit a717861).
Refs #123
Contributor
sbs44
approved these changes
Nov 4, 2026
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
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.
Fixes the 1.145.0 build failure from run https://github.com/bradford-tech/code/actions/runs/41845290159 (attempt 1/5).
Refs #123
Root cause
Upstream 1.145.0 (
a717861c07586a53d83b80d742cd3f59b20a6273) drifted under three patches. The build log named only00-brand-remove-branding;./dev/dry-apply-patches.shshowed all three.00-brand-remove-brandingchatSetupProviders.ts) and thetopLevelNewWorkspaceChatstart entry (gettingStartedContent.ts)topLevelOpenTunnel21-policy-use-custom-lib@vscode/policy-watcher1.6.0 → 1.7.0package.json/package-lock.jsonremovals at the new version51-ext-copilot-remove-it@github/copilot-sdkbumped to a new build; heavy churn in the agent hostWhat changed in
51-ext-copilot-remove-it:@github/copilot-sdkor modules this patch deletes, so they are now deleted too:copilotSdkCustomizationDiscovery.integrationTest.ts,copilotSdkNativeAgents.integrationTest.tsandcopilotSessionLauncherTestHelpers.ts. Nothing else references them.sessionCustomizationDiscovery.tsnow callsclient.rpc.hooks.discoverandclient.rpc.mcp.discover. I added both endpoints to our localCopilotClientalias.copilotCustomizationCommandDisplay.tsnow buildsICopilotMcpCommandServerfromCopilotSession/CopilotClientSDK types. I replaced it with a local model of the fieldsinvokeCopilotMcpCommandand its tests read.buildSessionEvents.test.ts,copilotToolDisplay.ts,copilotCustomizationCommandDisplay.ts,sessionCustomizationDiscovery.ts) and thepackage*.jsonremovals for the new SDK version.!!APP_NAME!!tokens (42 → 43; the one new token is in a new comment).Pin:
upstream/stable.jsonis bumped to1.145.0/a717861…. I resolved the commit withgit ls-remote refs/tags/1.145.0, and it matches the failing run'sMS_COMMIT.Verification
./dev/dry-apply-patches.shon a cleana717861tree: all patches apply cleanly.CI_BUILD=yes ./dev/ci-verify.sh --commit a717861c07586a53d83b80d742cd3f59b20a6273: PASS (compile, tag 1.145.0).compile-src src/tsconfig.json with 0 errors,compilation with 0 errors.tsc6 --noEmit(the JS compiler the build mode uses) over the five hand-edited or affected files: no errors in those files. The only errors are the usual narrow-program noise (TS2741 inbase/common/async.ts).src/: no surviving import of@github/copilot-sdkor of any deleted module.--full(vscode-min-prepack). This runner has 7 GB of RAM, and the playbook notes it OOMs below ~8 GB. This PR's CI build is the first full prepack/packaging run.