Repository navigation
chore(sync): merge upstream v2 through v2.2.2 - #465
Merged
Merged
Conversation
…co#59910) Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
…with its last tab (anomalyco#60126) Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
…malyco#60147) Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
…malyco#59550) Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
…rror (anomalyco#59546) Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
anomalyco#60244) Co-authored-by: neriousy <34747899+neriousy@users.noreply.github.com>
…yco#60216) Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com> Co-authored-by: usrnk1 <7547651+usrnk1@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
…r tray (anomalyco#60284) Co-authored-by: Kit Langton <kit.langton@gmail.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
…nomalyco#59310) Co-authored-by: vimtor <36263538+vimtor@users.noreply.github.com>
Merge anomalyco/opencode tag v2.2.2 (098aa7f) into integration-v2. Conflict resolutions preserve shuvcode fork customizations (ports 0x1337/0x1338, JevTool, CLI package name/version 2.2.2-shuv.1, release workflow deletions, subagent-operation migration) while taking upstream v2.2.2 features (session_part, schedule_checks, image_generate default-on, etc.). Also align @opencode/pty npm package.json version with Cargo.toml (0.3.3) so Process daemon release Validate tag does not fail on version mismatch.
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub. |
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
Merge upstream
anomalyco/opencodebranchv2through tag v2.2.2 (098aa7fd6e02b03d6fc410f0b052038c7d4c5e81) intointegration-v2.integration-v2(PR chore(sync): merge upstream v2 through v2.2.1 #464 / v2.2.1 sync already merged)merge/upstream-v2.2.2@9b2b84a0cd0e4b0327bcd6015f9e850d71b5fcfdgit rev-parse v2.2.2→098aa7fd6e02b03d6fc410f0b052038c7d4c5e81(matches Cap brief)Notable conflicts and resolutions
package.jsonversionspackages/cli/package.jsonshuvcodeand version2.2.2-shuv.1(not@opencode/cli)service-config.ts+ tests)packages/core/src/plugin/internal.tsJevTool(fork) andImageGenerateTool(upstream) — no conflictsession/execution/restart.tsimagerecovery and forkambiguoussubagent handling both presentlocation-activity.ts/ TUIprompt/index.tsxbeforeDecision,promptFilesForServer)migration.gen.tssubagent-operationasm48; added upstreamsession_part/session_time_busy/schedule_checksasm56–m58session/sql.ts+projector.tsSubagentOperationTableand upstreamSessionPartTable(+ imports)packages/core/schema.jsonsubagent_operation_pkandsession_part_pkpermissions.mdxjev_systemOneandexperimental_image_generatepermission rowsCHANGELOG.mdbunfig.toml@opencode/pty*rename; kept fork extras (@agentclientprotocol/sdk,opentui-spinner).github/workflows/release.yml+release-dry-run.yml(+ process-daemon workflows)bun.lockbun installafter version bumpsCargo.tomlat 0.3.3 butnpm/package.jsonat 2.2.2 (would fail Validate tag). Fixed npm (+ optionalDeps) to 0.3.3 to match Cargo — same class of failure seen on #464Pty version check
packages/process-daemon/Cargo.toml→0.3.3packages/process-daemon/npm/package.json→0.3.3(was2.2.2from upstream release bump; corrected)optionalDependenciesall0.3.3Local verification
bun run --cwd packages/core typecheck— pass (1803 files)bun run --cwd packages/cli typecheck— pass (2009 files)bun run --cwd packages/tui typecheck— pass (1842 files)bun run --cwd packages/cli test test/service.test.ts— 29 pass, 1 skip, 0 failbun run --cwd packages/core test test/tool-shell.test.ts— 67 pass, 42 skip, 0 failbun run --cwd packages/core test test/location-activity.test.ts— 20 pass, 0 failCI / paid runners note
Fork
release.yml/release-dry-run.yml/check-process-daemon.yml/release-process-daemon.ymlremain deleted, so Process daemon / Process daemon release macOS runners should not auto-start from those workflows. If any paid macOS run still appears, it will be cancelled.Not done
workflow_dispatch— opened by Code Monkey (bot)