Skip to content

chore: merge upstream/dev into the fork - #80

Merged
Edo771977 merged 40 commits into
devfrom
claude/focused-pasteur-uvsert
Nov 12, 2026
Merged

Edo771977 merged 40 commits into
devfrom
claude/focused-pasteur-uvsert

Conversation

@Edo771977

Copy link
Copy Markdown
Owner

Summary

Syncs the fork's dev with upstream anomalyco/opencode dev up to 3d308eae2e, 38 upstream commits since #79.

The main change upstream is that subagents now always run in the background (anomalyco#63382). The background flag and the foreground path in SubagentJob are gone (anomalyco#63223), and so is the notify option (anomalyco#63413). The subagent tool 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.ts

The fork follows upstream's background-only model. It keeps its own prepare / authorize / launch split and its declared output fields.

subagent

  • launch no longer waits on jobs.block. It calls subagents.start(recovery) and returns upstream's background result.
  • The background and notify inputs, and the notify metadata, are removed as they were upstream.

Declared output fields (kept)

  • The child is still told to end with the fields.
  • The fields travel in the job's recovery, and SubagentCompletion.deliver checks them when the answer is delivered.
  • When a field is missing, the <subagent> message arrives with state="error" and quotes what the child said. Before, the tool call itself failed.

subagent_parallel

  • It still checks every subtask and asks each permission before starting any, and it still keeps to 2–5 subtasks.
  • It now starts them all in the background and returns each one's sessionID with running, or error when a subtask couldn't be started.
  • Each subtask's answer, fields included, arrives as its own <subagent> message. Before, the tool waited for all of them.

Tests

  • Three fork tests in tool-subagent.test.ts assumed a foreground answer. They now assert on the <subagent> message delivered to the caller, through a small deliveredTo helper:
    • left-running work;
    • declared fields;
    • parallel fan-out.
  • To check them, I replaced declared with a version that never rejects: the field and fan-out tests failed, and passed again once the check was restored.

AGENTS.md

  • The rule on reporting what a subagent left running now describes the background-only model.

Fork CI fix

  • Upstream moved the macOS legs of check-process-daemon.yml and release-process-daemon.yml to blacksmith runners, which only exist upstream.
  • The fork switches them back to macos-15, in a separate commit.
  • The other upstream workflow changes (release.yml, deploy*.yml, bot-nix-hashes.yml) only run under github.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 because ghostty-web can't be downloaded locally.
  • bun run lint passes, and check:generated is clean in client and protocol.
  • bun.lock and package.json differ from upstream only by the fork's own entries.
  • Tests, each package run through its own test script:
    • core: 7189 pass. Two failures are the usual sandbox ones (the flock tests, 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.
    • tui: 1722 pass.
    • cli: 399 pass.
    • server: 124 pass. The 3 failures are the usual OAuth-port tests, since the sandbox has no IPv6.
    • tool-subagent: 20/20 pass.

Generated by Claude Code

jlongster and others added 30 commits November 11, 2026 14:14
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>
@github-actions

Copy link
Copy Markdown

This PR doesn't fully meet our contributing guidelines and PR template.

What needs to be fixed:

  • PR description is missing required template sections. Please use the PR template.

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.

@Edo771977
Edo771977 merged commit 283c38f into dev Nov 12, 2026
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.