Repository navigation
π fix(dashboard): controls for settings only the admin MCP could change (no_ci_ok, Let hive decide per-repo and timeout, NO_GITHUB mode) - #17560
Conversation
The admin MCP could change these settings, but the dashboard could not show or change them: - Settings β Features β Auto-merge β Per-repository merge policy gets "Merge with no CI" (auto_merge.no_ci_ok) and, only while it is set, the deprecated auto_merge.allow_unprotected_base list, marked as having no effect so an owner can clear it. Both stage the full selection only when changed; an untouched save still omits them, so the server keeps them. A bare repository name from hive.yaml now selects that repository. - Settings β Features β Let hive decide gets a per-repository on / off / hive-wide table (decisions.delegate.repos) and an Effect timeout (decisions.delegate.effect_timeout). The PUT replaces the repos map whole, so a table edit sends every saved override plus the edits. The timeout is checked like the server checks it before sending. - Agent β Operating Mode lists NO_GITHUB (a legacy alias for ADVISORY) for an agent that has it, instead of showing "use level default". - Fix the adminmcp comment that said decisions.delegate had no dashboard write endpoint. No endpoint or server behaviour changes. static/index.html regenerated by the manifest concatenation (cmp-identical). Refs hivecommons#17555 hivecommons#17556 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1 Signed-off-by: Danathar <Danathar@users.noreply.github.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
Brings in hivecommons#17559 (write-back kind table). Clean merge; static/index.html still equals the manifest concatenation. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1 Signed-off-by: Danathar <Danathar@users.noreply.github.com>
There was a problem hiding this comment.
Read this against v6 with the server handlers open rather than the diff alone; the "dashboard only, no endpoint change" claim holds and the wiring is correct. Looks correct to me.
What I verified:
- Auto-merge lists.
PUT /api/config/auto-mergealready accepts both keys and leaves an absent one alone (api_config_automerge.go:407-412), and the GET already returns them (:604-605).linear-repos-save.js:968-975sends_configState.dirty['auto-merge']as-is, so the two newmarkDirtycalls inconfig-helpers.js:441-442reach the server exactly likesquash_onlydoes. Staging only on the select's ownthis.idmeans an untouched save keeps both lists, as the body says. - Let hive decide. The JS contract matches the server:
decisionsDelegateRepos(api_config_decisions_delegate.go:274-313) treatsreposas the FULL map, qualifies bare names withproject.org, and refuses the same repo twice.decisionsDelegateReposBodydeletes any saved key matching viadecisionsDelegateSameRepobefore re-adding, so a baredocskey plus a stagedorg/docsrow never reaches the duplicate check.effect_timeoutvalidation mirrors:255-264(empty, or a positive Go duration). - NO_GITHUB.
api_agent_config.go:679already accepts it on PUT, so the select offering it only wheng.mode === 'NO_GITHUB'cannot produce a value the server rejects, and new agents are not offered the alias. static/index.htmlhunks matchstatic-srcbyte-for-byte for the lines changed;verify PR contentsis green.
One cosmetic thing, low:
config-features.js:620(and the same line inindex.html:67099):<code>auto_merge.allow_unprotected_base[]</code>,<code>β¦is missing the space after the comma, so the rendered YAML-keys help line runs two keys together. Optional to fix here.
Merge note in the body is accurate: #17559 touches settings_parity_allowlist.txt and index.html on different lines; whichever lands second will need a regenerated index.html.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
Summary
Andy asked for dashboard and admin MCP parity. These are the settings the admin MCP could change and the dashboard could not show or change. This PR adds the missing dashboard controls. It only changes the dashboard: no endpoint, request field or server behaviour changes. Each control saves through the endpoint the MCP operation already uses, and a save never wipes values the page did not touch.
auto_merge.no_ci_okPUT /api/config/auto-merge, the full list, only when the selection changedauto_merge.allow_unprotected_base(a deprecated no-op)decisions.delegate.reposPUT /api/config/decisions/delegate, the full merged map (all saved overrides plus the edits)decisions.delegate.effect_timeoutNO_GITHUBoptionagents.<key>.modeNO_GITHUBRefs #17555 #17556
What went wrong
An audit of
origin/v6at 9850cfb compared what the admin MCP operations can change with what the dashboard can change:auto_merge.no_ci_okandallow_unprotected_base: the API GET returned them and the PUT accepted them, but no dashboard control showed or changed them.no_ci_okmatters because it lets a repository's PRs merge with no CI checks at all.NO_GITHUBthrough the API or MCP showed "use level default" in the Operating Mode select, because the select had no option for that mode.adminmcp/tools_config_surface_ops.gosaid decisions.delegate had no dashboard write endpoint. It has one:PUT /api/config/decisions/delegate.What changes
markDirtyAutoMergeRepoPolicystages a list only when its own select changes. The PUT leaves an absent key alone and replaces a key that is sent, so an untouched save keeps both lists. A bare repository name inhive.yaml, such asdocsinstead oforg/docs, now shows as that repository selected. Before, it showed as a separate extra entry.project.repos. The newdecisionsDelegateSaveBodybuilds the PUT body. Because the endpoint replaces thereposmap, a table edit sends every saved override plus the edits. A row set back to hive-wide drops out. A bare key fromhive.yamlis replaced, not duplicated, so the server never sees the same repository twice.NO_GITHUBis a legacy alias for ADVISORY (crux/agentmode). The select lists it only for an agent that already has it, and its emoji matches ADVISORY's. New agents are not offered the alias.Contributor agent role, grants and requeue are not in this PR. The audit missed that the hive's
/contributepage already has these controls in the Management & Operations fleet row: "Acting as", grant chips with "+ grant", and Reassign. They call the sameagent-role,agent-role-grantsandrequeueendpoints. The one gap is that those rows only list connected contributors. Adding the controls to the main dashboard's Contributors cards can be a follow-up if wanted.Files
static-src/js/config-features.js,config-helpers.js,linear-repos-save.js,config-agent.js,debug-logs.js, plus the regeneratedstatic/index.html. Concatenatingmanifest.txtreproduces it byte for byte; I checked withcmp.settings_parity_allowlist.txt: droppedauto_merge.no_ci_ok[]andauto_merge.allow_unprotected_base[], because the Settings page now references both.hive-merge.md(per-repository merge policy),dashboard-sections/activity-monitor.md(Let hive decide settings),agent-configuration.md(mode list). Changelog:changelog.d/fixed-dashboard-mcp-parity-controls.md.Tests
dashboard_mcp_parity_controls_test.goruns the shipped JavaScript in node. It uses stub objects and does not regex-match markup:TestDashboardParityAutoMergeNoCIAndUnprotectedBaseStageFullLists: the controls render, an unrelated edit stages neither key, and an edit stages the full selection. Fails on the tip because the Features renderer has noam-no-ci-okcontrol.TestDashboardParityDelegateSaveSendsFullReposMapAndEffectTimeout: checks the table rows, that an untouched save sends norepos, that a row edit sends the full merged map, that hive-wide drops a row and a bare key is replaced, and that the timeout is checked. Fails on the tip becausemarkDirtyDecisionsDelegateRepoanddecisionsDelegateSaveBodydo not exist there.TestDashboardParityOperatingModeShowsNoGitHub: an agent withNO_GITHUBgets that option selected, and the alias is not offered to an ADVISORY agent. Fails on the tip because the select has noNO_GITHUBoption, so "use level default" is selected.Merge note
Sibling PR #17559 also edits
static-src(config-sentinel.js,config-state.js),settings_parity_allowlist.txtandstatic/index.html. It touches different lines, but whichever PR merges second needs a v6 merge and a regeneratedstatic/index.html(concatenatemanifest.txt, thencmp).π€ Generated with Claude Code
https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1