feat(opencode): monitor delivery via opencode-sentinel plugin (re-land of #547) - #570
Merged
Conversation
Route opencode's real-time delivery through the sentinel_monitor tool (same shape as Claude Code's Monitor), with a turn-mode fallback when the tool is unavailable. (cherry picked from commit 0f4b8e6)
Companion to the monitor-delivery implementation: updates README.md, README.ja.md, and docs/opencode.md so the delivery-modes table and the OpenCode section list monitor as supported (via the external opencode-sentinel plugin), describe the turn fallback when the plugin is absent, and drop the stale 'no Monitor tool' / 'not supported' claims about monitor and spawn. (cherry picked from commit 4fc39bc)
- watch.sh command now passes "${SENTINEL_SESSION_ID:--}" (4 sites:
_delivery.sh + template.md x3) instead of "$SENTINEL_SESSION_ID", so
launcher shells that drop a quoted-but-empty first arg don't shift
later watch.sh parameters. watch.sh documents this hazard for
GROK_SESSION_ID and recommends the same "${VAR:--}" shape.
- template.md actas/drop steps in monitor mode now explicitly say to
skip the sentinel_* tool calls when the plugin is unavailable, instead
of assuming the tools exist whenever mode=monitor.
- README.md / README.ja.md delivery-modes table: monitor row notes
OpenCode requires the plugin; turn row scopes OpenCode to the
plugin-not-installed case (the template picker now defaults to
monitor when the plugin is present).
Copilot review feedback on #547.
(cherry picked from commit e03fe89)
…rced The page said monitor never silently drops messages. agmsg writes the rule and does not detect whether the sentinel tool exists, so the fallback is an instruction the agent follows, not a path agmsg enforces — an agent that ignores it delivers nothing and nothing reports that. Reworded to degrades-to-turn, with what is and is not guaranteed spelled out and turn named as the mode to pick when delivery must not depend on the agent honouring a rule. The implementation is unchanged; only the promise now matches it.
…ands The rule wrapped the path in literal single quotes, which holds only while the path contains none. delivery.sh accepts an apostrophe because it is a legal POSIX path character, so such a path ended the quoted argument early in both generated commands — the sentinel_monitor watcher and the fallback check-inbox — and anything after it became live shell syntax. Quote once with %q and use that in both. $type stays as it was: it comes from the type registry, not the caller. The regression runs the generated command lines through bash -n rather than matching text, so it fails on a broken quote instead of on a wording change. Verified against the unquoted form, where it reports the watch.sh line as unparseable. Also carries the fallback wording the rest of this branch already fixed into README.md, README.ja.md, and the opencode doc summary, which still described the fallback as unconditional. Found in review; the earlier sweep looked for the "never silently drops" phrasing and missed these.
fujibee
force-pushed
the
feat/opencode-sentinel-monitor
branch
from
July 31, 2026 00:32
acf8dc1 to
48fabca
Compare
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
2 participants
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.
Re-lands @tsukimiya's #547 from a branch in this repository, stacked on #569 the same way the originals were stacked. The three feature commits are cherry-picked with
-xand keep their original authorship; one further commit is ours and is described below.Base is #569, so this PR shows only the monitor work. Same mechanical reason as there: the original's checks predate the shard split, so the required context can never report on that head.
What it does
Gives opencode a real-time delivery mode.
monitor=yesanddelivery_modes=monitor turn offin the manifest letdelivery.sh set monitor opencodethrough the central gate, and the opencode delivery plug writes a rule telling the agent to launchwatch.shunder theopencode-sentinelplugin'ssentinel_monitortool — the same shape as Claude Code's Monitor. The rule also carries a turn-mode fallback for when that tool is absent.No new manifest keys:
delivery_modesalready exists and is already enforced. What changes is the set of modes opencode declares, so this is a capability the type gains rather than a new interface.bothstays unsupported, and that is enforced rather than documented — the central gate indelivery.shrejects any mode absent fromdelivery_modesbeforeapply_settingsruns, so the plug'sbothbranch is unreachable. Verified againstmainrather than taken from the comment.The one commit that is ours
docs(opencode): describe the monitor fallback as instructed, not enforcedadjusts wording, not behaviour.The page said monitor "never silently drops messages". agmsg writes the rule; it does not detect whether
sentinel_monitorexists, so the fallback is an instruction the agent follows rather than a code path agmsg enforces. An agent that ignores it delivers nothing, and nothing reports that. The text now says monitor degrades toturn, spells out what is and is not guaranteed, and namesturnas the mode to choose when delivery must not depend on an agent honouring a rule.The implementation is untouched — the fallback is a good design for the constraint it works under. Only the promise now matches what the code can keep.
Tests
bats tests/test_delivery.bats tests/test_spawn.bats— 233/233, exit 0, against currentmain.Closes #547 once this lands.
Known, tracked separately
The monitor rule interpolates the project path into command text as
'$project', which is the shell-quoting gap tracked as the first item of #550. This adds two more occurrences of an existing pattern rather than a new class of problem; #550 is being updated to name the opencode rule among its affected files.