Repository navigation
chore(sync): merge upstream dev through cbe71595e1 - #494
Merged
Merged
Conversation
…en all checks finish (anomalyco#63656)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ay in (anomalyco#63739) Co-authored-by: Filip Hejmowski <fhejmowski@simplito.com>
…omalyco#63885) Co-authored-by: opencodejr[bot] <348916617+opencodejr[bot]@users.noreply.github.com>
40 upstream commits past 73abe63 (v2.3.0). Fork identity, guarded publishing, hidden Claude Agent SDK provider and package/bin/port contracts preserved; conflicts resolved in CHANGELOG, bun.lock, CLI manifest, connect dialog, i18n, TUI lifecycle tests and an app e2e fixture whose provider is hidden in the fork.
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
The New timeline boundary test reported timeline/terminal-work.stories.tsx as an unauthorized importer. Restore the old story's pre-repair route and own the shell outcome story in timeline-next/stories, which the three component cases mount. The localized outcome badge is unchanged.
This was referenced Nov 14, 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.
Summary
Normal two-parent merge of upstream
devthroughcbe71595e1, following #484, #487 and #489. Sync-only: no version bump, no release, no publish. Targets onlyshuv1337/shuvcode:integration-v2. No default-branch push, rebase, force-push, tag, release, publish, deployment or live-service change. Stop before merge.73abe63ac2(the task reported 38; the fetched drift is 40). Upstream introduced no new version in this window, so root manifests stay2.3.0and the CLI manifest/lockfile stay 2.3.0-shuv.1.shell_timeout_background), read-tool default limits and paged-read fixes, six-byte GIF detection, the media MIME shortcut, connect-dialog sign-in polish, submenu/tooltip fixes, image jobs addressed by provider ID, the xAI video entrypoint,OPENCODE_SESSION_IDtold to the model, and the stories/components-lab expansions.GH_TOKENbuild fix are untouched by this upstream range and still present.Ancestry
b8986cff5753cf8051f04c47fd90a422a4bdabbc(origin/integration-v2, includes chore(ci): run the full suite on sync and release PRs #490/test(core): fix the stopped-command race and report stalled PowerShell calls #491/fix(ci): authenticate Bun release downloads in the CLI build #492).73abe63ac23224d88e739e7028882e547ef65a79.cbe71595e1f370ff91b3081872b96bbe56519c41(upstream/dev, symref verified asdev), 40 commits.6782796613. Initial review head:c9f400054a41f089cf33f7a12aa1a838b9bad4d9; review repairs:eb4e543f3a.integration-v2is stale at72423e0520; that other worktree was left untouched and the topic starts at refreshedorigin/integration-v2.pwsh-ci-diagdiagnostic refs for test(core): first PowerShell shell-tool test intermittently stalls in CI #493. Nothing landed, deleted or discarded.Durable audit, conflict resolutions and complete branch dispositions.
Conflict resolutions
Seven paths conflicted:
CHANGELOG.md2.3.0-shuv.1note and all earlier fork notes; keep one upstream## v2.3.0section, verified byte-identical to the tag copy already in the fork. No duplicate, no new fork entry for a sync that does not release.bun.lockshuvcode/2.3.0-shuv.1; take upstream's@hona/strobe0.39.0 hashes and the new@kobalte/corepatch. Frozen install validates it.packages/cli/package.jsonpackages/app/src/runtime/i18n/en.tsprovider.connect.claudeAgent.*(hidden provider); adopt upstream's ellipsis-freeprovider.connect.command.waiting; the unused fork-onlytitle.anthropicProMaxkey goes with upstream's removal.packages/app/src/providers/connect/dialog.tsxSTEP_CLASS/methodLabel/METHOD_ICON; keep the fork deletion of the Claude Agent setup UI and itsnarrow("claude")match.packages/app/e2e/regression/settings.spec.tspackages/tui/test/app-lifecycle.test.tsxttftremoval above them.Every other both-sides-changed file auto-merged with the fork delta intact, including the
isHiddenProviderfilters in the TUI session route and the connect controller, theToolFailurere-export in@opencode/ai, the tab-popover e2e assertion and the Go-upsell art width. #491's delta inpackages/core/test/tool-shell.test.ts(147 changed lines) is byte-identical after the merge.Managed policy and fork preservation
Keep #484's upstream behaviour:
model.list,model.default,provider.list,generate.*,voice.*andwebsearch.querywait up to 5 seconds, then return 503 if activation is incomplete; other catalog reads stay non-waiting. No extra waits added.Global.app = "shuvcode", XDG roots, ports0x1337/0x1338, clientService.fallback()and the["shuvcode", "serve", "--service"]spawn, npm-only updates, theshuv1337/shuvcodepublish guard and the bundled plugins are unchanged. The Claude Agent SDK tree stays on disk, unregistered, still filtered byProviderPlugins, the config provider plugin and every list that callsisHiddenProvider.Validation
Bun 1.4.4, package suites run from their package directories with an isolated environment (
env -i, privateHOME/TMPDIR, no inheritedOPENCODE_*): this worktree's shell carries the liveOPENCODE_CONFIG_DIR, which changes the SDK suite's result. No privileged/systemd container and no host/dev,/sys,/run/udevor/run/dbusmounts.bun run check(lint + 40-package typecheck)bun run generate(packages/client)bun install --frozen-lockfilegit diff --checkOPENCODE_*env; Turbo hit known SIGSEGVpc_4bef4e2422a7before core/TUI/CLI finished, so those ran individuallyThe 11 core failures are all
GitLabPlugin OAuthcases that need the fixed local callback port:GitLab login needs local port 8080, but it is already in use. Something listens on127.0.0.1:8080on this dev host; the same file fails identically (8 pass / 11 fail) on unmodifiedorigin/integration-v2, and a GitHub runner has the port free. The SDKworkerd-seededcase behaves the same way under the inherited environment and passes isolated. No existing test budget, retry or skip was weakened.The initial merge changes 343 files (the audit and review repairs add more paths), above the 300-file cap on GitHub's diff endpoint:
gh pr diffand Plannotator--no-localwill omit hunks. Review withgit fetch origin pull/<n>/head && git diff origin/integration-v2...FETCH_HEAD, orgit show --remerge-diff 6782796613for the conflict resolutions.No full browser E2E/component suite, cross-platform execution or all-target build is claimed. Focused Chromium component regressions were run as described below.
packages/app/e2e/regression/settings.spec.tschanged only by keeping the fork's deletion, so the e2e job should be unaffected; CI'sunitande2ejobs run on this PR because its title starts withchore(sync).Independent review and repairs
Astra identified two upstream regressions at the initial head; both are repaired in
eb4e543f3aand undergoing a fresh independent Astra re-check:The two preview cases and three shell-outcome cases failed before the production fixes. Afterward, preview tests passed 20/20 attempts and the entire shell component spec passed 120/120 attempts at two workers, without retries or dependency-optimizer reloads. Root
bun run checkpassed 40/40; whitespace passed. Evidence and limitations are recorded in the durable audit. A strobe comparison bounded out during setup; no performance verdict claimed. Required replacement-head CI and independent approval remain gates.Visual
Release
Not in this PR. Recommendation: if the hosts should get these 40 commits, a separate release-prep PR bumps to
2.3.0-shuv.2on channellatest— the suffix sorts above2.3.0-shuv.1and below the next upstream base, and upstream's base is still2.3.0. Release prep stays out so this merge is the only review surface and host upgrades can wait out the post-publish npm tarball 404 window.Feature flags
No new fork flag. Upstream graduated and deleted
shell_timeout_background(timed-out shell commands move to the background by default); the fork adopts the upstream default and keeps the flag's history only in past release notes.