Skip to content

fix: backport the edition MCP tools ref and KAS OAuth pointers to 0.12.1 (batch 33) - #32229

Merged
buluoray merged 2 commits into
release/0.12.0from
crew/slack/0.12.1-batch-33
Nov 7, 2026
Merged

buluoray merged 2 commits into
release/0.12.0from
crew/slack/0.12.1-batch-33

Conversation

@buluoray

@buluoray buluoray commented Nov 7, 2026 •

Copy link
Copy Markdown
Contributor

Needs Bolin's OK before merge, and merge it after #32174 and #32222. #31671 is hand-resolved in shared KAS files (listed under What changed). #32174 and #32222 add the context those hunks were resolved around, so this branch will be rebased onto release/0.12.0 once they land, and its hand ports re-checked against them.

Problem / Motivation

Goal: Bring two user-reported MCP fixes that merged on main after v0.12.0 onto release/0.12.0, one commit per fix, in a PR of their own so they can be reviewed and reverted apart from the low-risk batches.

Why it matters

PR Reported What a 0.12.0 user sees today
#31611 zhjunyi, in the Slack bug ledger On an existing install, an MCP server an edition starts supplying after the first install is listed but its @<name> ref never reaches the agent's tools, so the agent cannot see its tools. Only fresh installs get it.
#31671 #27711 (jeeshofone) KAS drops a remote MCP server's oauth block, so a pre-registered OAuth client can never sign in.

Not a goal

  • No fix that is not already merged on main; nothing is changed only here.
  • No version bump, no tag, no CHANGELOG.md change. Cutting v0.12.1-rc.N and the bare tag follow docs/build/release.md and stay with the maintainers.
  • fix(kas): send oauth and registry pointers when the engine accepts them #31671 changes nothing until the engine announces mcpServerOAuth or mcpRegistryPointers: with neither announced, every path below behaves as on 0.12.0.

What changed (motivation → approach → change)

Each main squash commit was cherry-picked with -x onto release/0.12.0 @ 344cc7ca44, in merge order, one commit each.

# PR main commit release commit Pick
1 #31611 give a newly supplied edition MCP server its tools ref once 8b8cd96a97 1a62f3a32f clean
2 #31671 send OAuth and registry pointers when the engine accepts them b247a22121 ce6eac60c1 hunks resolved by hand; one file's hunk dropped

Hand-resolved hunks in #31671. Each conflict was traced to the main commits that added its context: #30961 (prompt_unread_out, in #32222), #30874 (with_switched_off_tools), #31562 (in #32174), #29543 and #30108 (imports), and #25347 (Kiro Cloud Sessions, which created kas_cloud.py). None was pulled in as a prerequisite: each is its own fix or feature, and #25347 alone is 88 files. Each hunk keeps release's side and adds only #31671's own lines.

File Resolution
acp/harness/kas.py kept release's prompt_unread_out=prompt_unread (from #30961, now on release) and added engine_features=engine_features after it, as on main
acp/kas_agents.py kept release's prompt_unread_out parameter and added engine_features after it, as on main
acp/runtime_session_setup.py docstring: the list of fields read now matches main word for word (_agent_capabilities added, _child_env_names kept)
dashboard/chat_turn/turn_spec_hooks.py added the keeps_mcp_oauth import
test/test_kas_agents_mcp_servers.py, test/test_member_dispatch_mount.py kept release's prompt_unread_out=None and added engine_features=frozenset() in five fake signatures, as on main
acp/harness/kas_cloud.py dropped: this branch deleted the file, so #31671's one-line engine_features parameter there has nowhere to go

Every other file has added and removed lines identical to the main commit, including the new acp/kas_engine_features.py and its tests. #31671's commit is authored with the public identity the push guard requires and names its original author in its message; #31611 keeps its original author.

builder-security checked: no pick changes a bind, a listener, a route or an ingress rule. #31671 changes what reaches KAS for a remote MCP server's sign-in: its oauth block, narrowed by carry_oauth to the keys the engine accepts over ACP plus oauthScopes, sent only to an engine that announces mcpServerOAuth. A clientSecret is never sent (one log line names the field, never its value). Otherwise Crew keeps withholding the block as on 0.12.0.

Backwards compatibility

Compatible: each change is the one already merged on main, and each PR's own compatibility note applies unchanged. Until the engine announces the flags, #31671 is inert.

Removes nothing: no pick hides, deletes or renames anything 0.12.0 accepts.

Tests

Proof: not provable -- other: a backport of main commits whose proofs ran on their own PRs

  • CI does not run the backend suite on PRs into release/*, so the related set was run here: every touched test file plus every test file that imports a touched module, 224 files, one pytest process per batch of 20, -n 0. 12819 passed. 11 failed, none from these picks: this branch's known copilot, test_is_kiro_cli_is_positive and test_folder_steering_provider_dedup.py failures, plus test_acp_agent_env.py::test_every_backend_launch_carries_agent_env[copilot] and test_acp_tool_gate.py::test_every_enforced_harness_reaches_the_spawn_preflight, which fail the same way on a clean release/0.12.0 checkout.
  • No frontend file changes.
  • flake8 passes on the changed Python files.

Manual verification

N/A - every pick was verified on its own main PR. The 0.12.1 RC soak is the end-to-end check.

Screenshots / video

Why no screenshot: backend-only change.

Related Issues

Backport to the 0.12 line for 0.12.1 of #31611 and #31671. Source issue: #27711.

Sibling sweep

Siblings: none -- each source PR carried its own sibling sweep; this PR only carries those fixes.

Pattern harvest

Not generalizable: this PR only carries fixes already on main. Each source PR has its own harvest.

Checklist

  • At most two commits (one is the norm), with a Conventional Commits title (feat|fix|docs|style|refactor|perf|test|chore|ci|build|revert: ...)
  • Existing tests pass and new tests added for new functionality
  • Self-review completed; code follows project style guidelines
  • Documentation updated (if applicable)
  • No secrets, credentials, or internal references in the diff

Contribution License Agreement

Contributions are accepted under the project's Apache-2.0 license; see the Licensing section of CONTRIBUTING.md.

@buluoray
buluoray requested review from a team and KiroCrewCaptain as code owners November 7, 2026 09:15
@buluoray
buluoray requested review from tim-finnigan and removed request for a team November 7, 2026 09:15
@github-actions github-actions Bot added the readiness: checking Automated validation is still running label Nov 7, 2026
@github-actions

github-actions Bot commented Nov 7, 2026 •

Copy link
Copy Markdown
Contributor

UX Review (Opus 5.5) — ⏭️ skipped

Revision ce6eac60c14b522de09fdcd8197f7434acae8059 touches no user-facing surface (no changes under website/ or committed screenshots), so the UX review was skipped. Does not block merge.

@github-actions

github-actions Bot commented Nov 7, 2026 •

Copy link
Copy Markdown
Contributor

Design Review (Opus 5.5) — ✅ PASS

Design-level review of ce6eac60c14b522de09fdcd8197f7434acae8059 — updated in place on each push. A BLOCK verdict blocks PR readiness; PASS does not.

Design-Verdict: PASS

Nothing blocks: both picks match their main commits. Every session_extras override (base, kas, kiro, codex) takes the new engine_features keyword, and the OAuth/registry path stays off until the engine announces its flags.

Notes

[DESIGN-REVIEWED] ce6eac6

Description read

[DESCRIPTION-READ] b8e8983fa290e7691cb0fc36e39a16050d79d1d6f860baa5bbb122d5b935c0b5

That sha256 names everything this verdict read: the PR description, plus the 1 evidence file(s) the workflow collected from it and handed this review. It covers that evidence because the media strip replaces every attachment URL with the same placeholder, so an edit swapping one attachment for another would leave the description's captured text identical while what this review judged changed. Recompute it with .github/scripts/pr-description-capture.sh over the same inputs; if it differs, the description or that evidence changed after this verdict was formed and any finding drawn from either is unproven.

@github-actions

github-actions Bot commented Nov 7, 2026 •

Copy link
Copy Markdown
Contributor

First Principles Review (Opus 5.5) — ✅ PASS

Premise-level review of ce6eac60c14b522de09fdcd8197f7434acae8059 — why this exists and whether the shipped surface is the smallest honest version. Updated in place on each push. A BLOCK verdict blocks PR readiness; PASS does not.

First-Principles-Verdict: PASS

This backport carries two fixes already merged on main, both from user reports (#27711 and the Slack bug ledger). There is no second spelling, no ungated default change, and no rider.

Notes

  • Item 5 — one consumer, generalized: engine_features: frozenset[str] = frozenset() was added to the shared harness launch signature (base.py, codex.py, kiro.py), but the diff says "Only the KAS projection reads it". It matches main byte for byte, so shrinking it here would make release diverge from main. Subtraction: none in a backport.

What this change ships

Inventory (6 items) — 5 justified

Intent: bring two user-reported MCP fixes from main onto release/0.12.0 for 0.12.1. This is a FIX.

  1. On an existing install, an MCP server that an edition starts supplying later gets its @name ref in tools once — justified
  2. Each server offered that way is recorded in edition_mcp_refs_offered.json, so a ref the user removed stays removed — justified
  3. Refs for slash-named managed servers now use the server's mount alias — justified
  4. A KAS engine that announces mcpServerOAuth gets clientId, redirectUri, clientMetadataUrl and oauthScopes, never clientSecret — justified
  5. A KAS engine that announces mcpRegistryPointers gets a user's registry-governed server as a pointer (command and args, no env) — one consumer, generalized, carried verbatim from main
  6. The chat turn's discards_mcp_oauth stays off when the engine keeps oauth — justified

[FIRST-PRINCIPLES-REVIEWED] ce6eac6

Description read

[DESCRIPTION-READ] 24f8f0753c705f63915c091c07efcab0668d9fc958787b3997f29cd934166a0b

That sha256 names the PR description this verdict read. Recompute it with .github/scripts/pr-description-capture.sh; if it differs, the description changed after this verdict was formed and any finding drawn from the description is unproven.

@github-actions

github-actions Bot commented Nov 7, 2026 •

Copy link
Copy Markdown
Contributor

Opus 5.5 Review — ✅ no blocking findings

Reviewed ce6eac60c14b522de09fdcd8197f7434acae8059 — this comment is updated in place on each push.

Review details

No findings.

[OPUS-REVIEWED] ce6eac6

Verdict parsed from the review's SHA-scoped output markers for commit ce6eac60c14b522de09fdcd8197f7434acae8059.

False positive or not applicable? A repository writer can comment:
/ai-review override fable ce6eac60c14b522de09fdcd8197f7434acae8059 false-positive: <reason, 20 to 500 characters>

@github-actions

github-actions Bot commented Nov 7, 2026 •

Copy link
Copy Markdown
Contributor

GPT 6.1 Review — ✅ no blocking findings

GPT 6.1 completed its review of ce6eac60c14b522de09fdcd8197f7434acae8059 and found no blocking issues.

This comment is updated in place on each push.

Review details

No findings.
[GPT-REVIEWED] ce6eac6

False positive or not applicable? A repository writer can comment:
/ai-review override gpt ce6eac60c14b522de09fdcd8197f7434acae8059 false-positive: <reason, 20 to 500 characters>

@github-actions github-actions Bot added readiness: passed Eligible automated validation passed for the current revision and removed readiness: checking Automated validation is still running labels Nov 7, 2026
buluoray and others added 2 commits November 7, 2026 15:56
…ce (#31611)

An edition server that extra_mcp_servers() starts supplying after the
first install was seeded into mcpServers on rebuild, but its @name ref
was only ever added to tools on a fresh install, so the agent mounted the
server and saw none of its tools.

The rebuild now adds the ref to tools (never allowedTools) once, on the
first rebuild that mounts the server, and records each name in
edition_mcp_refs_offered.json after the spec is written, so a ref the user
removes stays removed. Gated-off and opt_in servers gain nothing and stay
unrecorded. Each added ref writes one mcp_tools_added SEL record.

(cherry picked from commit 8b8cd96)
…em (#31671)

A remote MCP server with a pre-registered OAuth client could not sign in
on KAS, because the engine's customAgents schema dropped the oauth block
and the registry marker. Newer engines announce mcpServerOAuth and
mcpRegistryPointers in initialize. When they do, the projection sends
oauth (clientId, redirectUri, clientMetadataUrl, oauthScopes; never
clientSecret) and sends a user server's registry marker as a pointer
that keeps its command and args, never its env. Crew's own servers are
never pointers: they stay stdio so the session-level hoist still stamps
their session identity. An engine that announces neither gets the same
request as before.

(cherry picked from commit b247a22)

Release backport, hand-resolved. Each conflict kept release's side and
added only this change's own lines: kwarg/parameter additions in
acp/harness/kas.py, acp/kas_agents.py and two test files, the
keeps_mcp_oauth import in dashboard/chat_turn/turn_spec_hooks.py, and the
_agent_capabilities field in acp/runtime_session_setup.py's docstring.
acp/harness/kas_cloud.py is deleted on this branch, so its one-line hunk
was dropped. Every other file applied unchanged.

Original author: Ray Xu (#31671).
@buluoray
buluoray force-pushed the crew/slack/0.12.1-batch-33 branch from 3e43c95 to ce6eac6 Compare November 7, 2026 16:04
@github-actions github-actions Bot added readiness: action required A blocking check or review needs attention and removed readiness: passed Eligible automated validation passed for the current revision labels Nov 7, 2026
@github-actions github-actions Bot added readiness: passed Eligible automated validation passed for the current revision and removed readiness: action required A blocking check or review needs attention labels Nov 7, 2026
@buluoray
buluoray merged commit d579568 into release/0.12.0 Nov 7, 2026
30 of 43 checks passed
@buluoray
buluoray deleted the crew/slack/0.12.1-batch-33 branch November 7, 2026 17:45
@github-actions github-actions Bot removed the readiness: passed Eligible automated validation passed for the current revision label Nov 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant