Skip to content

Route bundled skills through active Agent Mode host#12418

Open
moirahuang wants to merge 1 commit into
moira/bundled-skills-remotefrom
moira/bundled-skills-am-context
Open

Route bundled skills through active Agent Mode host#12418
moirahuang wants to merge 1 commit into
moira/bundled-skills-remotefrom
moira/bundled-skills-am-context

Conversation

@moirahuang

@moirahuang moirahuang commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Description

Routes Agent Mode bundled-skill listing, read_skill resolution, and slash-command skill invocation through the active session's bundled-skill catalog. Local sessions continue using the local catalog, while connected remote sessions use the ready catalog for their exact HostId.

The Agent input context passes the active session's SkillPathOrigin into skill listing, and ReadSkillExecutor receives ActiveSession so bundled IDs resolve from the same selected host catalog. Slash-command invocations (/skill-name) resolve through a new BlocklistAIController::skill_path_origin accessor backed by the same active session, so remote sessions embed host-rendered content instead of client-local paths. Remote sessions whose host identity/catalog is unavailable return no bundled skills and do not fall back to client-local bundled content — both read_skill and the slash-command toast surface "Bundled skills are not available on this remote session". Existing path-based skill behavior remains unchanged.

This is the third PR in the stack:

Linked Issue

  • The linked issue is labeled ready-to-spec or ready-to-implement.
  • Where appropriate, screenshots or a short video of the implementation are included below (especially for user-visible or UI changes).

Testing

Screenshot 2026-06-09 at 9.37.59 PM.png

  • Added coverage for host-specific bundled-skill listing, same-ID host isolation, unavailable remote-session no-fallback behavior, remote bundled-skill reads, and preservation of local reads.
  • cargo check -p warp --all-targets passes cleanly (including removal of the now-unused BundledSkills::local accessor); tests, formatters, and Clippy were not run per request.
  • I have manually tested my changes locally with ./script/run

Agent Mode

CHANGELOG-NONE

Co-Authored-By: Oz oz-agent@warp.dev

@cla-bot cla-bot Bot added the cla-signed label Jun 9, 2026
@oz-for-oss

oz-for-oss Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

@moirahuang

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

@oz-for-oss oz-for-oss Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overview

This PR routes Agent Mode bundled-skill listing and read_skill resolution through the active session's skill origin so local sessions use local bundles, connected remote sessions use their host-specific remote catalog, and unavailable remote sessions do not fall back to client-local bundled content. I did not find correctness or security issues in the changed diff.

Concerns

  • This is a user-facing Agent Mode behavior change, but the PR description does not include screenshots or a screen recording demonstrating the remote bundled-skill listing/read_skill behavior working end to end. For this user-facing change, please include screenshots or a short recording; if a local desktop is not available, capture it from a coding agent that supports computer use and attach it to the PR.

Verdict

Found: 0 critical, 1 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

@moirahuang moirahuang force-pushed the moira/bundled-skills-remote branch from 240103d to b2e6153 Compare June 10, 2026 02:54
@moirahuang moirahuang force-pushed the moira/bundled-skills-am-context branch from c5b079b to a1eed9a Compare June 10, 2026 02:58

Copy link
Copy Markdown
Contributor Author

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

This stack of pull requests is managed by Graphite. Learn more about stacking.

@moirahuang moirahuang force-pushed the moira/bundled-skills-am-context branch from a1eed9a to 1eb5e42 Compare June 10, 2026 03:43
@moirahuang moirahuang force-pushed the moira/bundled-skills-remote branch 2 times, most recently from 9c4543a to 9632faf Compare June 10, 2026 04:01
@moirahuang moirahuang force-pushed the moira/bundled-skills-am-context branch from 1eb5e42 to 5e94bc2 Compare June 10, 2026 04:01
@moirahuang moirahuang requested a review from kevinyang372 June 10, 2026 04:39
@moirahuang moirahuang force-pushed the moira/bundled-skills-am-context branch from 5e94bc2 to 6563f57 Compare June 10, 2026 04:56
Co-Authored-By: Oz <oz-agent@warp.dev>
@moirahuang moirahuang force-pushed the moira/bundled-skills-remote branch from 9632faf to 2afaa74 Compare June 10, 2026 05:38
@moirahuang moirahuang force-pushed the moira/bundled-skills-am-context branch from 6563f57 to e9aeeff Compare June 10, 2026 05:38
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.

1 participant