Repository navigation
chore(fork): merge upstream v0.1.5-nightly.20261029.3877 - #14
Merged
Merged
Conversation
…ingdotgg#25816) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…h no list open (pingdotgg#25809) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…saves a draft twice (pingdotgg#25768) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ering (pingdotgg#25846) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rning (pingdotgg#25819) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…first commit (pingdotgg#25817) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rom screen effects (pingdotgg#25820) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#25837) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#25860) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25812) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#25882) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d one (pingdotgg#25839) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s it unavailable (pingdotgg#25632) Co-authored-by: Theo Browne <me@theo.li>
…otgg#25841) Co-authored-by: jason chien <3936511+jason5545@users.noreply.github.com>
…b checks agent-device 0.21.32 folds the iPhone Duo in Simlock's device set. The folded Duo keeps its side rail inside a thread, so the hide-on-push tab checks only apply to bottom tab bars. The Duo poses stay pending: alert accept cannot see the open-link prompt on the Duo. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#25854) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…derive instead of syncing (pingdotgg#25813) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…effects (pingdotgg#25895) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25900) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Theo Browne <me@theo.li>
…ount connects (pingdotgg#25868) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…aint (pingdotgg#25909) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25915) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…wn panel (pingdotgg#25908) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#25920) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dropped (pingdotgg#25916) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25910) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ng (pingdotgg#25903) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…25929) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…6779) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…its usage limit (pingdotgg#26234) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#24937) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#26522) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#26859) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…E-2026-111497) (pingdotgg#26348) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…a thread (pingdotgg#26874) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dits (pingdotgg#26876) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…one step (pingdotgg#26288) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#26910) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… note (pingdotgg#26893) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#26912) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#26917) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s are labeled (pingdotgg#26928) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ts (pingdotgg#26715) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…poser (pingdotgg#26929) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#26932) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Conflicts kept both sides (dictation next to upstream's triage RPC, upstream's required local-environment bridge and renamed queue label). Upstream's simpler composer moved the attach button left, so the dictation button sits beside it. Semantic fixes the textual merge missed, which failed the fork release typecheck: - updateEverything.logic.ts: upstream's channel switch called resolveVersionMismatch, whose import the fork had replaced; it now uses the fork's feed-aware resolveServerConfigVersionMismatch. - ChatComposer.tsx: upstream dropped the resolveShortcutCommand and getTerminalFocusOwner imports the dictation shortcuts use. Upstream's stricter checks: the dictation keydown effect states its reason, and knip now sees the dictation worklet (loaded by URL) and no unused dictation exports. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
github-actions
Bot
added
vouch:trusted
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.
The fork release of upstream v0.1.5-nightly.20261029.3877 failed its typecheck: Claude's CI conflict resolution only edits conflicted files, but
updateEverything.logic.tsmerged cleanly and still broke (upstream added aresolveVersionMismatchcall; the fork had replaced that import).This merges the nightly into
collin/mainby hand:resolveServerConfigVersionMismatch;ChatComposer.tsxgets back theresolveShortcutCommand/getTerminalFocusOwnerimports upstream dropped.Verified:
vp run typecheckin apps/server, apps/desktop, apps/web, packages/contracts;vp run knip:check; tests for updateEverything.logic, versionSkew, KeybindingsSettings.logic, server dictation and ws.Merge with a merge commit or fast-forward only. Squash or rebase drops the upstream parent, and the next sync would conflict on everything again.
🤖 Generated with Claude Code