Skip to content

fix(patches): rebase for VS Code 1.145.0 - #124

Merged
sbs44 merged 1 commit into
mainfrom
fix/vscode-1.145.0-patches
Nov 4, 2026
Merged

sbs44 merged 1 commit into
mainfrom
fix/vscode-1.145.0-patches

Conversation

@claude

@claude claude Bot commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

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 only 00-brand-remove-branding; ./dev/dry-apply-patches.sh showed all three.

Patch Upstream change Fix
00-brand-remove-branding Removed the "New Workspace" setup tool (chatSetupProviders.ts) and the topLevelNewWorkspaceChat start entry (gettingStartedContent.ts) Dropped the hunk that rebranded the removed tool; the start-entries hunk now removes only topLevelOpenTunnel
21-policy-use-custom-lib @vscode/policy-watcher 1.6.0 → 1.7.0 Re-targeted the package.json / package-lock.json removals at the new version
51-ext-copilot-remove-it @github/copilot-sdk bumped to a new build; heavy churn in the agent host See below

What changed in 51-ext-copilot-remove-it:

  • Silent-deletion trap: 33 of the 110 files this patch deletes had been edited upstream, so their deletions no longer applied. I re-captured all 33 against the new content. The patch now has 113 deletions.
  • New upstream SDK importers: three new 1.145 files import @github/copilot-sdk or modules this patch deletes, so they are now deleted too: copilotSdkCustomizationDiscovery.integrationTest.ts, copilotSdkNativeAgents.integrationTest.ts and copilotSessionLauncherTestHelpers.ts. Nothing else references them.
  • Stale type alias: upstream's sessionCustomizationDiscovery.ts now calls client.rpc.hooks.discover and client.rpc.mcp.discover. I added both endpoints to our local CopilotClient alias.
  • New SDK-derived type: upstream's copilotCustomizationCommandDisplay.ts now builds ICopilotMcpCommandServer from CopilotSession/CopilotClient SDK types. I replaced it with a local model of the fields invokeCopilotMcpCommand and its tests read.
  • Rebased four edited files (buildSessionEvents.test.ts, copilotToolDisplay.ts, copilotCustomizationCommandDisplay.ts, sessionCustomizationDiscovery.ts) and the package*.json removals for the new SDK version.
  • I rewrote only the drifted sections. Every other section of the patch is unchanged, including its !!APP_NAME!! tokens (42 → 43; the one new token is in a new comment).

Pin: upstream/stable.json is bumped to 1.145.0 / a717861…. I resolved the commit with git ls-remote refs/tags/1.145.0, and it matches the failing run's MS_COMMIT.

Verification

  • ./dev/dry-apply-patches.sh on a clean a717861 tree: 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.
  • Bounded 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 in base/common/async.ts).
  • Import resolution over src/: no surviving import of @github/copilot-sdk or of any deleted module.
  • Not run: --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.

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
@claude
claude Bot requested a review from sbs44 as a code owner November 4, 2026 14:42
@github-actions

github-actions Bot commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

Build green at f120d44 (run). Ready for review — assigned to @sbs44.

@sbs44
sbs44 merged commit 12d9ad4 into main Nov 4, 2026
8 checks passed
@sbs44
sbs44 deleted the fix/vscode-1.145.0-patches branch November 4, 2026 20:25
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