Skip to content

fix(fork): merge upstream d06ba27 into patch/full-access-never-asks - #264

Merged
fireboltdude1357 merged 2066 commits into
patch/full-access-never-asksfrom
fix/full-access-never-asks-upstream-d06ba27
Nov 13, 2026
Merged

fireboltdude1357 merged 2066 commits into
patch/full-access-never-asksfrom
fix/full-access-never-asks-upstream-d06ba27

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/full-access-never-asks conflicts with upstream d06ba27 in ClaudeAdapterV2.test.ts.

Upstream pingdotgg#35993 removes Effect.scoped wrappers that @effect/vitest already applies, which shifts whole test bodies by one indent level. The only conflict was those shifted lines against the patch's edits to the same test. I merged with -Xignore-space-change and ran vp fmt on ClaudeAdapterV2.ts and its test. Against upstream, each file now differs by exactly the patch's own change: 23 lines added and 28 removed in the adapter, 82 added and 178 removed in the test. The patch's removal of fullAccessOverride, which was already in its base, is unchanged.

On a scratch stack of upstream d06ba27 with all 26 patches and both fix branches, pnpm install --no-frozen-lockfile, vp run typecheck (41 of 41) and vp test run on the 49 test files the patches touch (1374 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 12, 2026 11:56
…35565)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#32302)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ping each key (pingdotgg#35581)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…card (pingdotgg#31115)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…t pull (pingdotgg#26568)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…after a full scan (pingdotgg#33993)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ls (pingdotgg#27928)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rrow viewports (pingdotgg#29288)

Co-authored-by: imluckii <imluckii@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…1723)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
…in worktrees (pingdotgg#33923)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…its for its status read (pingdotgg#33877)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…r (median 7,826 to 3,168 ms) (pingdotgg#33954)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#33858)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ly (pingdotgg#33896)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…worktrees (pingdotgg#33908)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 29 commits November 12, 2026 19:54
… slow (pingdotgg#26127)

Co-authored-by: Elliot Drel <elliotdrel@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fireboltdude1357
fireboltdude1357 merged commit 8ff9082 into patch/full-access-never-asks Nov 13, 2026
4 checks passed
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.