Repository navigation
chore: merge upstream/dev into the fork - #80
Merged
Merged
Conversation
Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com>
…co#63440) Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
…es (anomalyco#63503) Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
# Conflicts: # packages/core/src/tool/plugin/subagent.ts
Upstream moved the macOS legs of check-process-daemon and release-process-daemon to blacksmith runners, which only exist upstream; on the fork those jobs would wait for a runner that never comes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Rt9UTk3Xh7AF2KNjjdbgh2
|
This PR doesn't fully meet our contributing guidelines and PR template. What needs to be fixed:
Please edit this PR description to address the above within 72 hours, or it will be automatically closed. If you believe this was flagged incorrectly, please let a maintainer know. |
This was referenced Nov 13, 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
Syncs the fork's
devwith upstreamanomalyco/opencodedevup to3d308eae2e, 38 upstream commits since #79.The main change upstream is that subagents now always run in the background (anomalyco#63382). The
backgroundflag and the foreground path inSubagentJobare gone (anomalyco#63223), and so is thenotifyoption (anomalyco#63413). Thesubagenttool returns the child's sessionID right away, and the caller receives a<subagent>message every time the child goes idle.Conflict resolved:
packages/core/src/tool/plugin/subagent.tsThe fork follows upstream's background-only model. It keeps its own
prepare/authorize/launchsplit and its declaredoutputfields.subagentlaunchno longer waits onjobs.block. It callssubagents.start(recovery)and returns upstream's background result.backgroundandnotifyinputs, and the notify metadata, are removed as they were upstream.Declared
outputfields (kept)recovery, andSubagentCompletion.deliverchecks them when the answer is delivered.<subagent>message arrives withstate="error"and quotes what the child said. Before, the tool call itself failed.subagent_parallelrunning, orerrorwhen a subtask couldn't be started.<subagent>message. Before, the tool waited for all of them.Tests
tool-subagent.test.tsassumed a foreground answer. They now assert on the<subagent>message delivered to the caller, through a smalldeliveredTohelper:declaredwith a version that never rejects: the field and fan-out tests failed, and passed again once the check was restored.AGENTS.md
Fork CI fix
check-process-daemon.ymlandrelease-process-daemon.ymlto blacksmith runners, which only exist upstream.macos-15, in a separate commit.release.yml,deploy*.yml,bot-nix-hashes.yml) only run undergithub.repository == 'anomalyco/opencode', or only on tags.Verification
bun turbo typecheck:tsc: 30 of 33 tasks pass. The other three (app, desktop, gui-plugins) fail only becauseghostty-webcan't be downloaded locally.bun run lintpasses, andcheck:generatedis clean in client and protocol.bun.lockandpackage.jsondiffer from upstream only by the fork's own entries.testscript:flocktests, since the sandbox runs as root). The third is new from upstream:ToolOutput > never splits a character or an emoji at the cut, added in fix(core): show the start of tool output that exceeds the limit anomalyco/opencode#63272. Neither the test nor the code it covers differs from upstream; I expect it comes from the sandbox's Bun 1.4.2, while CI pins 1.4.4. Not confirmed; CI will show.Generated by Claude Code