Repository navigation
merge: Phase B upstream sync through v0.1.6-nightly.20261030.3940 - #343
Merged
Merged
Conversation
…otgg#26343) 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>
…dotgg#26366) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#26371) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…#26375) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ng changed (pingdotgg#26362) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#26387) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…Chat (pingdotgg#26369) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…om (pingdotgg#26392) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#26391) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#26395) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rom custom snooze (pingdotgg#26427) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ywhere (pingdotgg#26432) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…o collapsed state (pingdotgg#25869) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… new links in settings (pingdotgg#26434) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nse templates (pingdotgg#26440) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…call (pingdotgg#26442) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ws only dead models (pingdotgg#26448) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… cut off (pingdotgg#26449) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#27513) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: GPT 6.1 Sol <codex@openai.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: GPT 6.1 Sol <codex@openai.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: GPT 6.1 Sol <codex@openai.com>
…ingdotgg#27521) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: GPT 6.1 Sol <codex@openai.com>
…rces (pingdotgg#27539) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: GPT 6.1 Sol <codex@openai.com>
…tions removed (pingdotgg#21757) Co-authored-by: Pipyakas <pipyakas@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…abs again (pingdotgg#19456) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Max Nylander <jztmanyl@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…f parsing again (pingdotgg#27480) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…put (pingdotgg#27685) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…repository (pingdotgg#24350) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d with a Windows host (pingdotgg#19066) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ollers skip work (pingdotgg#27711) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Phase B sync from 49a9e80 through v0.1.6-nightly.20261030.3940 (ae521d1) and upstream tip 9b1d351. Keeps fork release workflows, packaged update-channel ownership, and shuv1337/s2code identity. Takes upstream settlement, settings, contracts, and the CI job graph on GitHub-hosted runners. Co-authored-by: shuv <shuv1337@users.noreply.github.com>
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
Restore the desktop installed-channel row, point EAS steps at the preview and production Expo secrets, drop the deleted preview-bundle check, and rebrand the new protect and preflight copy. Co-authored-by: shuv <shuv1337@users.noreply.github.com>
Desktop updates stay on separate installations. Fork preview deploys only publish an OTA when mobile updates are enabled. Co-authored-by: shuv <shuv1337@users.noreply.github.com>
shuv1337
added
the
agent-context-increase
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.
Problem
The fork last absorbed upstream at
49a9e80e0. Upstreammainhas since moved through thev0.1.6-nightly.20261030.3940nightly and two commits past it. This PR merges that range in. It does not merge, release, or deploy.Change
Merge (not rebase) of
upstream/maininto the fork.8a033729c2e2d8e08715f680889604314fe8182b(merge of fix(auth): cherry-pick upstream OpenCode password and pairing-code fixes #342)49a9e80e0b30e3012412bcc564bb5e52e09d1c1dv0.1.6-nightly.20261030.3940:ae521d1d796c4e21abb49e44d27c23332d1898b9(ancestor of upstream tip)9b1d351ba0f63f527f884ffb3f2e394f50388764711a45fdfa. Review follow-ups:c6de85a303,833887a647.Packaged desktop builds still refuse to leave the channel baked into the version. Servers refuse a cross-channel update with the separate-installation message. Desktop Settings shows a read-only Installed channel row. The hosted app keeps its channel select.
Review fixes, round 2 (
833887a647)MOBILE_UPDATES_ENABLEDis not1, and only publish the fingerprint OTA when it is.awaitsTrackSwitch, and thechannelSwitchargument. Nothing recommendsupdate --channel.t3-code-for-github, because this fork has no replacement app.s2code updateexact-version errors say s2code.Agent context budget was not changed.
Conflict resolutions
.github/workflows/ci.ymlci-full.ymlwith GitHub-hosted runners. The deleted preview-bundle test step was removed..github/workflows/deploy-relay.yml.github/workflows/desktop-macos-preview-publish.yml.github/workflows/mobile-eas-preview.ymlsecrets.EXPO_PREVIEW_TOKEN. OTA only whenMOBILE_UPDATES_ENABLEDis1..github/workflows/mobile-eas-preview-fork.yml.github/workflows/mobile-eas-production.ymlsecrets.EXPO_PRODUCTION_TOKEN..github/workflows/release-desktop.yml.github/workflows/release.ymlapps/desktop/src/updates/DesktopUpdates.tssetChannelstill returnsDesktopUpdateChannelOwnershipErroroff the installed channel.apps/web/src/components/settings/SettingsPanels.tsxapps/web/src/components/ServerUpdateAction.tsxapps/server/src/cloud/selfUpdate.tsapps/server/src/process/agentScope.tsapp-s2code*.packages/contracts/src/server.tscontinueRunningThreads. AddedchannelandtargetDatabaseMigration.packages/shared/src/cliRelease.tsshuv1337/s2code.scripts/build-npm-platform-packages.ts.Verification
Web, server, and the GitHub source-control package typecheck.
updateEverything.logic,selfUpdate, andcli/updatetests passed (36). actionlint is clean onmobile-eas-preview-fork.yml.Not run: a desktop electron package dry-run, and
scripts/smoke-cli-archive.tsagainst a built archive.Implemented by Grok 4.7 via Cursor.