refactor: replace fetch_instructions with skill tool and built-in skills by hannesrudolph · Pull Request #10913 · RooCodeInc/Roo-Code

hannesrudolph · 2026-01-23T06:03:22Z

Summary

This PR replaces the fetch_instructions tool with a new unified skill tool system, making it easier for Roo to load specialized instructions for common tasks.

What Changed

New Skill Tool

Roo now uses a skill tool to load instructions for tasks like creating MCP servers or custom modes
Skills can be built-in (shipped with the extension), global (user-defined), or project-specific
Skills are automatically approved, removing the need for manual confirmation when loading instructions

Built-in Skills

Two built-in skills are now included:

create-mcp-server: Instructions for creating MCP servers that expose tools and resources
create-mode: Instructions for creating custom modes in Roo Code

Removed Settings

The "Enable MCP Server Creation" checkbox has been removed from MCP settings
MCP server creation instructions are now always available via the built-in skill when needed

New Diff Toggle Setting

Added a diffEnabled setting to control whether diff-based editing tools are available

How This Affects You

For most users: No action required. Roo will automatically use the new skill system when you ask it to create MCP servers or custom modes.

For users with custom skills: Your existing project and global skills continue to work and take priority over built-in skills.

For users who disabled MCP server creation: The toggle has been removed. If you don't want Roo to create MCP servers, simply don't ask it to—the instructions are only loaded on demand.

Why This Change

Consistency: Skills now work the same way whether they're built-in, global, or project-specific
Extensibility: The skill system is more flexible and easier to extend with new capabilities
Simplicity: Fewer settings to manage—instructions are loaded when needed rather than requiring upfront configuration

Follow-up Work

⚠️ A follow-up PR is needed to update the mode creation and MCP server creation instructions in the built-in skills to reflect current best practices and documentation.

roomote-v0 · 2026-01-23T06:03:50Z

Oroocle Follow along on Roo Cloud

Re-review: 1 new issue found.

skill tool schema: args is documented optional but is required (see bd37b049a0)

Previous reviews

34ef7d3: Review #1

f997890: Review #2

2420ff7: Review #3

3d07128: Review #4

8c2fe4d: Review #5

40dd577: Review #6

7e0bd30: Review #7

de9f998: Review #8

c590f63: Review #9

ad89907: Review #10

57f977f: Review #11

d83a9c5: Review #12

57f977f: Review #13

a0d5728: Review #14

b6f7fe0: Review #15

99b424c: Review #16

d876abc: Review #17

_{Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues.}

src/services/skills/built-in-skills.ts

roomote-v0 · 2026-01-23T23:59:12Z

src/core/tools/SkillTool.ts

+
+			// Build approval message
+			const toolMessage = JSON.stringify({
+				tool: "skill",


SkillTool sends the approval payload as { "tool": "skill", ... }, but ClineSayTool in @roo-code/types does not include a "skill" variant and the webview ChatRow renderer has no case for it. In practice this can render as an unknown tool request (or fail type-safely elsewhere) when the UI tries to parse/display the approval.

_{Fix it with Roo Code or mention @roomote and request a fix.}

packages/types/src/vscode-extension-host.ts

src/core/auto-approval/index.ts

- Add built-in skills (create-mcp-server, create-mode) following slash commands pattern - Update SkillsManager to merge built-in skills with user skills - Remove FetchInstructionsTool and related infrastructure - Remove enableMcpServerCreation setting and UI checkbox - Remove auto-approval logic for fetchInstructions - Update system prompt sections to remove fetch_instructions references Built-in skills are now available through the skills system with override precedence: project > global > built-in

- Remove <location> from built-in skills in prompt (only show for file-based skills) - Add 'skill' case to ChatRow.tsx for tool approval UI rendering - Add 'skill' to ClineSayTool union type and interface - Update i18n keys from 'instructions' to 'skill'

…ebase

…L.md files - Add generate-built-in-skills.ts script to parse SKILL.md files and generate TypeScript - Add prebundle npm script to auto-generate before builds - Create built-in/create-mode/SKILL.md for mode creation instructions - Create built-in/mcp-builder/ with comprehensive MCP server development guide - Add project-level .roo/skills/mcp-builder/ skill - Add tests for the generation script - Update built-in-skills.ts to be auto-generated (DO NOT EDIT DIRECTLY) The source of truth is now the SKILL.md files. Run 'pnpm generate:skills' to regenerate.

The generator now runs prettier on the output file after generation. This ensures the generated file is already formatted and won't change when the pre-commit hook runs prettier via lint-staged.

mrubens · 2026-01-29T06:27:05Z

@roomote please resolve the merge conflicts with origin/main

roomote-v0 · 2026-01-29T06:28:48Z

Fixaroo See task on Roo Cloud

Resolved merge conflicts with origin/main. All local checks passed.

_{View commit | Revert commit}

This reverts commit 34ef7d3.

github-actions · 2026-01-29T06:45:58Z

🚀 Preview deployed!

Your changes have been deployed to Vercel:

Preview URL: https://roo-code-website-ild3l82xi-roo-code.vercel.app

This preview will be updated automatically when you push new commits to this PR.

roomote-v0 · 2026-01-29T06:59:57Z

src/core/prompts/tools/native-tools/skill.ts

+					description: ARGS_PARAMETER_DESCRIPTION,
+				},
+			},
+			required: ["skill", "args"],


In the OpenAI tool schema, args is documented as optional but is currently included in required, which forces callers to always provide it (usually as null). Making args truly optional avoids schema/documentation mismatch and reduces invalid tool payload risk if other tool-callers omit it.

_{Fix it with Roo Code or mention @roomote and request a fix.}

hannesrudolph requested review from cte, jr and mrubens as code owners January 23, 2026 06:03

github-project-automation bot added this to Roo Code Roadmap and Roo Code Roadmap Jan 23, 2026

github-project-automation bot moved this to New in Roo Code Roadmap Jan 23, 2026

github-project-automation bot moved this to Triage in Roo Code Roadmap Jan 23, 2026

dosubot bot added the size:XL This PR changes 500-999 lines, ignoring generated files. label Jan 23, 2026

roomote-v0 bot reviewed Jan 23, 2026

View reviewed changes

src/services/skills/built-in-skills.ts Outdated Show resolved Hide resolved

hannesrudolph force-pushed the refactor/replace-fetch-instructions-with-built-in-skills branch from d876abc to 99b424c Compare January 23, 2026 23:37

roomote-v0 bot reviewed Jan 23, 2026

View reviewed changes

hannesrudolph changed the title ~~refactor: replace fetch_instructions tool with built-in skills~~ refactor: replace fetch_instructions with skill tool and built-in skills Jan 24, 2026

roomote-v0 bot reviewed Jan 24, 2026

View reviewed changes

packages/types/src/vscode-extension-host.ts Show resolved Hide resolved

hannesrudolph force-pushed the refactor/replace-fetch-instructions-with-built-in-skills branch from b6f7fe0 to a0d5728 Compare January 24, 2026 00:56

dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. and removed size:XL This PR changes 500-999 lines, ignoring generated files. labels Jan 24, 2026

roomote-v0 bot approved these changes Jan 24, 2026

View reviewed changes

hannesrudolph force-pushed the refactor/replace-fetch-instructions-with-built-in-skills branch from d83a9c5 to 57f977f Compare January 24, 2026 02:32

roomote-v0 bot reviewed Jan 28, 2026

View reviewed changes

src/core/auto-approval/index.ts Show resolved Hide resolved

hannesrudolph added 6 commits January 28, 2026 16:54

fix: add missing diffEnabled parameter to SYSTEM_PROMPT calls after r…

d30a3c7

…ebase

chore: add missing skill translations for 17 locales

2aaebff

fix: run prettier during skill generation to ensure stable output

7c2f3c4

The generator now runs prettier on the output file after generation. This ensures the generated file is already formatted and won't change when the pre-commit hook runs prettier via lint-staged.

roomote and others added 2 commits January 29, 2026 06:34

chore: merge main and resolve conflicts in skills module

34ef7d3

Revert "chore: merge main and resolve conflicts in skills module"

51a199d

This reverts commit 34ef7d3.

dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. and removed size:XL This PR changes 500-999 lines, ignoring generated files. labels Jan 29, 2026

roomote-v0 bot approved these changes Jan 29, 2026

View reviewed changes

roomote-v0 bot reviewed Jan 29, 2026

View reviewed changes

hannesrudolph merged commit 67e568f into main Jan 29, 2026
17 checks passed

hannesrudolph deleted the refactor/replace-fetch-instructions-with-built-in-skills branch January 29, 2026 14:48

github-project-automation bot moved this from Triage to Done in Roo Code Roadmap Jan 29, 2026

github-project-automation bot moved this from New to Done in Roo Code Roadmap Jan 29, 2026

hannesrudolph mentioned this pull request Jan 29, 2026

Revert "refactor: replace fetch_instructions with skill tool and built-in skills" #11083

Merged

mini2s referenced this pull request in zgsm-ai/costrict Feb 1, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: replace fetch_instructions with skill tool and built-in skills#10913

refactor: replace fetch_instructions with skill tool and built-in skills#10913
hannesrudolph merged 15 commits intomainfrom
refactor/replace-fetch-instructions-with-built-in-skills

hannesrudolph commented Jan 23, 2026 •

edited

Loading

Uh oh!

roomote-v0 bot commented Jan 23, 2026 •

edited

Loading

Uh oh!

Uh oh!

roomote-v0 bot Jan 23, 2026

Uh oh!

Uh oh!

Uh oh!

mrubens commented Jan 29, 2026

Uh oh!

roomote-v0 bot commented Jan 29, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Jan 29, 2026

Uh oh!

roomote-v0 bot Jan 29, 2026

Uh oh!

Uh oh!

Conversation

hannesrudolph commented Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

What Changed

New Skill Tool

Built-in Skills

Removed Settings

New Diff Toggle Setting

How This Affects You

Why This Change

Follow-up Work

Uh oh!

roomote-v0 bot commented Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

roomote-v0 bot Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

mrubens commented Jan 29, 2026

Uh oh!

roomote-v0 bot commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 29, 2026

Uh oh!

roomote-v0 bot Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hannesrudolph commented Jan 23, 2026 •

edited

Loading

roomote-v0 bot commented Jan 23, 2026 •

edited

Loading

roomote-v0 bot commented Jan 29, 2026 •

edited

Loading