Marketplace (#4538)

* chore: merge jbbrown/marketplace squashed Detailed commits: Author: Dicha Zelianivan Arkana <51877647+elianiva@users.noreply.github.com> Date: Wed May 21 00:36:02 2025 +0700 feat: better UI for marketplace item list (#11) * feat: better UI for marketplace item list * feat: better source config UI * refactor: change how we fetch items * fix: update state more optimistically * fix: incorrect tags filter * fix: better tags filtering * feat: more consistent UI * feat: marketplace animation * fix: remove cache, it's fast enough * refactor: make the UI more consistent across themes * feat: integrate install metadata to UI * feat: add translation files * test: add marketplace UI commit 1a11665672 Author: Trung Dang <dangquoctrung123@gmail.com> Date: Mon May 19 23:08:25 2025 +0700 feat: `installedMetadata` MVP (#10) * feat: `installedMetadata` MVP * feat: removal support for installed items (+ general refactors) commit e25b3e77c0 Author: NamesMT <dangquoctrung123@gmail.com> Date: Tue May 6 08:40:19 2025 +0000 refactor: minor: cleanup marketplaceHandler passing commit 3dcb4534f8 Author: NamesMT <dangquoctrung123@gmail.com> Date: Tue May 6 07:53:43 2025 +0000 chore: add reusable `globalContext` util commit b7fae4a325 Author: NamesMT <dangquoctrung123@gmail.com> Date: Tue May 6 06:55:33 2025 +0000 chore(cline_docs/marketplace): align with `Roo-Code-Marketplace` commit f89c11ec67 Author: Trung Dang <dangquoctrung123@gmail.com> Date: Mon May 5 14:35:19 2025 +0700 feat(marketplace): UI form for configurable install (#9) * feat(wip): installation UI * chore: rebase, refactor and fixes --------- Co-authored-by: elianiva <51877647+elianiva@users.noreply.github.com> commit bbd790f4bd Author: Trung Dang <dangquoctrung123@gmail.com> Date: Sun May 4 12:36:52 2025 +0700 chore: bump `roo-rocket` and `config-rocket` version (#7) This is a breaking change that reword a lot of thing, revise the config props, and adds some more features. commit 562c34b9b7 Author: NamesMT <dangquoctrung123@gmail.com> Date: Sat May 3 14:57:53 2025 +0000 chore(MM/roo-rocket): shorten and pin CLI version commit a25ed006d6 Author: NamesMT <dangquoctrung123@gmail.com> Date: Fri May 2 16:48:39 2025 +0000 chore: adjust `registry` dir find & validate logic commit 065c8af320 Author: NamesMT <dangquoctrung123@gmail.com> Date: Fri May 2 16:27:47 2025 +0000 chore: `showInstallButton` for `package` item commit 563b327007 Author: Trung Dang <dangquoctrung123@gmail.com> Date: Fri May 2 23:16:26 2025 +0700 chore: marketplace wordings, cleanup, and document refresh (#6) * chore: reword all `PackageManager` => `Marketplace` * chore: document refresh, `mcp-server` => `mcp` * chore: correct word * chore: remove unnecessary condition * chore: remove unnecessary bits * chore: add note for failed test commit c0638798d8 Author: NamesMT <dangquoctrung123@gmail.com> Date: Fri May 2 05:13:35 2025 +0000 tests: prepare required mocks for `MarketplaceItemActionsMenu` commit 39b2638c6a Author: NamesMT <dangquoctrung123@gmail.com> Date: Fri May 2 05:12:55 2025 +0000 chore: remove tests specific to `MarketplaceItemActionsMenu` from ItemCard test file commit 03974e82b2 Author: NamesMT <dangquoctrung123@gmail.com> Date: Fri May 2 05:10:35 2025 +0000 refactor: move `isValidUrl` to global util, prop/scope cleaning commit 8ea74f77dd Author: NamesMT <dangquoctrung123@gmail.com> Date: Fri May 2 04:28:35 2025 +0000 chore: bump `roo-rocket`, `config-rocket` (fix tests) commit bbfbaa1b30 Author: NamesMT <dangquoctrung123@gmail.com> Date: Wed Apr 30 19:47:08 2025 +0000 fix: use relative path import instead commit 7274092a6b Author: NamesMT <dangquoctrung123@gmail.com> Date: Wed Apr 30 19:30:57 2025 +0000 fix: should display N/A instead of `All` for unknown types commit 8fbc2d95a2 Author: NamesMT <dangquoctrung123@gmail.com> Date: Wed Apr 30 16:58:16 2025 +0000 style: minor indent & import combine commit 765764790a Author: NamesMT <dangquoctrung123@gmail.com> Date: Wed Apr 30 16:56:48 2025 +0000 perf: verify binary hash right after download commit bc60b426b5 Author: NamesMT <dangquoctrung123@gmail.com> Date: Wed Apr 30 16:54:27 2025 +0000 fix: resolve lint problems commit 9354a80b1a Author: NamesMT <dangquoctrung123@gmail.com> Date: Wed Apr 30 16:48:39 2025 +0000 fix: bump version and lockfile, adjust import commit 6a4dc46c80 Merge: 29d73dce 324be54e Author: JB Brown <jb.brown@smartsheet.com> Date: Tue Apr 29 06:57:25 2025 -0700 Merge pull request #5 from NamesMT/marketplace/roo-rocket feat: marketplace install MVP commit 324be54e4e Author: NamesMT <dangquoctrung123@gmail.com> Date: Mon Apr 28 15:02:59 2025 +0000 chore: minor rewording commit 086523655b Author: NamesMT <dangquoctrung123@gmail.com> Date: Mon Apr 28 14:48:52 2025 +0000 feat: working CLI interactive install mode commit 3ac4bf61f2 Author: NamesMT <dangquoctrung123@gmail.com> Date: Mon Apr 28 12:16:35 2025 +0000 feat: binary configurable pack detection, auto-select installation method commit 3539550b0c Author: NamesMT <dangquoctrung123@gmail.com> Date: Mon Apr 28 10:52:04 2025 +0000 feat: delegate the hooks declaration to `roo-rocket`, prepare for CLI feat commit 26be7b3ac7 Author: NamesMT <dangquoctrung123@gmail.com> Date: Mon Apr 28 07:54:10 2025 +0000 fix: should not require workspace folder for `global` install (+ formatting) commit 74a0c44d59 Author: NamesMT <dangquoctrung123@gmail.com> Date: Mon Apr 28 06:57:39 2025 +0000 feat: marketplace supports global install commit 04d7360da9 Author: NamesMT <dangquoctrung123@gmail.com> Date: Sun Apr 27 20:41:07 2025 +0000 fix: correct error message commit 52b653f271 Author: NamesMT <dangquoctrung123@gmail.com> Date: Sun Apr 27 20:24:07 2025 +0000 feat: marketplace install MVP commit 29d73dce4c Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Sun Apr 27 00:11:00 2025 -0400 Knip fixes commit 0e7a14e68a Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Sun Apr 27 00:02:10 2025 -0400 Shouldn't need to change this commit 1a6a41d8c0 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Sat Apr 26 23:54:16 2025 -0400 Revert unrelated changes commit c9449ca2fe Merge: 4f5b04b6 1924e10e Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Sat Apr 26 23:51:13 2025 -0400 Merge remote-tracking branch 'origin/main' into jbbrown/marketplace commit 1924e10e72 Author: Chris Estreich <cestreich@gmail.com> Date: Sat Apr 26 09:45:26 2025 -0700 Fix all linter errors (and fix the lint scripts too) (#2958) commit 418791a743 Author: Julio Navarro <julioocz@gmail.com> Date: Sat Apr 26 08:46:05 2025 -0400 Fix: custom modes export import (#2810) * Enhance export method in ContextProxy to filter out project custom modes, ensuring only global settings are included in the export. * Fix issue of customModes not being imported when importing settings. The problem was that the Custom modes are managed by the CustomModesManager, not by the context proxy. * * Fix tests * Update webviewMessageHandler to provide customModeManager to importSettings commit 42c1f5f882 Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Fri Apr 25 21:03:17 2025 -0700 Changeset version bump (#2957) * changeset version bump * Update package.json * Update package-lock.json * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit d6860e1114 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri Apr 25 23:53:45 2025 -0400 Update contributors list (#2946) docs: update contributors list [skip ci] Co-authored-by: mrubens <mrubens@users.noreply.github.com> commit 5b99e4d50d Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Fri Apr 25 23:51:13 2025 -0400 Updated tips (#2961) * Updated tips * Changeset commit 83133c6e6d Author: Sacha Sayan <sacha.sayan@gmail.com> Date: Fri Apr 25 22:39:11 2025 -0400 UI top down homescreen (#2951) * isotrUpdate welcome screen UI components and fix unused variable * Save collapsibility. * Add persistence, locales. * Top layout, expanded tips. * Minimal 'tasks' language. * Adjust announcement positioning/dimensions. * Fix tests, defaults. * Fix translations. * Compromise-compromise. * Final tweaks. * More tweaks. * More tweaks. * Issues fix. * Update translations, remove debug. * Fix transparency issue. --------- Co-authored-by: hannesrudolph <hrudolph@gmail.com> commit de22566ea2 Author: Tony Zhang <157202938+zhangtony239@users.noreply.github.com> Date: Sat Apr 26 08:13:13 2025 +0800 Fix: word wrapping in Roo message title (#2948) commit e3d55a36ac Author: shariqriazz <ishariqriaz@gmail.com> Date: Fri Apr 25 15:49:19 2025 -0700 docs: fix file paths in settings.md (#2930) commit c8b5cdf7b2 Author: Chris Estreich <cestreich@gmail.com> Date: Fri Apr 25 15:24:03 2025 -0700 Omit reasoning params for non-reasoning models (#2932) commit cb29e9d56f Author: Chris Estreich <cestreich@gmail.com> Date: Fri Apr 25 15:23:25 2025 -0700 Remove ModelInfo objects from settings (#2939) commit a354c01b0e Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Fri Apr 25 16:06:50 2025 -0400 Add Boomerang as a default mode (#2934) * Add Boomerang as a default mode * Rename boomerang, add emoji commit 547874eed7 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Fri Apr 25 16:04:38 2025 -0400 Revert "Fix: Preserve editor state and prevent tab unpinning during diffs" (#2956) Revert "Fix: Preserve editor state and prevent tab unpinning during diffs (#2…" This reverts commit c2dd743aeb. commit 06db547308 Author: Chris Estreich <cestreich@gmail.com> Date: Fri Apr 25 10:32:35 2025 -0700 Use a WASM-based tiktoken implementation (#2859) * Use a WASM-based tiktoken implementation * Clean up imports commit 7e76736e13 Author: pugazhendhi-m <132246623+pugazhendhi-m@users.noreply.github.com> Date: Fri Apr 25 17:06:25 2025 +0530 Updates default model for Unbound (#2944) * Updates default model for Unbound * Adds changeset --------- Co-authored-by: Pugazhendhi <pugazhendhi@unboundsecurity.ai> commit 586e43bd55 Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Thu Apr 24 16:41:26 2025 -0700 Changeset version bump (#2926) * changeset version bump * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Chris Estreich <cestreich@gmail.com> commit 0dfbae64f3 Author: Chris Estreich <cestreich@gmail.com> Date: Thu Apr 24 16:34:22 2025 -0700 Allow users to toggle Gemini caching on / off for OpenRouter (#2927) commit 5c2511e355 Author: KJ7LNW <93454819+KJ7LNW@users.noreply.github.com> Date: Thu Apr 24 16:28:09 2025 -0700 feat: compress terminal output with backspace characters (#2907) Follow-up to #2562 adding support for backspace character compression. Optimizes terminal output by handling backspace characters similar to carriage returns, improving readability of progress spinners and other terminal output that uses backspace for animation. - Added processBackspaces function using efficient indexOf approach - Added comprehensive test suite for backspace handling - Integrated with terminal output compression pipeline Signed-off-by: Eric Wheeler <roo-code@z.ewheeler.org> Co-authored-by: Eric Wheeler <roo-code@z.ewheeler.org> commit 23aa3b636b Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Apr 24 19:26:00 2025 -0400 Update contributors list (#2903) docs: update contributors list [skip ci] Co-authored-by: cte <cte@users.noreply.github.com> commit a3f1a3f3ad Author: Chris Estreich <cestreich@gmail.com> Date: Thu Apr 24 14:20:09 2025 -0700 Gemini caching improvements (#2925) commit 7f99c0691e Author: asychin <asychin@crypton.studio> Date: Fri Apr 25 03:03:30 2025 +0700 feat/add-russian-lang (#2909) * rus * sad * fix lang * Add ru to translate mode instructions * Add ru to evals types * Add link to READMEs * Bring back smart quotes * Add prompt caching translations --------- Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit b75379bed3 Author: Chris Estreich <cestreich@gmail.com> Date: Thu Apr 24 12:29:36 2025 -0700 Improve OpenRouter model fetching (#2922) commit ad4782b766 Author: Chris Estreich <cestreich@gmail.com> Date: Thu Apr 24 12:28:43 2025 -0700 Add an option to enable prompt caching (#2924) commit 31600ed3c9 Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Thu Apr 24 09:27:32 2025 -0700 Changeset version bump (#2919) * changeset version bump * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Chris Estreich <cestreich@gmail.com> commit d46a9b484c Author: Chris Estreich <cestreich@gmail.com> Date: Thu Apr 24 09:24:56 2025 -0700 v3.14.1 (#2920) commit fb91836203 Author: Chris Estreich <cestreich@gmail.com> Date: Thu Apr 24 09:15:56 2025 -0700 Revert Gemini caching, fix OR supports cache issue (#2918) commit 9b73965867 Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Wed Apr 23 21:51:24 2025 -0700 Changeset version bump (#2877) * changeset version bump * Update CHANGELOG.md * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit 2e9b1f1824 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Thu Apr 24 00:44:24 2025 -0400 v3.14.0 (#2902) commit 37a8a442ac Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Apr 24 00:31:27 2025 -0400 Update contributors list (#2871) docs: update contributors list [skip ci] Co-authored-by: mrubens <mrubens@users.noreply.github.com> commit b5ffaf1ba2 Author: Yikai Liao <lyk-boya@outlook.com> Date: Thu Apr 24 12:22:47 2025 +0800 Fix Terminal Carriage Return Handling for Correct Progress Bar Display (#2562) * fix(terminal): Ensure correct handling of carriage returns for progress bars This commit refines the tests for `TerminalProcess` to ensure the correct interpretation of terminal output containing carriage returns (`\\r`), which is essential for properly handling dynamic elements like progress bars (e.g., `tqdm`). - Validated the `processCarriageReturns` method's behavior in simulating terminal line overwrites caused by `\\r`. - Corrected the expectation in the `handles carriage returns in mixed content` test to accurately reflect the method's output (final line content + preserved escape sequences), confirming the logic works as intended for progress-bar-like updates. - Fixed a minor Jest `toBe` syntax error in a related test case. - Suppressed an expected `console.warn` in the non-shell-integration test for cleaner logs. By ensuring `processCarriageReturns` is correctly tested, we increase confidence that the component responsible for pre-processing terminal output handles progress bars appropriately before the output is potentially used elsewhere (e.g., sent to an LLM). * fix(test): Make TerminalProcess integration test reliable This commit fixes the flaky test case `integrates with getUnretrievedOutput to handle progress bars` in `TerminalProcess.test.ts`. The test previously failed intermittently due to: 1. Relying on a fixed `setTimeout` duration to wait for asynchronous stream processing, which created a race condition. 2. Incorrectly assuming that `await terminalProcess.run(...)` would return the final output directly via its resolved value. The fix addresses these issues by: - Removing the unreliable intermediate check based on `setTimeout`. - Modifying the test to correctly obtain the final output by listening for the `completed` event emitted by `TerminalProcess`, which is the intended way to receive the result. This ensures the test accurately reflects the behavior of `TerminalProcess` and is no longer prone to timing-related failures. * Add changeset for terminal carriage return fix * Implement terminal compress progress bar feature This commit introduces a new feature to compress terminal output by processing carriage returns. The `processCarriageReturns` function has been integrated into the `Terminal` class to handle progress bar updates effectively, ensuring only the final state is displayed. Additionally, the `terminalCompressProgressBar` setting has been added to the global settings schema, allowing users to enable or disable this feature. Tests have been updated to validate the new functionality and ensure correct behavior in various scenarios. A Benchmark is also added to test the performance. Not that there is still no i18n support for this. * Add i18n support for compressProgressBar setting in multiple languages * Optimize processCarriageReturns function for performance and multi-byte character handling This commit enhances the `processCarriageReturns` function by implementing in-place string operations to improve performance, especially with large outputs. Key features include: - Line-by-line processing to maximize chunk handling. - Use of string indexes and substring operations instead of arrays. - Single-pass traversal of input for efficiency. - Special handling for multi-byte characters to prevent corruption during overwrites. Additionally, tests have been updated to validate the new functionality, ensuring correct behavior with various character sets, including emojis and non-ASCII text. Highly Density CR case is added to Benchmark * slight performance improvement by caching several variable * Optimize multi-byte character handling in processCarriageReturns Refactor the logic within the `processCarriageReturns` function to simplify the detection of partially overwritten multi-byte characters (e.g., emojis). Removed redundant checks and clarified the conditions for identifying potential character corruption during carriage return processing. This improves code readability and maintainability while preserving the original functionality of replacing potentially corrupted characters with a space. Also enforced consistent use of semicolons for improved code style. * docs: standardize carriage return (\r) and line feed (\n) terminology Improve code clarity by consistently adding escape sequence notation to all references of carriage returns and line feeds throughout documentation and tests. This makes the code more readable and avoids ambiguity when discussing these special characters. * feat: Improve terminal output processing clarity and settings UI - Add detailed comments to `processCarriageReturns` explaining line feed handling. - Relocate `terminalCompressProgressBar` setting below `terminalOutputLineLimit` for better context in UI. * Fix: Compress Progress Bar Setting Checkbox --------- Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit 3b65023d0b Author: axb <uaxb@hotmail.com> Date: Thu Apr 24 12:12:07 2025 +0800 feat(diff): improve progress indicator for apply_diff tool (#2758) Add animated dots to progress indicator based on content length Optimize when progress updates are shown (every 10 characters) Move searchBlockCount calculation inside conditional blocks Skip unnecessary ask operations when toolProgressStatus is empty commit c228e638b9 Author: Hannes Rudolph <hrudolph@gmail.com> Date: Wed Apr 23 15:43:36 2025 -0600 Update insert_content tool description for clarity and detail (#2892) commit 41db2cad43 Author: Hannes Rudolph <hrudolph@gmail.com> Date: Wed Apr 23 15:42:59 2025 -0600 Update search_and_replace tool description for clarity and detail (#2891) commit a53f604e3a Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Wed Apr 23 16:46:52 2025 -0400 Disable OpenRouter Gemini caching for now (#2890) commit 03925d25b0 Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 23 13:26:59 2025 -0700 Fix code cli flag in evals (#2889) commit 1543713c32 Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 23 13:24:22 2025 -0700 Don't immediately show an model ID error when changing API providers (#2888) commit 2c40224f6f Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 23 12:20:13 2025 -0700 Fix task size cache TTL (#2887) commit 72962b3c76 Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 23 12:09:24 2025 -0700 Split api and chat message persistence into a separate module (#2866) commit 230e953e5d Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 23 11:42:22 2025 -0700 Throttle calls to calculate task folder size (#2885) commit b421636a2c Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 23 11:41:06 2025 -0700 Properly hide cache section of task header (#2884) commit a08461a655 Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 23 11:35:50 2025 -0700 Gemini prompt caching (#2827) commit 31d4b656d0 Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 23 11:21:35 2025 -0700 Package material icons in vsix (#2882) * Package material icons in vsix * Add changeset commit a77be28a95 Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 23 11:16:20 2025 -0700 Use formatLargeNumber on token counts in task header (#2883) * Format large numbers * Add changeset commit 970ccd7879 Author: Daniel <57051444+daniel-lxs@users.noreply.github.com> Date: Wed Apr 23 12:21:32 2025 -0500 feat: add other useful variables to the custom system prompt (#2879) commit 4606e9a6cc Author: Dicha Zelianivan Arkana <51877647+elianiva@users.noreply.github.com> Date: Wed Apr 23 22:57:50 2025 +0700 fix(chat): better loading feedback (#2750) * fix(chat): better loading feedback * fix(chat): missing loading aria role Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> * refactor(chat): use vscode loading for more consistency --------- Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> commit 80912d0919 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Wed Apr 23 09:47:19 2025 -0400 v13.3.3 (#2876) commit a9ca17717c Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 23 06:45:57 2025 -0700 OpenRouter Gemini caching (#2847) * OpenRouter Gemini caching * Fix tests * Remove unsupported models * Clean up the task header a bit * Update src/api/providers/openrouter.ts Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> * Remove model that doesn't seem to work --------- Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> commit e53d299acf Author: mlopezr <mlopezr@users.noreply.github.com> Date: Wed Apr 23 15:36:50 2025 +0200 Allow Amazon Bedrock Marketplace ARNs (#2874) * Update validate.ts Allow ARNs from Bedrock Marketplace, which are different because models are deployed using SageMaker Inference behind the scenes. * Update bedrock.ts Allow ARNs from Bedrock Marketplace, which are different because models are deployed using SageMaker Inference behind the scenes. commit 844753e0d9 Author: Dominik Oswald <6849456+d-oit@users.noreply.github.com> Date: Wed Apr 23 15:34:32 2025 +0200 Remove unnecessary cost calculation from vscode-lm.ts (#2875) * feat: Removed unnecessary cost calculation * Update vscode-lm.ts --------- Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit 74faacd69d Author: Wojciech Kordalski <wkordalski@pm.me> Date: Wed Apr 23 10:42:06 2025 +0200 FakeAI "controller" object must not be copied (#2463) The FakeAI object passed by the user must be exactly the same object that is passed to FakeAIHandler via API configuration. Unfortunatelly, as the VSCode global state is used as configuration storage, we lose this property (VSCode global state creates copies of the object). Also the class of the stored object is lost, so methods of the object are unavailable. Therefore, we store the original objects in global variable and use ID field of FakeAI object to identify the original object. commit e403a96e66 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed Apr 23 03:14:08 2025 -0400 Update contributors list (#2867) docs: update contributors list [skip ci] Co-authored-by: mrubens <mrubens@users.noreply.github.com> commit 01a7a66ca0 Author: Trung Dang <dangquoctrung123@gmail.com> Date: Wed Apr 23 14:13:04 2025 +0700 feat: add `injectEnv` util, support env ref in mcp config (#2679) * feat: support environment variables reference in mcp `env` config * tests(src/utils/config): add test for `injectEnv` * fix(injectEnv): use `env == null` and `??` check instead of `!env`, `||` * refactor: remove unnecessary type declare * chore!: simplify regexp, remove replacement for env vars with dots commit 3df9eac5b7 Author: Dicha Zelianivan Arkana <51877647+elianiva@users.noreply.github.com> Date: Wed Apr 23 14:09:29 2025 +0700 fix(mention): conditionally remove aftercursor content (#2732) commit 33ee5d6c34 Author: hongzio <11085613+hongzio@users.noreply.github.com> Date: Wed Apr 23 16:06:48 2025 +0900 Fix: focusInput open roo code panel (#2626) (#2817) * Fix: focusInput open roo code panel (#2626) * Fix: `roo-cline.focusInput` open roo code panel * fixup! Fix: focusInput open roo code panel (#2626) commit 3a5913ffca Author: Alfredo Medrano <alfredomedranosanchez@gmail.com> Date: Wed Apr 23 01:05:47 2025 -0600 Bugfix/fix vscodellm model information (#2832) * feat: initialize VS Code Language Model client in constructor * feat: add VS Code LLM models and configuration * feat: integrate VS Code LLM models into API configuration normalization * Fix tests --------- Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit c2dd743aeb Author: seedlord <boklu@hotmail.de> Date: Wed Apr 23 08:45:35 2025 +0200 Fix: Preserve editor state and prevent tab unpinning during diffs (#2857) - Maintains editor view column state when closing and reopening files during diff operations, ensuring tabs stay opened in their original position. - Prevents closing the original editor tab when opening the diff view, preserving pinned status when applying changes via write_to_file or apply_diff. - Updates VSCode workspace launch flag from -n to -W for compatibility. commit 3d129e8a89 Author: Hannes Rudolph <hrudolph@gmail.com> Date: Wed Apr 23 00:35:10 2025 -0600 fix: allow opening files without workspace root (#1054) * fix: allow opening files without workspace root The openFile function in open-file.ts was requiring a workspace root to be present, which prevented opening global files (like MCP settings) when no workspace was open. Modified the function to handle absolute paths without this requirement. Previously, trying to open MCP settings in a new window without a workspace would error with "Could not open file: No workspace root found". Now the function properly handles both workspace-relative and absolute paths, allowing global settings files to be accessed in any context. Changes: - Removed workspace root requirement in openFile - Added fallback for relative paths when no workspace is present * fix: update openFile function to use provided path without modification --------- Co-authored-by: Roo Code <support@roo.vet> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit 0f64849542 Author: Daniel <57051444+daniel-lxs@users.noreply.github.com> Date: Wed Apr 23 00:09:14 2025 -0500 feat: allow variable interpolation into the custom system prompt (#2863) * feat: allow variable interpolation into the custom system prompt * fix: allow the test to pass on windows by using the path module commit c6f91a3b2f Author: System233 <cdkeylzh@outlook.com> Date: Wed Apr 23 03:40:33 2025 +0800 Fix error message not showing after canceling API request (#2845) commit 1a376c262e Author: Dicha Zelianivan Arkana <51877647+elianiva@users.noreply.github.com> Date: Wed Apr 23 02:39:45 2025 +0700 [DRAFT] feat(menu): use material icons for files and folders (#2739) feat(menu): use material icons for files and folders commit 4f5b04b6c9 Merge: 2c6ef8a1 62d55893 Author: JB Brown <jb.brown@smartsheet.com> Date: Tue Apr 22 12:30:06 2025 -0700 Merge pull request #4 from Smartsheet-JB-Brown/hobbsessr/fix-marketplace-redraw-issue Hobbsessr/fix marketplace redraw issue commit 62d5589397 Author: HobbesSR <20545418+HobbesSR@users.noreply.github.com> Date: Tue Apr 22 12:16:01 2025 -0500 Fix marketplace tab switching and redraw issue that occurred every 30 seconds commit 0d561f8a27 Author: System233 <cdkeylzh@outlook.com> Date: Tue Apr 22 22:12:29 2025 +0800 Fix redundant 'TASK RESUMPTION' prompts (#2842) commit 8ac911244c Author: System233 <cdkeylzh@outlook.com> Date: Tue Apr 22 22:10:34 2025 +0800 Fix user feedback not being added to conversation history in API error state (#2844) Fix user feedback not being added to conversation history in the API error state commit f1c79759a0 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Tue Apr 22 00:15:46 2025 -0400 Add line wrapping to MCP arguments (#2831) commit 3e2d20f37c Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Mon Apr 21 22:57:58 2025 -0400 Search and replace fixes (#2830) * Allow replacing with an empty string * Visual cleanup commit 8b5d48013e Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Mon Apr 21 22:39:39 2025 -0400 Fix MCP hub lookup during view transition (#2829) commit b6ea9d1465 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon Apr 21 21:22:54 2025 -0400 Update contributors list (#2803) docs: update contributors list [skip ci] Co-authored-by: mrubens <mrubens@users.noreply.github.com> commit ff5430a95c Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Mon Apr 21 21:18:25 2025 -0400 Try adding better errors for write_to_file truncated output (#2821) commit f06567d579 Author: Sam Hoang Van <samhv.ict@gmail.com> Date: Tue Apr 22 03:49:27 2025 +0700 Feat/improve insert block content (#2510) * refactor: enhance insertGroups and insertContentTool for better handling of insertion operations * refactor: simplify insert_content tool - Remove operations-based implementation in favor of single line insertion - Update parameters from operations to line and content - Simplify insertion logic and error handling - Update tool description and documentation - Remove XML parsing for operations - Clean up code and improve error messages * refactor: remove insert_content experiment and related tests * Remove the append_to_file tool * Improvements to chat row and instructions --------- Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit 80b298492c Author: Sam Hoang Van <samhv.ict@gmail.com> Date: Tue Apr 22 02:25:03 2025 +0700 improve search and replace tool (#2764) * Refactor search and replace tool * feat(search-replace): enhance search/replace tool UI and messaging Refactor search/replace tool message structure for better consistency Add dedicated UI component for displaying search/replace operations Add i18n support for search/replace operations in all supported languages Improve partial tool handling in searchAndReplaceTool * Remove search_and_replace experiment and related references commit 61e23cccb6 Author: Chris Estreich <cestreich@gmail.com> Date: Mon Apr 21 11:04:35 2025 -0700 Record tool use errors encountered during eval runs (#2816) commit a244a9dc21 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Mon Apr 21 13:54:02 2025 -0400 Fix a bad search/replace when moving tools into their own files (#2815) commit b955dbc1fc Author: Daniel Trugman <dtrugman@gmail.com> Date: Mon Apr 21 16:56:02 2025 +0100 Requesty models behind api key (#2813) * Don't fetch Requesty models on startup, only when opening settings * Provide api key when fetching models commit f1c3edeb75 Author: Felix NyxJae <52313587+NyxJae@users.noreply.github.com> Date: Mon Apr 21 21:27:24 2025 +0800 Fix: Improve drag-and-drop and SSH path handling (#2808) * Fix: Correct path handling for dragged files on Windows * Fix: Improve drag-and-drop and SSH path handling commit 29137fbfec Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Mon Apr 21 00:24:52 2025 -0400 Revert changes on omitted line count in write_to_file (#2807) commit 2c6ef8a184 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Sun Apr 20 20:56:53 2025 -0700 allow relative path from pacakge items to outside of packages directory commit 19df13c760 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Sun Apr 20 23:28:19 2025 -0400 Add a warning display when a system prompt override is active (#2804) commit d2e5019f88 Author: Dicha Zelianivan Arkana <51877647+elianiva@users.noreply.github.com> Date: Mon Apr 21 09:04:23 2025 +0700 fix(icons): use geometricPrecision to avoid blurriness (#2756) commit 47230d5a5c Author: Dicha Zelianivan Arkana <51877647+elianiva@users.noreply.github.com> Date: Mon Apr 21 08:46:01 2025 +0700 fix(action): handle edge case for add to context action (#2780) commit 612b948193 Author: Sacha Sayan <sacha.sayan@gmail.com> Date: Sun Apr 20 21:38:08 2025 -0400 Refactor: Use path aliases in webview source files. (#2801) * Refactor: Use path aliases in webview source files. * Add module resolution to root jest config. * Add tests. Broken import. Another broken import. Broken test. commit cf54c7d820 Author: Sacha Sayan <sacha.sayan@gmail.com> Date: Sun Apr 20 21:19:42 2025 -0400 Quickfix: Change cloud-download icon to more appropriate desktop-download icon. (#2802) commit eeb73c3c06 Author: Nico Bihan <nicolas.bihan@wellsky.com> Date: Sat Apr 19 23:30:20 2025 -0500 Adds Gemini 2.5 Flash "thinking" model to Vertex AI Provider (#2794) commit ed102d1850 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Sat Apr 19 15:43:27 2025 -0400 Remove the strict line bounds check from the diff (#2790) commit 2205606118 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Sat Apr 19 14:26:35 2025 -0400 Remove globby as it's no longer used (#2788) commit 5d0aa20f97 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Sat Apr 19 14:13:45 2025 -0400 Switch list files from globby to ripgrep (#2689) * Switch list files from globby to ripgrep * PR feedback * PR fix commit c5f48a8bc6 Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Fri Apr 18 21:14:30 2025 -0700 Changeset version bump (#2777) * changeset version bump * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Chris Estreich <cestreich@gmail.com> commit 8c18727f9a Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri Apr 18 21:13:43 2025 -0700 Update contributors list (#2779) docs: update contributors list [skip ci] Co-authored-by: cte <cte@users.noreply.github.com> commit e74b69dfbc Author: Chris Estreich <cestreich@gmail.com> Date: Fri Apr 18 21:01:21 2025 -0700 v3.13 announcement (#2778) * v3.13 announcement * Update README.md * Update lastShownAnnouncementId * Tweak copy commit c10600e354 Author: Chris Estreich <cestreich@gmail.com> Date: Fri Apr 18 19:25:42 2025 -0700 Pass baseURL to Gemini API if googleGeminiBaseUrl is set (#2776) commit b8b90737fa Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Fri Apr 18 17:39:24 2025 -0700 Changeset version bump (#2768) * changeset version bump * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Chris Estreich <cestreich@gmail.com> commit 5eaf8ba876 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Fri Apr 18 16:48:28 2025 -0700 fix regex in response to security scan concern in CI build commit 130493e43d Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Fri Apr 18 15:25:35 2025 -0700 fix renaming bug for locales commit 2a5d472f0d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri Apr 18 15:14:38 2025 -0700 Update contributors list (#2770) docs: update contributors list [skip ci] Co-authored-by: cte <cte@users.noreply.github.com> commit d5fe876c9b Author: Chris Estreich <cestreich@gmail.com> Date: Fri Apr 18 14:56:01 2025 -0700 v3.13.1 (#2774) commit 1a05a4190f Merge: a122dc74 96ff9fc3 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Fri Apr 18 14:52:12 2025 -0700 Merge branch 'main' into jbbrown/marketplace commit a122dc7465 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Fri Apr 18 11:08:21 2025 -0700 fix failing tests from state management changes commit 96ff9fc380 Author: Chris Estreich <cestreich@gmail.com> Date: Fri Apr 18 14:43:27 2025 -0700 Fix pricing for Gemini 2.5 Flash (Thinking) (#2773) * Fix pricing for Gemini 2.5 Flash (Thinking) * Looks like it's actually $3.50 * We aren't honoring custom thinking token budgets on Vertex yet commit f6e4e3504f Author: Chris Estreich <cestreich@gmail.com> Date: Fri Apr 18 14:43:04 2025 -0700 Move executeCommand out of Cline and add telemetry for shell integration errors (#2771) commit 0bb5ec18c5 Author: Sacha Sayan <sacha.sayan@gmail.com> Date: Fri Apr 18 16:43:03 2025 -0400 UI: Auto-approve toggle styling tweak. (#2769) commit 5abea50cf1 Author: Chris Estreich <cestreich@gmail.com> Date: Fri Apr 18 12:26:17 2025 -0700 Support Gemini 2.5 Flash thinking (#2752) commit 968e19047b Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Fri Apr 18 10:23:02 2025 -0700 rebrand to Marketplace commit 6772306ade Author: Felix NyxJae <52313587+NyxJae@users.noreply.github.com> Date: Fri Apr 18 22:29:32 2025 +0800 Fix: Correct path handling for dragged files on Windows (#2753) commit b3065d2ab3 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri Apr 18 03:09:14 2025 -0400 Update contributors list (#2715) docs: update contributors list [skip ci] Co-authored-by: mrubens <mrubens@users.noreply.github.com> commit 31656d9b16 Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Thu Apr 17 23:47:41 2025 -0700 Changeset version bump (#2716) * changeset version bump * Update CHANGELOG.md * Update package.json * Update package-lock.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit c329b4509f Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Fri Apr 18 02:29:13 2025 -0400 v3.12.4 (#2745) commit 06882f5687 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Fri Apr 18 02:23:55 2025 -0400 Don't break if an end_line is passed into a diff (#2743) commit 87af3b3424 Author: Chris Estreich <cestreich@gmail.com> Date: Thu Apr 17 22:21:14 2025 -0700 Record tool usages in the `Cline` object, and persist them in the db for evals (#2729) commit 887d2ac330 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 21:52:31 2025 -0700 fix missing translations commit 9e2476c667 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 21:47:50 2025 -0700 attempt to fix failing test on windows in ci build commit c0f615bca7 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 21:40:26 2025 -0700 more memory pressure work commit b5a77e34a4 Author: Nico Bihan <nicolas.bihan@wellsky.com> Date: Thu Apr 17 23:35:06 2025 -0500 Fixes maximum token limit for Gemini provider 2.5 pro exp (#2737) Corrects the maximum token limit for the "gemini-2.5-pro-exp-03-25" model, ensuring accurate configuration. commit fffebf1a2e Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Fri Apr 18 00:28:55 2025 -0400 Remove experiment for append block (#2738) * Remove experiment for append block * Fix bugs in experiment lookups commit c84343dbbe Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 21:02:15 2025 -0700 reduce memory use during MetaDataScan commit b05c3100bd Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Thu Apr 17 23:25:35 2025 -0400 Fix context window bar color (#2733) * Fix context window bar color * Make task header cost badge match the other ones * Fix test commit 86636526bd Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Thu Apr 17 23:25:23 2025 -0400 Update the style of the suggestions (#2734) * Update the style of the suggestions * Cleanup commit 422aed61b7 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 20:21:16 2025 -0700 memory optimization and revert test command in package.json to main commit bea36c8977 Author: Nico Bihan <nicolas.bihan@wellsky.com> Date: Thu Apr 17 22:19:40 2025 -0500 Gemini 2.5 Flash Preview fix Max Tokens Count (#2735) Gemini 2.5 Flash Preview fix Max Tokens commit 93b96c3253 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 19:53:24 2025 -0700 attempt at memory cleanup commit 3cc3dab9e5 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 19:28:50 2025 -0700 change metadatascanner to be more memory efficient commit b7f45f7870 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 19:23:29 2025 -0700 reduce memory usage - avoid deep copy commit a2d7f19418 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 17:30:53 2025 -0700 round 5 commit 1cb77542e1 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 17:25:28 2025 -0700 round 4 commit 8a9240000c Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 17:20:14 2025 -0700 round 3 of locale CI fixes commit 724a2f2350 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 17:13:02 2025 -0700 another round of locale bugs in the CI build but not local commit 38d96fa4fb Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 17:06:07 2025 -0700 try to fix locale bugs that happen in CI build but not locally commit 78edc21f2e Merge: 1aea6b4d 3c937c38 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 16:53:19 2025 -0700 merge main commit 1aea6b4d9b Merge: 4f8799f1 92c55d54 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 15:54:34 2025 -0700 Merge hobbessr/metadatascanner-test-path-recursion-fix commit 92c55d542e Author: HobbesSR <20545418+HobbesSR@users.noreply.github.com> Date: Thu Apr 17 17:38:07 2025 -0500 Fix the MetaDataScanner.test.ts infinite recursion in its mock setup commit 3c937c3827 Author: Chris Estreich <cestreich@gmail.com> Date: Thu Apr 17 15:28:11 2025 -0700 Task header theme fixes (#2721) commit b077267b4a Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 15:25:11 2025 -0700 fixes image support in bedrock. regression from prompt cache implementation (#2723) fixes image support in bedrock. regression created during prompt caching implementation commit d86d601104 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Thu Apr 17 16:39:00 2025 -0400 Add gemini 2.5 flash preview (#2720) commit 4f8799f169 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 13:32:08 2025 -0700 fix localization bugs commit 471caff000 Author: Chris Estreich <cestreich@gmail.com> Date: Thu Apr 17 13:31:48 2025 -0700 Clean up types related to tools (#2719) commit 026091e432 Author: Hannes Rudolph <hrudolph@gmail.com> Date: Thu Apr 17 14:18:50 2025 -0600 Fix filename format in downloadTask function for markdown export (#2717) * Fix filename format in downloadTask function for markdown export * Update src/integrations/misc/export-markdown.ts Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> --------- Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> commit 1853ebaa9c Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Thu Apr 17 12:59:13 2025 -0700 add sourceUrl to support packages hosted external to the package manager repo commit 1e0e01b9f3 Author: Sam Hoang Van <samhv.ict@gmail.com> Date: Fri Apr 18 02:58:22 2025 +0700 feat: add append_to_file tool for appending content to files (#2712) - Implemented the append_to_file tool to allow users to append content to existing files or create new ones if they do not exist. - Updated the rules and instructions to include the new tool. - Added tests for the append_to_file functionality, covering various scenarios including error handling and content preprocessing. - Enhanced the experiment schema to include the new append_to_file experiment ID. - Updated relevant interfaces and types to accommodate the new tool. - Modified the UI to display the append_to_file tool in the appropriate sections. commit d3c37eaec8 Author: Chris Estreich <cestreich@gmail.com> Date: Thu Apr 17 10:23:19 2025 -0700 Add missing translation (#2714) * Add missing translation * More translation fixes commit 159e4005e5 Author: Sacha Sayan <sacha.sayan@gmail.com> Date: Thu Apr 17 12:54:55 2025 -0400 UI Glam Sesh: Makeover for TaskHeader, ChatView, HistoryPreview... (#2701) * - UI Glam Session -> Makeover for TaskHeader, ChatView, HistoryPreview, WelcomeView - In particular, display a "no tasks in workspace" message when no tasks are found. - Clean up Inferface Settings (not needed now) on Settings View - Copy updates throughout these areas. * Apply suggestions from code review Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> * Missing translation string. * Fix test * Fix tests * Improve translations / fix missing strings. * Support xAI for evals (#2703) * Make sure the slash commands only fire if they're the first character (#2702) * Update contributors list (#2675) docs: update contributors list [skip ci] Co-authored-by: mrubens <mrubens@users.noreply.github.com> * v3.12.3 (#2710) * Changeset version bump (#2711) * changeset version bump * Updating CHANGELOG.md format * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: R00-B0T <github-actions@github.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> * Update translations --------- Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> Co-authored-by: cte <cestreich@gmail.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Co-authored-by: R00-B0T <github-actions@github.com> commit 0736379ad0 Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Thu Apr 17 07:45:43 2025 -0700 Changeset version bump (#2711) * changeset version bump * Updating CHANGELOG.md format * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: R00-B0T <github-actions@github.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit 94842f21af Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Thu Apr 17 10:34:32 2025 -0400 v3.12.3 (#2710) commit d3ba74c568 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Apr 17 10:26:50 2025 -0400 Update contributors list (#2675) docs: update contributors list [skip ci] Co-authored-by: mrubens <mrubens@users.noreply.github.com> commit 511ebb7a98 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Thu Apr 17 07:55:53 2025 -0400 Make sure the slash commands only fire if they're the first character (#2702) commit 0374436fac Author: Chris Estreich <cestreich@gmail.com> Date: Wed Apr 16 23:08:58 2025 -0700 Support xAI for evals (#2703) commit 876742a887 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 21:41:30 2025 -0700 try another modification to the test script for windows out of memory errors in ci build commit 0c817af055 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 21:20:13 2025 -0700 increase max heap size to try and get windows passing in the CI build commit c27aa9c370 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 21:11:51 2025 -0700 heap cleanup commit e5556dd115 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 20:46:26 2025 -0700 attempt to incrase node heap size commit b7033133ad Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 20:36:46 2025 -0700 try a path change to see if it helps the CI build pass in the GitHub environment commit 981c7a1270 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 20:27:20 2025 -0700 rework git test to see if it helps in the CI build commit 68b0a1843d Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 20:23:12 2025 -0700 fix knip and missing translation errors commit 30c44ff14c Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Wed Apr 16 23:04:16 2025 -0400 Support dragging and dropping tabs into chat text area (#2698) commit 6e299c73f5 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 19:28:39 2025 -0700 update documentation commit 9a24ed46a2 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 18:02:38 2025 -0700 allow custom git domains to support internal dns at companies commit c2d840cc47 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 17:08:43 2025 -0700 remove console log statements used to debug tests commit 9c28626f24 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 16:31:24 2025 -0700 refactor: remove package manager state files commit a4a4532922 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 16:06:23 2025 -0700 fix typescript errors preventing succesful build commit ba5af60109 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Wed Apr 16 18:05:04 2025 -0400 Fix diff escaping issues (#2694) * Fix diff escaping issues * Potential fix for code scanning alert no. 75: Double escaping or unescaping Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> --------- Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> commit f04487cd3e Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 14:35:39 2025 -0700 All but 1 test passing commit a575d25252 Merge: 0caf685b 4bf746d6 Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 12:43:51 2025 -0700 Merge branch 'main' into jbbrown/package-manager * main: (161 commits) Changeset version bump (#2688) v3.12.2 (#2693) Add support for different reasoning effort (#2692) Add OpenAI o3 & 4o-mini (#2691) Add consecutive mistake count to diff error telemetry (#2687) refactor(context-menu): handle filename display better (#2684) Changeset version bump (#2683) Fix select dropdown styling (#2682) Changeset version bump (#2676) v3.12.0 (#2674) Fix configuration titles (#2672) feat: Add 'roo.acceptInput' command (#2598) Add xAI provider (#2667) Await checkpoint saves (except the initial) (#2665) Safe JSON parse in ChatRow (#2666) feat: Cost Display in Task Header - Suppress Zero Cost Values and Ensure Visibility for Gemini, OpenAI, LM Studio, and Ollama (#2662) test: limit Jest worker count to 40% per suite (#2658) DRY up the auto-approve toggles (#2664) Expose reasoning effort option for reasoning models on OpenRouter (#2483) Better string normalization for diffs (#2659) ... commit 0caf685b4f Author: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Date: Wed Apr 16 12:33:20 2025 -0700 rolled back unintended changes not related or needed to support package manager. first phases of build pass, but fail at type checking on things that don't seem related to what I've done commit 4bf746d635 Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Wed Apr 16 11:52:22 2025 -0700 Changeset version bump (#2688) * changeset version bump * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit 454df52462 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Wed Apr 16 14:47:35 2025 -0400 v3.12.2 (#2693) commit 43668e0429 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Wed Apr 16 14:16:51 2025 -0400 Add support for different reasoning effort (#2692) commit 250ea6867a Author: Peter Dave Hello <hsu@peterdavehello.org> Date: Thu Apr 17 02:10:10 2025 +0800 Add OpenAI o3 & 4o-mini (#2691) Reference: - https://platform.openai.com/docs/models/o3 - https://platform.openai.com/docs/models/o4-mini - https://openai.com/index/introducing-o3-and-o4-mini/ commit 9d761e23e2 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Wed Apr 16 12:02:49 2025 -0400 Add consecutive mistake count to diff error telemetry (#2687) commit 1d029ed0cb Author: Dicha Zelianivan Arkana <51877647+elianiva@users.noreply.github.com> Date: Wed Apr 16 20:46:06 2025 +0700 refactor(context-menu): handle filename display better (#2684) * refactor(context-menu): handle filename display better * refactor(context-menu): reduce string computation commit c980662728 Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Wed Apr 16 03:44:17 2025 -0700 Changeset version bump (#2683) * changeset version bump * Updating CHANGELOG.md format * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: R00-B0T <github-actions@github.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit 2d360dc59e Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Wed Apr 16 06:40:43 2025 -0400 Fix select dropdown styling (#2682) commit 923e391bb8 Author: R00-B0T <110429663+R00-B0T@users.noreply.github.com> Date: Tue Apr 15 22:22:03 2025 -0700 Changeset version bump (#2676) * changeset version bump * Updating CHANGELOG.md format * Update CHANGELOG.md * Update package.json * Update package-lock.json * Update CHANGELOG.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: R00-B0T <github-actions@github.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit e2d649dc50 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Wed Apr 16 01:16:06 2025 -0400 v3.12.0 (#2674) commit 82df05a297 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Tue Apr 15 23:09:18 2025 -0400 Fix configuration titles (#2672) commit 1cca4f47c7 Author: Aleksandr Kirillov <32141102+axkirillov@users.noreply.github.com> Date: Wed Apr 16 05:01:45 2025 +0200 feat: Add 'roo.acceptInput' command (#2598) * feat: Add 'roo.acceptInput' command * Update package.nls.json * Update translations --------- Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> commit 37f7d83792 Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Tue Apr 15 22:16:52 2025 -0400 Add xAI provider (#2667) * Add xAI provider * Add model reasoning effort * DRY this up * Handle undefined delta * Cleanup getModel to fix test * Add missing translations * Small type cleanup * Support temperature --------- Co-authored-by: cte <cestreich@gmail.com> commit 3b19d7a455 Author: Chris Estreich <cestreich@gmail.com> Date: Tue Apr 15 16:57:12 2025 -0700 Await checkpoint saves (except the initial) (#2665) commit 75a6bc100e Author: Matt Rubens <mrubens@users.noreply.github.com> Date: Tue … * fix: compatibility with latest version * chore: apply org change and re-add contributors Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> Co-authored-by: Smartsheet-JB-Brown <Smartsheet-JB-Brown@users.noreply.github.com> Co-authored-by: elianiva <51877647+elianiva@users.noreply.github.com> * refactor(marketplace): some UI adjustments (#13) * refactor(marketplace): add installed tabs * fix: missing settings button * refactor(marketplace): better card UI * refactor(marketplace): better error message for sources * tests(marketplace): item card and source config * refactor(marketplace): colocate local states * refactor(marketplace): simplify tabs * test: marketplace view --------- Co-authored-by: elianiva <51877647+elianiva@users.noreply.github.com> * chore: marketplace rebase to latest fixes * fix: use `yaml` instead of `js-yaml`, fix `config-rocket` missing, solve lint warn failure * feat(marketplace): `yaml` migrate for modes, + uninstall UX (remove empty) * fix(marketplace): IMM broken, can't install non-rocket binary * chore(marketplace): invoke to reload modes and mcps * perf(McpHub/reloadMcpServers): ensure no multiple reloads are running, ensure one last update * feat(i18n): add missing marketplace translations for all languages - Add missing 'done' and 'refresh' translations - Add missing source-related translations - Add missing tab translations - Ensure proper pluralization for each language - Fix formatting and structure consistency * fix knip issue * test: Add mock for kontroll module - Add CommonJS mock implementation of kontroll's countdown function - Add kontroll to moduleNameMapper in Jest config - Resolves 'Cannot find module kontroll' test errors * test: Add mock for execa module - Create CommonJS mock implementation of execa - Add execa to moduleNameMapper in Jest config - Resolves 'Cannot use import statement outside a module' error for execa * fix: Add semver format validation for version field - Add regex validation to ensure version field follows semver format - Fixes schema validation test for invalid version format - Supports major.minor.patch format with optional pre-release and build metadata * for now comment out failing marketplace tests after install and UI changes * For now skip marketplace UI tests that are failing after UI changes were made but tests not kept up to date * chore(marketplace): finishing touches (#14) * fix(marketplace): done should redirect to browse * test(marketplace): update outdated tests * refactor(marketplace): handle opening in non-workspace * feat(marketplace): put behind a feature flag * fix(marketplace): missing translations * fix: solve lint errors, make build-able * fix: use `cwd` instead of `filePaths` for ws detection * fix(marketplace): should dedupe items with same id from multiple registries * fix: tab cycle should not reach hidden content * fix: `mcp` filter --------- Co-authored-by: NamesMT <dangquoctrung123@gmail.com> * style(marketplace): refactor filter match ui, more accessible install button placement (#15) * refactor(marketplace): subtle 'match' style * chore: add translations * refactor(marketplace): move install ui button * test(marketplace): update outdated tests * chore: uniform to `roo-rocket` only, remove `config-rocket` Also solve a lint errror * chore: solve some lint and types errors * chore: remove `kontroll` use existing `lodash.debounce` from `main` head * test(marketplace): resolve some tests * Ellipsis feedback * Mock onDidChange * Update comment * Hack to make tests pass, like McpHub * Make tests pass on Windows * Remove handleCardClick * Add telemetry * Update packages/telemetry/src/TelemetryService.ts Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> * Fix translation * Better error handling when installing marketplace items * Move power steering to the bottom of experimental settings * Tweaks to experimental settings copy * Support prereqs * Refresh webview state after deleting MCP * PR feedback * Test cleanup * More PR feedback * Only load marketplace data when in experiment * Cleanup --------- Co-authored-by: NamesMT <dangquoctrung123@gmail.com> Co-authored-by: Smartsheet-JB-Brown <Smartsheet-JB-Brown@users.noreply.github.com> Co-authored-by: elianiva <51877647+elianiva@users.noreply.github.com> Co-authored-by: Smartsheet-JB-Brown <jb.brown@smartsheet.com> Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
2026-08-28 05:27:24 +00:00 · 2025-06-11 17:28:12 -04:00 · 2025-06-11 17:28:12 -04:00 · 5d8b16159b
commit 5d8b16159b
parent bf14b37edc
139 changed files with 8961 additions and 112 deletions
--- a/PRIVACY.md
+++ b/PRIVACY.md
@ -1,6 +1,6 @@
 # Roo Code Privacy Policy

-**Last Updated: March 7th, 2025**
+**Last Updated: June 10th, 2025**

 Roo Code respects your privacy and is committed to transparency about how we handle your data. Below is a simple breakdown of where key pieces of data go—and, importantly, where they don’t.

@ -11,6 +11,7 @@ Roo Code respects your privacy and is committed to transparency about how we han
 - **Prompts & AI Requests**: When you use AI-powered features, your prompts and relevant project context are sent to your chosen AI model provider (e.g., OpenAI, Anthropic, OpenRouter) to generate responses. We do not store or process this data. These AI providers have their own privacy policies and may store data per their terms of service.
 - **API Keys & Credentials**: If you enter an API key (e.g., to connect an AI model), it is stored locally on your device and never sent to us or any third party, except the provider you have chosen.
 - **Telemetry (Usage Data)**: We only collect feature usage and error data if you explicitly opt-in. This telemetry is powered by PostHog and helps us understand feature usage to improve Roo Code. This includes your VS Code machine ID and feature usage patterns and exception reports. We do **not** collect personally identifiable information, your code, or AI prompts.
+- **Marketplace Requests**: When you browse or search the Marketplace for Model Configuration Profiles (MCPs) or Custom Modes, Roo Code makes a secure API call to Roo Code’s backend servers to retrieve listing information. These requests send only the query parameters (e.g., extension version, search term) necessary to fulfill the request and do not include your code, prompts, or personally identifiable information.

 ### **How We Use Your Data (If Collected)**

--- a/packages/cloud/src/index.ts
+++ b/packages/cloud/src/index.ts
@ -1 +1,2 @@
 export * from "./CloudService"
+export * from "./Config"
--- a/packages/telemetry/src/TelemetryService.ts
+++ b/packages/telemetry/src/TelemetryService.ts
@ -152,6 +152,47 @@ export class TelemetryService {
 		this.captureEvent(TelemetryEventName.CONSECUTIVE_MISTAKE_ERROR, { taskId })
 	}

+	/**
+	 * Captures a marketplace item installation event
+	 * @param itemId The unique identifier of the marketplace item
+	 * @param itemType The type of item (mode or mcp)
+	 * @param itemName The human-readable name of the item
+	 * @param target The installation target (project or global)
+	 * @param properties Additional properties like hasParameters, installationMethod
+	 */
+	public captureMarketplaceItemInstalled(
+		itemId: string,
+		itemType: string,
+		itemName: string,
+		target: string,
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		properties?: Record<string, any>,
+	): void {
+		this.captureEvent(TelemetryEventName.MARKETPLACE_ITEM_INSTALLED, {
+			itemId,
+			itemType,
+			itemName,
+			target,
+			... (properties || {}),
+		})
+	}
+
+	/**
+	 * Captures a marketplace item removal event
+	 * @param itemId The unique identifier of the marketplace item
+	 * @param itemType The type of item (mode or mcp)
+	 * @param itemName The human-readable name of the item
+	 * @param target The removal target (project or global)
+	 */
+	public captureMarketplaceItemRemoved(itemId: string, itemType: string, itemName: string, target: string): void {
+		this.captureEvent(TelemetryEventName.MARKETPLACE_ITEM_REMOVED, {
+			itemId,
+			itemType,
+			itemName,
+			target,
+		})
+	}
+
 	/**
 	 * Captures a title button click event
 	 * @param button The button that was clicked
--- a/packages/types/src/experiment.ts
+++ b/packages/types/src/experiment.ts
@ -6,7 +6,12 @@ import type { Keys, Equals, AssertEqual } from "./type-fu.js"
 * ExperimentId
 */

-export const experimentIds = ["powerSteering", "concurrentFileReads", "disableCompletionCommand"] as const
+export const experimentIds = [
+	"powerSteering",
+	"marketplace",
+	"concurrentFileReads",
+	"disableCompletionCommand",
+] as const

 export const experimentIdsSchema = z.enum(experimentIds)

@ -18,6 +23,7 @@ export type ExperimentId = z.infer<typeof experimentIdsSchema>

 export const experimentsSchema = z.object({
 	powerSteering: z.boolean(),
+	marketplace: z.boolean(),
 	concurrentFileReads: z.boolean(),
 	disableCompletionCommand: z.boolean(),
 })
--- a/packages/types/src/telemetry.ts
+++ b/packages/types/src/telemetry.ts
@ -41,6 +41,9 @@ export enum TelemetryEventName {

 	AUTHENTICATION_INITIATED = "Authentication Initiated",

+	MARKETPLACE_ITEM_INSTALLED = "Marketplace Item Installed",
+	MARKETPLACE_ITEM_REMOVED = "Marketplace Item Removed",
+
 	SCHEMA_VALIDATION_ERROR = "Schema Validation Error",
 	DIFF_APPLICATION_ERROR = "Diff Application Error",
 	SHELL_INTEGRATION_ERROR = "Shell Integration Error",
@ -106,6 +109,8 @@ export const rooCodeTelemetryEventSchema = z.discriminatedUnion("type", [
 			TelemetryEventName.PROMPT_ENHANCED,
 			TelemetryEventName.TITLE_BUTTON_CLICKED,
 			TelemetryEventName.AUTHENTICATION_INITIATED,
+			TelemetryEventName.MARKETPLACE_ITEM_INSTALLED,
+			TelemetryEventName.MARKETPLACE_ITEM_REMOVED,
 			TelemetryEventName.SCHEMA_VALIDATION_ERROR,
 			TelemetryEventName.DIFF_APPLICATION_ERROR,
 			TelemetryEventName.SHELL_INTEGRATION_ERROR,
--- a/packages/types/src/vscode.ts
+++ b/packages/types/src/vscode.ts
@ -33,6 +33,7 @@ export const commandIds = [
 	"promptsButtonClicked",
 	"mcpButtonClicked",
 	"historyButtonClicked",
+	"marketplaceButtonClicked",
 	"popoutButtonClicked",
 	"accountButtonClicked",
 	"settingsButtonClicked",
--- a/src/mocks/vscode.js
+++ b/src/mocks/vscode.js
@ -27,6 +27,7 @@ const vscode = {
 		onDidSaveTextDocument: jest.fn(),
 		createFileSystemWatcher: jest.fn().mockReturnValue({
 			onDidCreate: jest.fn().mockReturnValue({ dispose: jest.fn() }),
+			onDidChange: jest.fn().mockReturnValue({ dispose: jest.fn() }),
 			onDidDelete: jest.fn().mockReturnValue({ dispose: jest.fn() }),
 			dispose: jest.fn(),
 		}),
--- a/src/activate/registerCommands.ts
+++ b/src/activate/registerCommands.ts
@ -146,6 +146,11 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt

 		visibleProvider.postMessageToWebview({ type: "action", action: "historyButtonClicked" })
 	},
+	marketplaceButtonClicked: () => {
+		const visibleProvider = getVisibleProviderOrLog(outputChannel)
+		if (!visibleProvider) return
+		visibleProvider.postMessageToWebview({ type: "action", action: "marketplaceButtonClicked" })
+	},
 	showHumanRelayDialog: (params: { requestId: string; promptText: string }) => {
 		const panel = getPanel()

--- a/src/core/config/CustomModesManager.ts
+++ b/src/core/config/CustomModesManager.ts
@ -10,6 +10,7 @@ import { fileExistsAtPath } from "../../utils/fs"
 import { arePathsEqual, getWorkspacePath } from "../../utils/path"
 import { logger } from "../../utils/logging"
 import { GlobalFileNames } from "../../shared/globalFileNames"
+import { ensureSettingsDirectoryExists } from "../../utils/globalContext"

 const ROOMODES_FILENAME = ".roomodes"

@ -26,8 +27,9 @@ export class CustomModesManager {
 		private readonly context: vscode.ExtensionContext,
 		private readonly onUpdate: () => Promise<void>,
 	) {
-		// TODO: We really shouldn't have async methods in the constructor.
-		this.watchCustomModesFiles()
+		this.watchCustomModesFiles().catch((error) => {
+			console.error("[CustomModesManager] Failed to setup file watchers:", error)
+		})
 	}

 	private async queueWrite(operation: () => Promise<void>): Promise<void> {
@ -117,7 +119,7 @@ export class CustomModesManager {
 	}

 	public async getCustomModesFilePath(): Promise<string> {
-		const settingsDir = await this.ensureSettingsDirectoryExists()
+		const settingsDir = await ensureSettingsDirectoryExists(this.context)
 		const filePath = path.join(settingsDir, GlobalFileNames.customModes)
 		const fileExists = await fileExistsAtPath(filePath)

@ -129,64 +131,98 @@ export class CustomModesManager {
 	}

 	private async watchCustomModesFiles(): Promise<void> {
+		// Skip if test environment is detected
+		if (process.env.NODE_ENV === "test" || process.env.JEST_WORKER_ID !== undefined) {
+			return
+		}
+
 		const settingsPath = await this.getCustomModesFilePath()

 		// Watch settings file
-		this.disposables.push(
-			vscode.workspace.onDidSaveTextDocument(async (document) => {
-				if (arePathsEqual(document.uri.fsPath, settingsPath)) {
-					const content = await fs.readFile(settingsPath, "utf-8")
+		const settingsWatcher = vscode.workspace.createFileSystemWatcher(settingsPath)

-					const errorMessage =
-						"Invalid custom modes format. Please ensure your settings follow the correct YAML format."
+		const handleSettingsChange = async () => {
+			try {
+				// Ensure that the settings file exists (especially important for delete events)
+				await this.getCustomModesFilePath()
+				const content = await fs.readFile(settingsPath, "utf-8")

-					let config: any
+				const errorMessage =
+					"Invalid custom modes format. Please ensure your settings follow the correct YAML format."

-					try {
-						config = yaml.parse(content)
-					} catch (error) {
-						console.error(error)
-						vscode.window.showErrorMessage(errorMessage)
-						return
-					}
+				let config: any

-					const result = customModesSettingsSchema.safeParse(config)
+				try {
+					config = yaml.parse(content)
+				} catch (error) {
+					console.error(error)
+					vscode.window.showErrorMessage(errorMessage)
+					return
+				}

-					if (!result.success) {
-						vscode.window.showErrorMessage(errorMessage)
-						return
-					}
+				const result = customModesSettingsSchema.safeParse(config)

-					// Get modes from .roomodes if it exists (takes precedence)
-					const roomodesPath = await this.getWorkspaceRoomodes()
-					const roomodesModes = roomodesPath ? await this.loadModesFromFile(roomodesPath) : []
+				if (!result.success) {
+					vscode.window.showErrorMessage(errorMessage)
+					return
+				}

-					// Merge modes from both sources (.roomodes takes precedence)
-					const mergedModes = await this.mergeCustomModes(roomodesModes, result.data.customModes)
+				// Get modes from .roomodes if it exists (takes precedence)
+				const roomodesPath = await this.getWorkspaceRoomodes()
+				const roomodesModes = roomodesPath ? await this.loadModesFromFile(roomodesPath) : []
+
+				// Merge modes from both sources (.roomodes takes precedence)
+				const mergedModes = await this.mergeCustomModes(roomodesModes, result.data.customModes)
+				await this.context.globalState.update("customModes", mergedModes)
+				this.clearCache()
+				await this.onUpdate()
+			} catch (error) {
+				console.error(`[CustomModesManager] Error handling settings file change:`, error)
+			}
+		}
+
+		this.disposables.push(settingsWatcher.onDidChange(handleSettingsChange))
+		this.disposables.push(settingsWatcher.onDidCreate(handleSettingsChange))
+		this.disposables.push(settingsWatcher.onDidDelete(handleSettingsChange))
+		this.disposables.push(settingsWatcher)
+
+		// Watch .roomodes file - watch the path even if it doesn't exist yet
+		const workspaceFolders = vscode.workspace.workspaceFolders
+		if (workspaceFolders && workspaceFolders.length > 0) {
+			const workspaceRoot = getWorkspacePath()
+			const roomodesPath = path.join(workspaceRoot, ROOMODES_FILENAME)
+			const roomodesWatcher = vscode.workspace.createFileSystemWatcher(roomodesPath)
+
+			const handleRoomodesChange = async () => {
+				try {
+					const settingsModes = await this.loadModesFromFile(settingsPath)
+					const roomodesModes = await this.loadModesFromFile(roomodesPath)
+					// .roomodes takes precedence
+					const mergedModes = await this.mergeCustomModes(roomodesModes, settingsModes)
 					await this.context.globalState.update("customModes", mergedModes)
 					this.clearCache()
 					await this.onUpdate()
+				} catch (error) {
+					console.error(`[CustomModesManager] Error handling .roomodes file change:`, error)
 				}
-			}),
-		)
+			}

-		// Watch .roomodes file if it exists
-		const roomodesPath = await this.getWorkspaceRoomodes()
-
-		if (roomodesPath) {
+			this.disposables.push(roomodesWatcher.onDidChange(handleRoomodesChange))
+			this.disposables.push(roomodesWatcher.onDidCreate(handleRoomodesChange))
 			this.disposables.push(
-				vscode.workspace.onDidSaveTextDocument(async (document) => {
-					if (arePathsEqual(document.uri.fsPath, roomodesPath)) {
+				roomodesWatcher.onDidDelete(async () => {
+					// When .roomodes is deleted, refresh with only settings modes
+					try {
 						const settingsModes = await this.loadModesFromFile(settingsPath)
-						const roomodesModes = await this.loadModesFromFile(roomodesPath)
-						// .roomodes takes precedence
-						const mergedModes = await this.mergeCustomModes(roomodesModes, settingsModes)
-						await this.context.globalState.update("customModes", mergedModes)
+						await this.context.globalState.update("customModes", settingsModes)
 						this.clearCache()
 						await this.onUpdate()
+					} catch (error) {
+						console.error(`[CustomModesManager] Error handling .roomodes file deletion:`, error)
 					}
 				}),
 			)
+			this.disposables.push(roomodesWatcher)
 		}
 	}

@ -362,12 +398,6 @@ export class CustomModesManager {
 		}
 	}

-	private async ensureSettingsDirectoryExists(): Promise<string> {
-		const settingsDir = path.join(this.context.globalStorageUri.fsPath, "settings")
-		await fs.mkdir(settingsDir, { recursive: true })
-		return settingsDir
-	}
-
 	public async resetCustomModes(): Promise<void> {
 		try {
 			const filePath = await this.getCustomModesFilePath()
--- a/src/core/config/tests/CustomModesManager.test.ts
+++ b/src/core/config/tests/CustomModesManager.test.ts
@ -1,6 +1,5 @@
 // npx jest src/core/config/__tests__/CustomModesManager.test.ts

-import * as vscode from "vscode"
 import * as path from "path"
 import * as fs from "fs/promises"

@ -14,14 +13,67 @@ import { GlobalFileNames } from "../../../shared/globalFileNames"

 import { CustomModesManager } from "../CustomModesManager"

-jest.mock("vscode")
+jest.mock("vscode", () => {
+	type Disposable = { dispose: () => void }
+
+	type _Event<T> = (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => Disposable
+
+	const MOCK_EMITTER_REGISTRY = new Map<object, Set<(data: any) => any>>()
+
+	return {
+		EventEmitter: jest.fn().mockImplementation(() => {
+			const emitterInstanceKey = {}
+			MOCK_EMITTER_REGISTRY.set(emitterInstanceKey, new Set())
+
+			return {
+				event: function <T>(listener: (e: T) => any): Disposable {
+					const listeners = MOCK_EMITTER_REGISTRY.get(emitterInstanceKey)
+					listeners!.add(listener as any)
+					return {
+						dispose: () => {
+							listeners!.delete(listener as any)
+						},
+					}
+				},
+
+				fire: function <T>(data: T): void {
+					const listeners = MOCK_EMITTER_REGISTRY.get(emitterInstanceKey)
+					listeners!.forEach((fn) => fn(data))
+				},
+
+				dispose: () => {
+					MOCK_EMITTER_REGISTRY.get(emitterInstanceKey)!.clear()
+					MOCK_EMITTER_REGISTRY.delete(emitterInstanceKey)
+				},
+			}
+		}),
+		Uri: {
+			file: jest.fn().mockImplementation((path) => ({ fsPath: path })),
+		},
+		window: {
+			showErrorMessage: jest.fn(),
+		},
+		workspace: {
+			workspaceFolders: undefined, // Will be set in tests
+			onDidSaveTextDocument: jest.fn().mockReturnValue({ dispose: jest.fn() }),
+			createFileSystemWatcher: jest.fn().mockReturnValue({
+				onDidCreate: jest.fn().mockReturnValue({ dispose: jest.fn() }),
+				onDidChange: jest.fn().mockReturnValue({ dispose: jest.fn() }),
+				onDidDelete: jest.fn().mockReturnValue({ dispose: jest.fn() }),
+				dispose: jest.fn(),
+			}),
+		},
+	}
+})
+
+const vscode = require("vscode")
 jest.mock("fs/promises")
 jest.mock("../../../utils/fs")
 jest.mock("../../../utils/path")

 describe("CustomModesManager", () => {
 	let manager: CustomModesManager
-	let mockContext: vscode.ExtensionContext
+	let mockContext: any
 	let mockOnUpdate: jest.Mock
 	let mockWorkspaceFolders: { uri: { fsPath: string } }[]

@ -30,7 +82,7 @@ describe("CustomModesManager", () => {
 	const mockSettingsPath = path.join(mockStoragePath, "settings", GlobalFileNames.customModes)
 	const mockRoomodes = `${path.sep}mock${path.sep}workspace${path.sep}.roomodes`

-	beforeEach(() => {
+	beforeEach(async () => {
 		mockOnUpdate = jest.fn()
 		mockContext = {
 			globalState: {
@ -40,10 +92,10 @@ describe("CustomModesManager", () => {
 			globalStorageUri: {
 				fsPath: mockStoragePath,
 			},
-		} as unknown as vscode.ExtensionContext
+		}

 		mockWorkspaceFolders = [{ uri: { fsPath: "/mock/workspace" } }]
-		;(vscode.workspace as any).workspaceFolders = mockWorkspaceFolders
+		vscode.workspace.workspaceFolders = mockWorkspaceFolders
 		;(vscode.workspace.onDidSaveTextDocument as jest.Mock).mockReturnValue({ dispose: jest.fn() })
 		;(getWorkspacePath as jest.Mock).mockReturnValue("/mock/workspace")
 		;(fileExistsAtPath as jest.Mock).mockImplementation(async (path: string) => {
@ -635,30 +687,6 @@ describe("CustomModesManager", () => {

 			expect(fs.writeFile).toHaveBeenCalledWith(settingsPath, expect.stringMatching(/^customModes: \[\]/))
 		})
-
-		it("watches file for changes", async () => {
-			const configPath = path.join(mockStoragePath, "settings", GlobalFileNames.customModes)
-
-			;(fs.readFile as jest.Mock).mockResolvedValue(yaml.stringify({ customModes: [] }))
-			;(arePathsEqual as jest.Mock).mockImplementation((path1: string, path2: string) => {
-				return path.normalize(path1) === path.normalize(path2)
-			})
-			// Get the registered callback
-			const registerCall = (vscode.workspace.onDidSaveTextDocument as jest.Mock).mock.calls[0]
-			expect(registerCall).toBeDefined()
-			const [callback] = registerCall
-
-			// Simulate file save event
-			const mockDocument = {
-				uri: { fsPath: configPath },
-			}
-			await callback(mockDocument)
-
-			// Verify file was processed
-			expect(fs.readFile).toHaveBeenCalledWith(configPath, "utf-8")
-			expect(mockContext.globalState.update).toHaveBeenCalled()
-			expect(mockOnUpdate).toHaveBeenCalled()
-		})
 	})

 	describe("deleteCustomMode", () => {
@ -709,7 +737,7 @@ describe("CustomModesManager", () => {

 		it("handles errors gracefully", async () => {
 			const mockShowError = jest.fn()
-			;(vscode.window.showErrorMessage as jest.Mock) = mockShowError
+			vscode.window.showErrorMessage = mockShowError
 			;(fs.writeFile as jest.Mock).mockRejectedValue(new Error("Write error"))

 			await manager.deleteCustomMode("non-existent-mode")
--- a/src/core/webview/ClineProvider.ts
+++ b/src/core/webview/ClineProvider.ts
@ -47,6 +47,7 @@ import { getTheme } from "../../integrations/theme/getTheme"
 import WorkspaceTracker from "../../integrations/workspace/WorkspaceTracker"
 import { McpHub } from "../../services/mcp/McpHub"
 import { McpServerManager } from "../../services/mcp/McpServerManager"
+import { MarketplaceManager } from "../../services/marketplace"
 import { ShadowCheckpointService } from "../../services/checkpoints/ShadowCheckpointService"
 import { CodeIndexManager } from "../../services/code-index/manager"
 import type { IndexProgressUpdate } from "../../services/code-index/interfaces/manager"
@ -101,6 +102,7 @@ export class ClineProvider
 		return this._workspaceTracker
 	}
 	protected mcpHub?: McpHub // Change from private to protected
+	private marketplaceManager: MarketplaceManager

 	public isViewLaunched = false
 	public settingsImportedAt?: number
@ -147,6 +149,8 @@ export class ClineProvider
 			.catch((error) => {
 				this.log(`Failed to initialize MCP Hub: ${error}`)
 			})
+
+		this.marketplaceManager = new MarketplaceManager(this.context)
 	}

 	// Adds a new Cline instance to clineStack, marking the start of a new task.
@ -262,6 +266,7 @@ export class ClineProvider
 		this._workspaceTracker = undefined
 		await this.mcpHub?.unregisterClient()
 		this.mcpHub = undefined
+		this.marketplaceManager?.cleanup()
 		this.customModesManager?.dispose()
 		this.log("Disposed all disposables")
 		ClineProvider.activeInstances.delete(this)
@ -493,6 +498,9 @@ export class ClineProvider
 		// If the extension is starting a new session, clear previous task state.
 		await this.removeClineFromStack()

+		// Set initial VSCode context for experiments
+		await this.updateVSCodeContext()
+
 		this.log("Webview view resolved")
 	}

@ -769,7 +777,8 @@ export class ClineProvider
 	 * @param webview A reference to the extension webview
 	 */
 	private setWebviewMessageListener(webview: vscode.Webview) {
-		const onReceiveMessage = async (message: WebviewMessage) => webviewMessageHandler(this, message)
+		const onReceiveMessage = async (message: WebviewMessage) =>
+			webviewMessageHandler(this, message, this.marketplaceManager)

 		const messageDisposable = webview.onDidReceiveMessage(onReceiveMessage)
 		this.webviewDisposables.push(messageDisposable)
@ -1231,6 +1240,23 @@ export class ClineProvider
 	async postStateToWebview() {
 		const state = await this.getStateToPostToWebview()
 		this.postMessageToWebview({ type: "state", state })
+
+		// Update VSCode context for experiments
+		await this.updateVSCodeContext()
+	}
+
+	/**
+	 * Updates VSCode context variables for experiments so they can be used in when clauses
+	 */
+	private async updateVSCodeContext() {
+		const { experiments } = await this.getState()
+
+		// Set context for marketplace experiment
+		await vscode.commands.executeCommand(
+			"setContext",
+			`${Package.name}.marketplaceEnabled`,
+			experiments.marketplace ?? false,
+		)
 	}

 	/**
@ -1320,12 +1346,23 @@ export class ClineProvider
 		const allowedCommands = vscode.workspace.getConfiguration(Package.name).get<string[]>("allowedCommands") || []
 		const cwd = this.cwd

+		// Only fetch marketplace data if the feature is enabled
+		let marketplaceItems: any[] = []
+		let marketplaceInstalledMetadata: any = { project: {}, global: {} }
+
+		if (experiments.marketplace) {
+			marketplaceItems = (await this.marketplaceManager.getCurrentItems()) || []
+			marketplaceInstalledMetadata = await this.marketplaceManager.getInstallationMetadata()
+		}
+
 		// Check if there's a system prompt override for the current mode
 		const currentMode = mode ?? defaultModeSlug
 		const hasSystemPromptOverride = await this.hasFileBasedSystemPromptOverride(currentMode)

 		return {
 			version: this.context.extension?.packageJSON?.version ?? "",
+			marketplaceItems,
+			marketplaceInstalledMetadata,
 			apiConfiguration,
 			customInstructions,
 			alwaysAllowReadOnly: alwaysAllowReadOnly ?? false,
--- a/src/core/webview/tests/ClineProvider.test.ts
+++ b/src/core/webview/tests/ClineProvider.test.ts
@ -146,6 +146,9 @@ jest.mock("vscode", () => ({
 		QuickFix: { value: "quickfix" },
 		RefactorRewrite: { value: "refactor.rewrite" },
 	},
+	commands: {
+		executeCommand: jest.fn().mockResolvedValue(undefined),
+	},
 	window: {
 		showInformationMessage: jest.fn(),
 		showErrorMessage: jest.fn(),
--- a/src/core/webview/webviewMessageHandler.ts
+++ b/src/core/webview/webviewMessageHandler.ts
@ -42,7 +42,13 @@ import { getCommand } from "../../utils/commands"

 const ALLOWED_VSCODE_SETTINGS = new Set(["terminal.integrated.inheritEnv"])

-export const webviewMessageHandler = async (provider: ClineProvider, message: WebviewMessage) => {
+import { MarketplaceManager, MarketplaceItemType } from "../../services/marketplace"
+
+export const webviewMessageHandler = async (
+	provider: ClineProvider,
+	message: WebviewMessage,
+	marketplaceManager?: MarketplaceManager,
+) => {
 	// Utility functions provided for concise get/update of global state via contextProxy API.
 	const getGlobalState = <K extends keyof GlobalState>(key: K) => provider.contextProxy.getValue(key)
 	const updateGlobalState = async <K extends keyof GlobalState>(key: K, value: GlobalState[K]) =>
@ -425,6 +431,11 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 		case "openMention":
 			openMention(message.text)
 			break
+		case "openExternal":
+			if (message.url) {
+				vscode.env.openExternal(vscode.Uri.parse(message.url))
+			}
+			break
 		case "checkpointDiff":
 			const result = checkoutDiffPayloadSchema.safeParse(message.payload)

@ -518,6 +529,9 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 				provider.log(`Attempting to delete MCP server: ${message.serverName}`)
 				await provider.getMcpHub()?.deleteServer(message.serverName, message.source as "global" | "project")
 				provider.log(`Successfully deleted MCP server: ${message.serverName}`)
+
+				// Refresh the webview state
+				await provider.postStateToWebview()
 			} catch (error) {
 				const errorMessage = error instanceof Error ? error.message : String(error)
 				provider.log(`Failed to delete MCP server: ${errorMessage}`)
@ -1461,5 +1475,116 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 			}
 			break
 		}
+		case "filterMarketplaceItems": {
+			// Check if marketplace is enabled before making API calls
+			const { experiments } = await provider.getState()
+			if (!experiments.marketplace) {
+				console.log("Marketplace: Feature disabled, skipping API call")
+				break
+			}
+
+			if (marketplaceManager && message.filters) {
+				try {
+					await marketplaceManager.updateWithFilteredItems({
+						type: message.filters.type as MarketplaceItemType | undefined,
+						search: message.filters.search,
+						tags: message.filters.tags,
+					})
+					await provider.postStateToWebview()
+				} catch (error) {
+					console.error("Marketplace: Error filtering items:", error)
+					vscode.window.showErrorMessage("Failed to filter marketplace items")
+				}
+			}
+			break
+		}
+
+		case "installMarketplaceItem": {
+			// Check if marketplace is enabled before installing
+			const { experiments } = await provider.getState()
+			if (!experiments.marketplace) {
+				console.log("Marketplace: Feature disabled, skipping installation")
+				break
+			}
+
+			if (marketplaceManager && message.mpItem && message.mpInstallOptions) {
+				try {
+					const configFilePath = await marketplaceManager.installMarketplaceItem(
+						message.mpItem,
+						message.mpInstallOptions,
+					)
+					await provider.postStateToWebview()
+					console.log(`Marketplace item installed and config file opened: ${configFilePath}`)
+					// Send success message to webview
+					provider.postMessageToWebview({
+						type: "marketplaceInstallResult",
+						success: true,
+						slug: message.mpItem.id,
+					})
+				} catch (error) {
+					console.error(`Error installing marketplace item: ${error}`)
+					// Send error message to webview
+					provider.postMessageToWebview({
+						type: "marketplaceInstallResult",
+						success: false,
+						error: error instanceof Error ? error.message : String(error),
+						slug: message.mpItem.id,
+					})
+				}
+			}
+			break
+		}
+
+		case "removeInstalledMarketplaceItem": {
+			// Check if marketplace is enabled before removing
+			const { experiments } = await provider.getState()
+			if (!experiments.marketplace) {
+				console.log("Marketplace: Feature disabled, skipping removal")
+				break
+			}
+
+			if (marketplaceManager && message.mpItem && message.mpInstallOptions) {
+				try {
+					await marketplaceManager.removeInstalledMarketplaceItem(message.mpItem, message.mpInstallOptions)
+					await provider.postStateToWebview()
+				} catch (error) {
+					console.error(`Error removing marketplace item: ${error}`)
+				}
+			}
+			break
+		}
+
+		case "installMarketplaceItemWithParameters": {
+			// Check if marketplace is enabled before installing with parameters
+			const { experiments } = await provider.getState()
+			if (!experiments.marketplace) {
+				console.log("Marketplace: Feature disabled, skipping installation with parameters")
+				break
+			}
+
+			if (marketplaceManager && message.payload && "item" in message.payload && "parameters" in message.payload) {
+				try {
+					const configFilePath = await marketplaceManager.installMarketplaceItem(message.payload.item, {
+						parameters: message.payload.parameters,
+					})
+					await provider.postStateToWebview()
+					console.log(`Marketplace item with parameters installed and config file opened: ${configFilePath}`)
+				} catch (error) {
+					console.error(`Error installing marketplace item with parameters: ${error}`)
+					vscode.window.showErrorMessage(
+						`Failed to install marketplace item: ${error instanceof Error ? error.message : String(error)}`,
+					)
+				}
+			}
+			break
+		}
+
+		case "switchTab": {
+			if (message.tab) {
+				// Send a message to the webview to switch to the specified tab
+				await provider.postMessageToWebview({ type: "action", action: "switchTab", tab: message.tab })
+			}
+			break
+		}
 	}
 }
--- a/src/i18n/locales/ca/marketplace.json
+++ b/src/i18n/locales/ca/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Modes",
+		"mcps": "Servidors MCP",
+		"match": "coincidència"
+	},
+	"item-card": {
+		"type-mode": "Mode",
+		"type-mcp": "Servidor MCP",
+		"type-other": "Altre",
+		"by-author": "per {{author}}",
+		"authors-profile": "Perfil de l'autor",
+		"remove-tag-filter": "Eliminar filtre d'etiqueta: {{tag}}",
+		"filter-by-tag": "Filtrar per etiqueta: {{tag}}",
+		"component-details": "Detalls del component",
+		"view": "Veure",
+		"source": "Font"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Cercar al marketplace..."
+		},
+		"type": {
+			"label": "Tipus",
+			"all": "Tots els tipus",
+			"mode": "Mode",
+			"mcpServer": "Servidor MCP"
+		},
+		"sort": {
+			"label": "Ordenar per",
+			"name": "Nom",
+			"lastUpdated": "Última actualització"
+		},
+		"tags": {
+			"label": "Etiquetes",
+			"clear": "Netejar etiquetes",
+			"placeholder": "Cercar etiquetes...",
+			"noResults": "No s'han trobat etiquetes.",
+			"selected": "Mostrant elements amb qualsevol de les etiquetes seleccionades"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Fet",
+	"tabs": {
+		"installed": "Instal·lat",
+		"browse": "Navegar",
+		"settings": "Configuració"
+	},
+	"items": {
+		"empty": {
+			"noItems": "No s'han trobat elements del marketplace.",
+			"emptyHint": "Prova d'ajustar els filtres o termes de cerca"
+		}
+	},
+	"installation": {
+		"installing": "Instal·lant element: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" instal·lat correctament",
+		"installError": "Error en instal·lar \"{{itemName}}\": {{errorMessage}}",
+		"removing": "Eliminant element: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" eliminat correctament",
+		"removeError": "Error en eliminar \"{{itemName}}\": {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/de/marketplace.json
+++ b/src/i18n/locales/de/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Modi",
+		"mcps": "MCP-Server",
+		"match": "Übereinstimmung"
+	},
+	"item-card": {
+		"type-mode": "Modus",
+		"type-mcp": "MCP-Server",
+		"type-other": "Andere",
+		"by-author": "von {{author}}",
+		"authors-profile": "Autorenprofil",
+		"remove-tag-filter": "Tag-Filter entfernen: {{tag}}",
+		"filter-by-tag": "Nach Tag filtern: {{tag}}",
+		"component-details": "Komponentendetails",
+		"view": "Anzeigen",
+		"source": "Quelle"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Marketplace durchsuchen..."
+		},
+		"type": {
+			"label": "Typ",
+			"all": "Alle Typen",
+			"mode": "Modus",
+			"mcpServer": "MCP-Server"
+		},
+		"sort": {
+			"label": "Sortieren nach",
+			"name": "Name",
+			"lastUpdated": "Zuletzt aktualisiert"
+		},
+		"tags": {
+			"label": "Tags",
+			"clear": "Tags löschen",
+			"placeholder": "Tags suchen...",
+			"noResults": "Keine Tags gefunden.",
+			"selected": "Zeige Elemente mit einem der ausgewählten Tags"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Fertig",
+	"tabs": {
+		"installed": "Installiert",
+		"browse": "Durchsuchen",
+		"settings": "Einstellungen"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Keine Marketplace-Elemente gefunden.",
+			"emptyHint": "Versuche deine Filter oder Suchbegriffe anzupassen"
+		}
+	},
+	"installation": {
+		"installing": "Element wird installiert: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" erfolgreich installiert",
+		"installError": "Installation von \"{{itemName}}\" fehlgeschlagen: {{errorMessage}}",
+		"removing": "Element wird entfernt: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" erfolgreich entfernt",
+		"removeError": "Entfernung von \"{{itemName}}\" fehlgeschlagen: {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/en/marketplace.json
+++ b/src/i18n/locales/en/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Modes",
+		"mcps": "MCP Servers",
+		"match": "match"
+	},
+	"item-card": {
+		"type-mode": "Mode",
+		"type-mcp": "MCP Server",
+		"type-other": "Other",
+		"by-author": "by {{author}}",
+		"authors-profile": "Author's Profile",
+		"remove-tag-filter": "Remove tag filter: {{tag}}",
+		"filter-by-tag": "Filter by tag: {{tag}}",
+		"component-details": "Component Details",
+		"view": "View",
+		"source": "Source"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Search marketplace..."
+		},
+		"type": {
+			"label": "Type",
+			"all": "All Types",
+			"mode": "Mode",
+			"mcpServer": "MCP Server"
+		},
+		"sort": {
+			"label": "Sort By",
+			"name": "Name",
+			"lastUpdated": "Last Updated"
+		},
+		"tags": {
+			"label": "Tags",
+			"clear": "Clear tags",
+			"placeholder": "Search tags...",
+			"noResults": "No tags found.",
+			"selected": "Showing items with any of the selected tags"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Done",
+	"tabs": {
+		"installed": "Installed",
+		"browse": "Browse",
+		"settings": "Settings"
+	},
+	"items": {
+		"empty": {
+			"noItems": "No marketplace items found.",
+			"emptyHint": "Try adjusting your filters or search terms"
+		}
+	},
+	"installation": {
+		"installing": "Installing item: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" installed successfully",
+		"installError": "Failed to install \"{{itemName}}\": {{errorMessage}}",
+		"removing": "Removing item: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" removed successfully",
+		"removeError": "Failed to remove \"{{itemName}}\": {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/es/marketplace.json
+++ b/src/i18n/locales/es/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Modos",
+		"mcps": "Servidores MCP",
+		"match": "coincidencia"
+	},
+	"item-card": {
+		"type-mode": "Modo",
+		"type-mcp": "Servidor MCP",
+		"type-other": "Otro",
+		"by-author": "por {{author}}",
+		"authors-profile": "Perfil del autor",
+		"remove-tag-filter": "Eliminar filtro de etiqueta: {{tag}}",
+		"filter-by-tag": "Filtrar por etiqueta: {{tag}}",
+		"component-details": "Detalles del componente",
+		"view": "Ver",
+		"source": "Fuente"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Buscar en marketplace..."
+		},
+		"type": {
+			"label": "Tipo",
+			"all": "Todos los tipos",
+			"mode": "Modo",
+			"mcpServer": "Servidor MCP"
+		},
+		"sort": {
+			"label": "Ordenar por",
+			"name": "Nombre",
+			"lastUpdated": "Última actualización"
+		},
+		"tags": {
+			"label": "Etiquetas",
+			"clear": "Limpiar etiquetas",
+			"placeholder": "Buscar etiquetas...",
+			"noResults": "No se encontraron etiquetas.",
+			"selected": "Mostrando elementos con cualquiera de las etiquetas seleccionadas"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Hecho",
+	"tabs": {
+		"installed": "Instalado",
+		"browse": "Explorar",
+		"settings": "Configuración"
+	},
+	"items": {
+		"empty": {
+			"noItems": "No se encontraron elementos del marketplace.",
+			"emptyHint": "Intenta ajustar tus filtros o términos de búsqueda"
+		}
+	},
+	"installation": {
+		"installing": "Instalando elemento: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" instalado correctamente",
+		"installError": "Error al instalar \"{{itemName}}\": {{errorMessage}}",
+		"removing": "Eliminando elemento: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" eliminado correctamente",
+		"removeError": "Error al eliminar \"{{itemName}}\": {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/fr/marketplace.json
+++ b/src/i18n/locales/fr/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Modes",
+		"mcps": "Serveurs MCP",
+		"match": "correspondance"
+	},
+	"item-card": {
+		"type-mode": "Mode",
+		"type-mcp": "Serveur MCP",
+		"type-other": "Autre",
+		"by-author": "par {{author}}",
+		"authors-profile": "Profil de l'auteur",
+		"remove-tag-filter": "Supprimer le filtre d'étiquette : {{tag}}",
+		"filter-by-tag": "Filtrer par étiquette : {{tag}}",
+		"component-details": "Détails du composant",
+		"view": "Voir",
+		"source": "Source"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Rechercher dans le marketplace..."
+		},
+		"type": {
+			"label": "Type",
+			"all": "Tous les types",
+			"mode": "Mode",
+			"mcpServer": "Serveur MCP"
+		},
+		"sort": {
+			"label": "Trier par",
+			"name": "Nom",
+			"lastUpdated": "Dernière mise à jour"
+		},
+		"tags": {
+			"label": "Étiquettes",
+			"clear": "Effacer les étiquettes",
+			"placeholder": "Rechercher des étiquettes...",
+			"noResults": "Aucune étiquette trouvée.",
+			"selected": "Affichage des éléments avec l'une des étiquettes sélectionnées"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Terminé",
+	"tabs": {
+		"installed": "Installé",
+		"browse": "Parcourir",
+		"settings": "Paramètres"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Aucun élément du marketplace trouvé.",
+			"emptyHint": "Essayez d'ajuster vos filtres ou termes de recherche"
+		}
+	},
+	"installation": {
+		"installing": "Installation de l'élément : \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" installé avec succès",
+		"installError": "Échec de l'installation de \"{{itemName}}\" : {{errorMessage}}",
+		"removing": "Suppression de l'élément : \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" supprimé avec succès",
+		"removeError": "Échec de la suppression de \"{{itemName}}\" : {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/hi/marketplace.json
+++ b/src/i18n/locales/hi/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "मोड्स",
+		"mcps": "MCP सर्वर",
+		"match": "मैच"
+	},
+	"item-card": {
+		"type-mode": "मोड",
+		"type-mcp": "MCP सर्वर",
+		"type-other": "अन्य",
+		"by-author": "{{author}} द्वारा",
+		"authors-profile": "लेखक की प्रोफ़ाइल",
+		"remove-tag-filter": "टैग फ़िल्टर हटाएं: {{tag}}",
+		"filter-by-tag": "टैग द्वारा फ़िल्टर करें: {{tag}}",
+		"component-details": "कंपोनेंट विवरण",
+		"view": "देखें",
+		"source": "स्रोत"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "मार्केटप्लेस खोजें..."
+		},
+		"type": {
+			"label": "प्रकार",
+			"all": "सभी प्रकार",
+			"mode": "मोड",
+			"mcpServer": "MCP सर्वर"
+		},
+		"sort": {
+			"label": "इसके द्वारा क्रमबद्ध करें",
+			"name": "नाम",
+			"lastUpdated": "अंतिम अपडेट"
+		},
+		"tags": {
+			"label": "टैग्स",
+			"clear": "टैग्स साफ़ करें",
+			"placeholder": "टैग्स खोजें...",
+			"noResults": "कोई टैग नहीं मिले।",
+			"selected": "चयनित टैग्स में से किसी भी के साथ आइटम दिखा रहे हैं"
+		},
+		"title": "मार्केटप्लेस"
+	},
+	"done": "हो गया",
+	"tabs": {
+		"installed": "इंस्टॉल किया गया",
+		"browse": "ब्राउज़ करें",
+		"settings": "सेटिंग्स"
+	},
+	"items": {
+		"empty": {
+			"noItems": "कोई मार्केटप्लेस आइटम नहीं मिले।",
+			"emptyHint": "अपने फ़िल्टर या खोज शब्दों को समायोजित करने का प्रयास करें"
+		}
+	},
+	"installation": {
+		"installing": "आइटम इंस्टॉल कर रहे हैं: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" सफलतापूर्वक इंस्टॉल हुआ",
+		"installError": "\"{{itemName}}\" इंस्टॉल करने में विफल: {{errorMessage}}",
+		"removing": "आइटम हटा रहे हैं: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" सफलतापूर्वक हटाया गया",
+		"removeError": "\"{{itemName}}\" हटाने में विफल: {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/it/marketplace.json
+++ b/src/i18n/locales/it/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Modalità",
+		"mcps": "Server MCP",
+		"match": "corrispondenza"
+	},
+	"item-card": {
+		"type-mode": "Modalità",
+		"type-mcp": "Server MCP",
+		"type-other": "Altro",
+		"by-author": "di {{author}}",
+		"authors-profile": "Profilo dell'autore",
+		"remove-tag-filter": "Rimuovi filtro tag: {{tag}}",
+		"filter-by-tag": "Filtra per tag: {{tag}}",
+		"component-details": "Dettagli componente",
+		"view": "Visualizza",
+		"source": "Sorgente"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Cerca nel marketplace..."
+		},
+		"type": {
+			"label": "Tipo",
+			"all": "Tutti i tipi",
+			"mode": "Modalità",
+			"mcpServer": "Server MCP"
+		},
+		"sort": {
+			"label": "Ordina per",
+			"name": "Nome",
+			"lastUpdated": "Ultimo aggiornamento"
+		},
+		"tags": {
+			"label": "Tag",
+			"clear": "Cancella tag",
+			"placeholder": "Cerca tag...",
+			"noResults": "Nessun tag trovato.",
+			"selected": "Mostrando elementi con uno qualsiasi dei tag selezionati"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Fatto",
+	"tabs": {
+		"installed": "Installato",
+		"browse": "Sfoglia",
+		"settings": "Impostazioni"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Nessun elemento del marketplace trovato.",
+			"emptyHint": "Prova ad aggiustare i tuoi filtri o termini di ricerca"
+		}
+	},
+	"installation": {
+		"installing": "Installazione elemento: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" installato con successo",
+		"installError": "Installazione di \"{{itemName}}\" fallita: {{errorMessage}}",
+		"removing": "Rimozione elemento: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" rimosso con successo",
+		"removeError": "Rimozione di \"{{itemName}}\" fallita: {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/ja/marketplace.json
+++ b/src/i18n/locales/ja/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "モード",
+		"mcps": "MCPサーバー",
+		"match": "マッチ"
+	},
+	"item-card": {
+		"type-mode": "モード",
+		"type-mcp": "MCPサーバー",
+		"type-other": "その他",
+		"by-author": "{{author}}による",
+		"authors-profile": "作者のプロフィール",
+		"remove-tag-filter": "タグフィルターを削除: {{tag}}",
+		"filter-by-tag": "タグでフィルター: {{tag}}",
+		"component-details": "コンポーネントの詳細",
+		"view": "表示",
+		"source": "ソース"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "マーケットプレイスを検索..."
+		},
+		"type": {
+			"label": "タイプ",
+			"all": "すべてのタイプ",
+			"mode": "モード",
+			"mcpServer": "MCPサーバー"
+		},
+		"sort": {
+			"label": "並び替え",
+			"name": "名前",
+			"lastUpdated": "最終更新"
+		},
+		"tags": {
+			"label": "タグ",
+			"clear": "タグをクリア",
+			"placeholder": "タグを検索...",
+			"noResults": "タグが見つかりません。",
+			"selected": "選択されたタグのいずれかを持つアイテムを表示"
+		},
+		"title": "マーケットプレイス"
+	},
+	"done": "完了",
+	"tabs": {
+		"installed": "インストール済み",
+		"browse": "参照",
+		"settings": "設定"
+	},
+	"items": {
+		"empty": {
+			"noItems": "マーケットプレイスのアイテムが見つかりません。",
+			"emptyHint": "フィルターや検索用語を調整してみてください"
+		}
+	},
+	"installation": {
+		"installing": "アイテムをインストール中: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\"のインストールが完了しました",
+		"installError": "\"{{itemName}}\"のインストールに失敗しました: {{errorMessage}}",
+		"removing": "アイテムを削除中: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\"の削除が完了しました",
+		"removeError": "\"{{itemName}}\"の削除に失敗しました: {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/ko/marketplace.json
+++ b/src/i18n/locales/ko/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "모드",
+		"mcps": "MCP 서버",
+		"match": "일치"
+	},
+	"item-card": {
+		"type-mode": "모드",
+		"type-mcp": "MCP 서버",
+		"type-other": "기타",
+		"by-author": "{{author}} 작성",
+		"authors-profile": "작성자 프로필",
+		"remove-tag-filter": "태그 필터 제거: {{tag}}",
+		"filter-by-tag": "태그로 필터링: {{tag}}",
+		"component-details": "컴포넌트 세부사항",
+		"view": "보기",
+		"source": "소스"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "마켓플레이스 검색..."
+		},
+		"type": {
+			"label": "유형",
+			"all": "모든 유형",
+			"mode": "모드",
+			"mcpServer": "MCP 서버"
+		},
+		"sort": {
+			"label": "정렬 기준",
+			"name": "이름",
+			"lastUpdated": "마지막 업데이트"
+		},
+		"tags": {
+			"label": "태그",
+			"clear": "태그 지우기",
+			"placeholder": "태그 검색...",
+			"noResults": "태그를 찾을 수 없습니다.",
+			"selected": "선택된 태그 중 하나를 가진 항목 표시"
+		},
+		"title": "마켓플레이스"
+	},
+	"done": "완료",
+	"tabs": {
+		"installed": "설치됨",
+		"browse": "찾아보기",
+		"settings": "설정"
+	},
+	"items": {
+		"empty": {
+			"noItems": "마켓플레이스 항목을 찾을 수 없습니다.",
+			"emptyHint": "필터나 검색어를 조정해 보세요"
+		}
+	},
+	"installation": {
+		"installing": "항목 설치 중: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" 설치 완료",
+		"installError": "\"{{itemName}}\" 설치 실패: {{errorMessage}}",
+		"removing": "항목 제거 중: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" 제거 완료",
+		"removeError": "\"{{itemName}}\" 제거 실패: {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/nl/marketplace.json
+++ b/src/i18n/locales/nl/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Modi",
+		"mcps": "MCP Servers",
+		"match": "overeenkomst"
+	},
+	"item-card": {
+		"type-mode": "Modus",
+		"type-mcp": "MCP Server",
+		"type-other": "Andere",
+		"by-author": "door {{author}}",
+		"authors-profile": "Auteursprofiel",
+		"remove-tag-filter": "Tag filter verwijderen: {{tag}}",
+		"filter-by-tag": "Filteren op tag: {{tag}}",
+		"component-details": "Component details",
+		"view": "Bekijken",
+		"source": "Bron"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Marketplace doorzoeken..."
+		},
+		"type": {
+			"label": "Type",
+			"all": "Alle types",
+			"mode": "Modus",
+			"mcpServer": "MCP Server"
+		},
+		"sort": {
+			"label": "Sorteren op",
+			"name": "Naam",
+			"lastUpdated": "Laatst bijgewerkt"
+		},
+		"tags": {
+			"label": "Tags",
+			"clear": "Tags wissen",
+			"placeholder": "Tags zoeken...",
+			"noResults": "Geen tags gevonden.",
+			"selected": "Items tonen met een van de geselecteerde tags"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Klaar",
+	"tabs": {
+		"installed": "Geïnstalleerd",
+		"browse": "Bladeren",
+		"settings": "Instellingen"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Geen marketplace items gevonden.",
+			"emptyHint": "Probeer je filters of zoektermen aan te passen"
+		}
+	},
+	"installation": {
+		"installing": "Item installeren: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" succesvol geïnstalleerd",
+		"installError": "Installatie van \"{{itemName}}\" mislukt: {{errorMessage}}",
+		"removing": "Item verwijderen: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" succesvol verwijderd",
+		"removeError": "Verwijdering van \"{{itemName}}\" mislukt: {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/pl/marketplace.json
+++ b/src/i18n/locales/pl/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Tryby",
+		"mcps": "Serwery MCP",
+		"match": "dopasowanie"
+	},
+	"item-card": {
+		"type-mode": "Tryb",
+		"type-mcp": "Serwer MCP",
+		"type-other": "Inne",
+		"by-author": "przez {{author}}",
+		"authors-profile": "Profil autora",
+		"remove-tag-filter": "Usuń filtr tagu: {{tag}}",
+		"filter-by-tag": "Filtruj według tagu: {{tag}}",
+		"component-details": "Szczegóły komponentu",
+		"view": "Zobacz",
+		"source": "Źródło"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Przeszukaj marketplace..."
+		},
+		"type": {
+			"label": "Typ",
+			"all": "Wszystkie typy",
+			"mode": "Tryb",
+			"mcpServer": "Serwer MCP"
+		},
+		"sort": {
+			"label": "Sortuj według",
+			"name": "Nazwa",
+			"lastUpdated": "Ostatnia aktualizacja"
+		},
+		"tags": {
+			"label": "Tagi",
+			"clear": "Wyczyść tagi",
+			"placeholder": "Szukaj tagów...",
+			"noResults": "Nie znaleziono tagów.",
+			"selected": "Pokazywanie elementów z dowolnym z wybranych tagów"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Gotowe",
+	"tabs": {
+		"installed": "Zainstalowane",
+		"browse": "Przeglądaj",
+		"settings": "Ustawienia"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Nie znaleziono elementów marketplace.",
+			"emptyHint": "Spróbuj dostosować filtry lub terminy wyszukiwania"
+		}
+	},
+	"installation": {
+		"installing": "Instalowanie elementu: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" zainstalowano pomyślnie",
+		"installError": "Instalacja \"{{itemName}}\" nie powiodła się: {{errorMessage}}",
+		"removing": "Usuwanie elementu: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" usunięto pomyślnie",
+		"removeError": "Usunięcie \"{{itemName}}\" nie powiodło się: {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/pt-BR/marketplace.json
+++ b/src/i18n/locales/pt-BR/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Modos",
+		"mcps": "Servidores MCP",
+		"match": "correspondência"
+	},
+	"item-card": {
+		"type-mode": "Modo",
+		"type-mcp": "Servidor MCP",
+		"type-other": "Outro",
+		"by-author": "por {{author}}",
+		"authors-profile": "Perfil do autor",
+		"remove-tag-filter": "Remover filtro de tag: {{tag}}",
+		"filter-by-tag": "Filtrar por tag: {{tag}}",
+		"component-details": "Detalhes do componente",
+		"view": "Visualizar",
+		"source": "Fonte"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Pesquisar marketplace..."
+		},
+		"type": {
+			"label": "Tipo",
+			"all": "Todos os tipos",
+			"mode": "Modo",
+			"mcpServer": "Servidor MCP"
+		},
+		"sort": {
+			"label": "Ordenar por",
+			"name": "Nome",
+			"lastUpdated": "Última atualização"
+		},
+		"tags": {
+			"label": "Tags",
+			"clear": "Limpar tags",
+			"placeholder": "Pesquisar tags...",
+			"noResults": "Nenhuma tag encontrada.",
+			"selected": "Mostrando itens com qualquer uma das tags selecionadas"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Concluído",
+	"tabs": {
+		"installed": "Instalado",
+		"browse": "Navegar",
+		"settings": "Configurações"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Nenhum item do marketplace encontrado.",
+			"emptyHint": "Tente ajustar seus filtros ou termos de pesquisa"
+		}
+	},
+	"installation": {
+		"installing": "Instalando item: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" instalado com sucesso",
+		"installError": "Falha ao instalar \"{{itemName}}\": {{errorMessage}}",
+		"removing": "Removendo item: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" removido com sucesso",
+		"removeError": "Falha ao remover \"{{itemName}}\": {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/ru/marketplace.json
+++ b/src/i18n/locales/ru/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Режимы",
+		"mcps": "MCP серверы",
+		"match": "совпадение"
+	},
+	"item-card": {
+		"type-mode": "Режим",
+		"type-mcp": "MCP сервер",
+		"type-other": "Другое",
+		"by-author": "от {{author}}",
+		"authors-profile": "Профиль автора",
+		"remove-tag-filter": "Удалить фильтр тега: {{tag}}",
+		"filter-by-tag": "Фильтровать по тегу: {{tag}}",
+		"component-details": "Детали компонента",
+		"view": "Просмотр",
+		"source": "Источник"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Поиск в marketplace..."
+		},
+		"type": {
+			"label": "Тип",
+			"all": "Все типы",
+			"mode": "Режим",
+			"mcpServer": "MCP сервер"
+		},
+		"sort": {
+			"label": "Сортировать по",
+			"name": "Имя",
+			"lastUpdated": "Последнее обновление"
+		},
+		"tags": {
+			"label": "Теги",
+			"clear": "Очистить теги",
+			"placeholder": "Поиск тегов...",
+			"noResults": "Теги не найдены.",
+			"selected": "Показ элементов с любым из выбранных тегов"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Готово",
+	"tabs": {
+		"installed": "Установлено",
+		"browse": "Обзор",
+		"settings": "Настройки"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Элементы marketplace не найдены.",
+			"emptyHint": "Попробуйте настроить фильтры или поисковые термины"
+		}
+	},
+	"installation": {
+		"installing": "Установка элемента: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" успешно установлен",
+		"installError": "Не удалось установить \"{{itemName}}\": {{errorMessage}}",
+		"removing": "Удаление элемента: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" успешно удален",
+		"removeError": "Не удалось удалить \"{{itemName}}\": {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/tr/marketplace.json
+++ b/src/i18n/locales/tr/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Modlar",
+		"mcps": "MCP Sunucuları",
+		"match": "eşleşme"
+	},
+	"item-card": {
+		"type-mode": "Mod",
+		"type-mcp": "MCP Sunucusu",
+		"type-other": "Diğer",
+		"by-author": "{{author}} tarafından",
+		"authors-profile": "Yazarın Profili",
+		"remove-tag-filter": "Etiket filtresini kaldır: {{tag}}",
+		"filter-by-tag": "Etikete göre filtrele: {{tag}}",
+		"component-details": "Bileşen Detayları",
+		"view": "Görüntüle",
+		"source": "Kaynak"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Marketplace'te ara..."
+		},
+		"type": {
+			"label": "Tür",
+			"all": "Tüm Türler",
+			"mode": "Mod",
+			"mcpServer": "MCP Sunucusu"
+		},
+		"sort": {
+			"label": "Sırala",
+			"name": "İsim",
+			"lastUpdated": "Son Güncelleme"
+		},
+		"tags": {
+			"label": "Etiketler",
+			"clear": "Etiketleri temizle",
+			"placeholder": "Etiket ara...",
+			"noResults": "Etiket bulunamadı.",
+			"selected": "Seçilen etiketlerden herhangi birine sahip öğeleri göster"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Tamam",
+	"tabs": {
+		"installed": "Yüklü",
+		"browse": "Gözat",
+		"settings": "Ayarlar"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Marketplace öğesi bulunamadı.",
+			"emptyHint": "Filtrelerinizi veya arama terimlerinizi ayarlamayı deneyin"
+		}
+	},
+	"installation": {
+		"installing": "Öğe yükleniyor: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" başarıyla yüklendi",
+		"installError": "\"{{itemName}}\" yüklenemedi: {{errorMessage}}",
+		"removing": "Öğe kaldırılıyor: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" başarıyla kaldırıldı",
+		"removeError": "\"{{itemName}}\" kaldırılamadı: {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/vi/marketplace.json
+++ b/src/i18n/locales/vi/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "Chế độ",
+		"mcps": "Máy chủ MCP",
+		"match": "khớp"
+	},
+	"item-card": {
+		"type-mode": "Chế độ",
+		"type-mcp": "Máy chủ MCP",
+		"type-other": "Khác",
+		"by-author": "bởi {{author}}",
+		"authors-profile": "Hồ sơ tác giả",
+		"remove-tag-filter": "Xóa bộ lọc thẻ: {{tag}}",
+		"filter-by-tag": "Lọc theo thẻ: {{tag}}",
+		"component-details": "Chi tiết thành phần",
+		"view": "Xem",
+		"source": "Nguồn"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "Tìm kiếm marketplace..."
+		},
+		"type": {
+			"label": "Loại",
+			"all": "Tất cả loại",
+			"mode": "Chế độ",
+			"mcpServer": "Máy chủ MCP"
+		},
+		"sort": {
+			"label": "Sắp xếp theo",
+			"name": "Tên",
+			"lastUpdated": "Cập nhật lần cuối"
+		},
+		"tags": {
+			"label": "Thẻ",
+			"clear": "Xóa thẻ",
+			"placeholder": "Tìm thẻ...",
+			"noResults": "Không tìm thấy thẻ nào.",
+			"selected": "Hiển thị các mục có bất kỳ thẻ nào được chọn"
+		},
+		"title": "Marketplace"
+	},
+	"done": "Hoàn thành",
+	"tabs": {
+		"installed": "Đã cài đặt",
+		"browse": "Duyệt",
+		"settings": "Cài đặt"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Không tìm thấy mục marketplace nào.",
+			"emptyHint": "Thử điều chỉnh bộ lọc hoặc từ khóa tìm kiếm"
+		}
+	},
+	"installation": {
+		"installing": "Đang cài đặt mục: \"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" đã được cài đặt thành công",
+		"installError": "Cài đặt \"{{itemName}}\" thất bại: {{errorMessage}}",
+		"removing": "Đang xóa mục: \"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" đã được xóa thành công",
+		"removeError": "Xóa \"{{itemName}}\" thất bại: {{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/zh-CN/marketplace.json
+++ b/src/i18n/locales/zh-CN/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "模式",
+		"mcps": "MCP 服务",
+		"match": "匹配"
+	},
+	"item-card": {
+		"type-mode": "模式",
+		"type-mcp": "MCP 服务",
+		"type-other": "其他",
+		"by-author": "作者：{{author}}",
+		"authors-profile": "作者资料",
+		"remove-tag-filter": "移除标签过滤器：{{tag}}",
+		"filter-by-tag": "按标签过滤：{{tag}}",
+		"component-details": "组件详情",
+		"view": "查看",
+		"source": "来源"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "搜索 Marketplace..."
+		},
+		"type": {
+			"label": "类型",
+			"all": "所有类型",
+			"mode": "模式",
+			"mcpServer": "MCP 服务"
+		},
+		"sort": {
+			"label": "排序方式",
+			"name": "名称",
+			"lastUpdated": "最后更新"
+		},
+		"tags": {
+			"label": "标签",
+			"clear": "清除标签",
+			"placeholder": "搜索标签...",
+			"noResults": "未找到标签。",
+			"selected": "显示包含任一选中标签的项目"
+		},
+		"title": "Marketplace"
+	},
+	"done": "完成",
+	"tabs": {
+		"installed": "已安装",
+		"browse": "浏览",
+		"settings": "设置"
+	},
+	"items": {
+		"empty": {
+			"noItems": "未找到 Marketplace 项目。",
+			"emptyHint": "尝试调整过滤器或搜索条件"
+		}
+	},
+	"installation": {
+		"installing": "正在安装项目：\"{{itemName}}\"",
+		"installSuccess": "\"{{itemName}}\" 安装成功",
+		"installError": "\"{{itemName}}\" 安装失败：{{errorMessage}}",
+		"removing": "正在移除项目：\"{{itemName}}\"",
+		"removeSuccess": "\"{{itemName}}\" 移除成功",
+		"removeError": "\"{{itemName}}\" 移除失败：{{errorMessage}}"
+	}
+}
--- a/src/i18n/locales/zh-TW/marketplace.json
+++ b/src/i18n/locales/zh-TW/marketplace.json
@ -0,0 +1,63 @@
+{
+	"type-group": {
+		"modes": "模式",
+		"mcps": "MCP 伺服器",
+		"match": "符合"
+	},
+	"item-card": {
+		"type-mode": "模式",
+		"type-mcp": "MCP 伺服器",
+		"type-other": "其他",
+		"by-author": "作者：{{author}}",
+		"authors-profile": "作者檔案",
+		"remove-tag-filter": "移除標籤篩選器：{{tag}}",
+		"filter-by-tag": "依標籤篩選：{{tag}}",
+		"component-details": "元件詳情",
+		"view": "檢視",
+		"source": "來源"
+	},
+	"filters": {
+		"search": {
+			"placeholder": "搜尋 Marketplace..."
+		},
+		"type": {
+			"label": "類型",
+			"all": "所有類型",
+			"mode": "模式",
+			"mcpServer": "MCP 伺服器"
+		},
+		"sort": {
+			"label": "排序方式",
+			"name": "名稱",
+			"lastUpdated": "最後更新"
+		},
+		"tags": {
+			"label": "標籤",
+			"clear": "清除標籤",
+			"placeholder": "搜尋標籤...",
+			"noResults": "找不到標籤。",
+			"selected": "顯示包含任一選取標籤的項目"
+		},
+		"title": "Marketplace"
+	},
+	"done": "完成",
+	"tabs": {
+		"installed": "已安裝",
+		"browse": "瀏覽",
+		"settings": "設定"
+	},
+	"items": {
+		"empty": {
+			"noItems": "找不到 Marketplace 項目。",
+			"emptyHint": "嘗試調整篩選器或搜尋條件"
+		}
+	},
+	"installation": {
+		"installing": "正在安裝項目：「{{itemName}}」",
+		"installSuccess": "「{{itemName}}」安裝成功",
+		"installError": "「{{itemName}}」安裝失敗：{{errorMessage}}",
+		"removing": "正在移除項目：「{{itemName}}」",
+		"removeSuccess": "「{{itemName}}」移除成功",
+		"removeError": "「{{itemName}}」移除失敗：{{errorMessage}}"
+	}
+}
--- a/src/package.json
+++ b/src/package.json
@ -90,6 +90,11 @@
 				"title": "%command.history.title%",
 				"icon": "$(history)"
 			},
+			{
+				"command": "roo-cline.marketplaceButtonClicked",
+				"title": "%command.marketplace.title%",
+				"icon": "$(extensions)"
+			},
 			{
 				"command": "roo-cline.popoutButtonClicked",
 				"title": "%command.openInEditor.title%",
@ -225,23 +230,28 @@
 					"when": "view == roo-cline.SidebarProvider"
 				},
 				{
-					"command": "roo-cline.historyButtonClicked",
+					"command": "roo-cline.marketplaceButtonClicked",
 					"group": "navigation@4",
-					"when": "view == roo-cline.SidebarProvider"
+					"when": "view == roo-cline.SidebarProvider && roo-cline.marketplaceEnabled"
 				},
 				{
-					"command": "roo-cline.popoutButtonClicked",
+					"command": "roo-cline.historyButtonClicked",
 					"group": "navigation@5",
 					"when": "view == roo-cline.SidebarProvider"
 				},
 				{
-					"command": "roo-cline.accountButtonClicked",
+					"command": "roo-cline.popoutButtonClicked",
 					"group": "navigation@6",
+					"when": "view == roo-cline.SidebarProvider"
+				},
+				{
+					"command": "roo-cline.accountButtonClicked",
+					"group": "navigation@7",
 					"when": "view == roo-cline.SidebarProvider && config.roo-cline.rooCodeCloudEnabled"
 				},
 				{
 					"command": "roo-cline.settingsButtonClicked",
-					"group": "navigation@7",
+					"group": "navigation@8",
 					"when": "view == roo-cline.SidebarProvider"
 				}
 			],
@ -262,12 +272,12 @@
 					"when": "activeWebviewPanelId == roo-cline.TabPanelProvider"
 				},
 				{
-					"command": "roo-cline.historyButtonClicked",
+					"command": "roo-cline.marketplaceButtonClicked",
 					"group": "navigation@4",
-					"when": "activeWebviewPanelId == roo-cline.TabPanelProvider"
+					"when": "activeWebviewPanelId == roo-cline.TabPanelProvider && roo-cline.marketplaceEnabled"
 				},
 				{
-					"command": "roo-cline.popoutButtonClicked",
+					"command": "roo-cline.historyButtonClicked",
 					"group": "navigation@5",
 					"when": "activeWebviewPanelId == roo-cline.TabPanelProvider"
 				},
--- a/src/package.nls.ca.json
+++ b/src/package.nls.ca.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "Servidors MCP",
 	"command.prompts.title": "Modes",
 	"command.history.title": "Historial",
+	"command.marketplace.title": "Mercat",
 	"command.openInEditor.title": "Obrir a l'Editor",
 	"command.settings.title": "Configuració",
 	"command.documentation.title": "Documentació",
--- a/src/package.nls.de.json
+++ b/src/package.nls.de.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "MCP Server",
 	"command.prompts.title": "Modi",
 	"command.history.title": "Verlauf",
+	"command.marketplace.title": "Marktplatz",
 	"command.openInEditor.title": "Im Editor Öffnen",
 	"command.settings.title": "Einstellungen",
 	"command.documentation.title": "Dokumentation",
--- a/src/package.nls.es.json
+++ b/src/package.nls.es.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "Servidores MCP",
 	"command.prompts.title": "Modos",
 	"command.history.title": "Historial",
+	"command.marketplace.title": "Mercado",
 	"command.openInEditor.title": "Abrir en Editor",
 	"command.settings.title": "Configuración",
 	"command.documentation.title": "Documentación",
--- a/src/package.nls.fr.json
+++ b/src/package.nls.fr.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "Serveurs MCP",
 	"command.prompts.title": "Modes",
 	"command.history.title": "Historique",
+	"command.marketplace.title": "Marché",
 	"command.openInEditor.title": "Ouvrir dans l'Éditeur",
 	"command.settings.title": "Paramètres",
 	"command.documentation.title": "Documentation",
--- a/src/package.nls.hi.json
+++ b/src/package.nls.hi.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "एमसीपी सर्वर",
 	"command.prompts.title": "मोड्स",
 	"command.history.title": "इतिहास",
+	"command.marketplace.title": "मार्केटप्लेस",
 	"command.openInEditor.title": "एडिटर में खोलें",
 	"command.settings.title": "सेटिंग्स",
 	"command.documentation.title": "दस्तावेज़ीकरण",
--- a/src/package.nls.it.json
+++ b/src/package.nls.it.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "Server MCP",
 	"command.prompts.title": "Modi",
 	"command.history.title": "Cronologia",
+	"command.marketplace.title": "Marketplace",
 	"command.openInEditor.title": "Apri nell'Editor",
 	"command.settings.title": "Impostazioni",
 	"command.documentation.title": "Documentazione",
--- a/src/package.nls.ja.json
+++ b/src/package.nls.ja.json
@ -9,6 +9,7 @@
 	"command.mcpServers.title": "MCPサーバー",
 	"command.prompts.title": "モード",
 	"command.history.title": "履歴",
+	"command.marketplace.title": "マーケットプレイス",
 	"command.openInEditor.title": "エディタで開く",
 	"command.settings.title": "設定",
 	"command.documentation.title": "ドキュメント",
--- a/src/package.nls.json
+++ b/src/package.nls.json
@ -9,6 +9,7 @@
 	"command.mcpServers.title": "MCP Servers",
 	"command.prompts.title": "Modes",
 	"command.history.title": "History",
+	"command.marketplace.title": "Marketplace",
 	"command.openInEditor.title": "Open in Editor",
 	"command.settings.title": "Settings",
 	"command.documentation.title": "Documentation",
--- a/src/package.nls.ko.json
+++ b/src/package.nls.ko.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "MCP 서버",
 	"command.prompts.title": "모드",
 	"command.history.title": "기록",
+	"command.marketplace.title": "마켓플레이스",
 	"command.openInEditor.title": "에디터에서 열기",
 	"command.settings.title": "설정",
 	"command.documentation.title": "문서",
--- a/src/package.nls.nl.json
+++ b/src/package.nls.nl.json
@ -9,6 +9,7 @@
 	"command.mcpServers.title": "MCP Servers",
 	"command.prompts.title": "Modi",
 	"command.history.title": "Geschiedenis",
+	"command.marketplace.title": "Marktplaats",
 	"command.openInEditor.title": "Openen in Editor",
 	"command.settings.title": "Instellingen",
 	"command.documentation.title": "Documentatie",
--- a/src/package.nls.pl.json
+++ b/src/package.nls.pl.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "Serwery MCP",
 	"command.prompts.title": "Tryby",
 	"command.history.title": "Historia",
+	"command.marketplace.title": "Marketplace",
 	"command.openInEditor.title": "Otwórz w Edytorze",
 	"command.settings.title": "Ustawienia",
 	"command.documentation.title": "Dokumentacja",
--- a/src/package.nls.pt-BR.json
+++ b/src/package.nls.pt-BR.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "Servidores MCP",
 	"command.prompts.title": "Modos",
 	"command.history.title": "Histórico",
+	"command.marketplace.title": "Marketplace",
 	"command.openInEditor.title": "Abrir no Editor",
 	"command.settings.title": "Configurações",
 	"command.documentation.title": "Documentação",
--- a/src/package.nls.ru.json
+++ b/src/package.nls.ru.json
@ -9,6 +9,7 @@
 	"command.mcpServers.title": "MCP серверы",
 	"command.prompts.title": "Режимы",
 	"command.history.title": "История",
+	"command.marketplace.title": "Маркетплейс",
 	"command.openInEditor.title": "Открыть в редакторе",
 	"command.settings.title": "Настройки",
 	"command.documentation.title": "Документация",
--- a/src/package.nls.tr.json
+++ b/src/package.nls.tr.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "MCP Sunucuları",
 	"command.prompts.title": "Modlar",
 	"command.history.title": "Geçmiş",
+	"command.marketplace.title": "Marketplace",
 	"command.openInEditor.title": "Düzenleyicide Aç",
 	"command.settings.title": "Ayarlar",
 	"command.documentation.title": "Dokümantasyon",
--- a/src/package.nls.vi.json
+++ b/src/package.nls.vi.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "Máy Chủ MCP",
 	"command.prompts.title": "Chế Độ",
 	"command.history.title": "Lịch Sử",
+	"command.marketplace.title": "Marketplace",
 	"command.openInEditor.title": "Mở trong Trình Soạn Thảo",
 	"command.settings.title": "Cài Đặt",
 	"command.documentation.title": "Tài Liệu",
--- a/src/package.nls.zh-CN.json
+++ b/src/package.nls.zh-CN.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "MCP 服务器",
 	"command.prompts.title": "模式",
 	"command.history.title": "历史记录",
+	"command.marketplace.title": "应用市场",
 	"command.openInEditor.title": "在编辑器中打开",
 	"command.settings.title": "设置",
 	"command.documentation.title": "文档",
--- a/src/package.nls.zh-TW.json
+++ b/src/package.nls.zh-TW.json
@ -20,6 +20,7 @@
 	"command.mcpServers.title": "MCP 伺服器",
 	"command.prompts.title": "模式",
 	"command.history.title": "歷史記錄",
+	"command.marketplace.title": "應用市場",
 	"command.openInEditor.title": "在編輯器中開啟",
 	"command.settings.title": "設定",
 	"command.documentation.title": "文件",
--- a/src/services/marketplace/MarketplaceManager.ts
+++ b/src/services/marketplace/MarketplaceManager.ts
@ -0,0 +1,282 @@
+import * as vscode from "vscode"
+import * as fs from "fs/promises"
+import * as path from "path"
+import * as yaml from "yaml"
+import { RemoteConfigLoader } from "./RemoteConfigLoader"
+import { SimpleInstaller } from "./SimpleInstaller"
+import { MarketplaceItem, MarketplaceItemType } from "./types"
+import { GlobalFileNames } from "../../shared/globalFileNames"
+import { ensureSettingsDirectoryExists } from "../../utils/globalContext"
+import { t } from "../../i18n"
+import { TelemetryService } from "@roo-code/telemetry"
+
+export class MarketplaceManager {
+	private configLoader: RemoteConfigLoader
+	private installer: SimpleInstaller
+
+	constructor(private readonly context: vscode.ExtensionContext) {
+		this.configLoader = new RemoteConfigLoader()
+		this.installer = new SimpleInstaller(context)
+	}
+
+	async getMarketplaceItems(): Promise<{ items: MarketplaceItem[]; errors?: string[] }> {
+		try {
+			const items = await this.configLoader.loadAllItems()
+
+			return { items }
+		} catch (error) {
+			const errorMessage = error instanceof Error ? error.message : String(error)
+			console.error("Failed to load marketplace items:", error)
+
+			return {
+				items: [],
+				errors: [errorMessage],
+			}
+		}
+	}
+
+	async getCurrentItems(): Promise<MarketplaceItem[]> {
+		const result = await this.getMarketplaceItems()
+		return result.items
+	}
+
+	filterItems(
+		items: MarketplaceItem[],
+		filters: { type?: MarketplaceItemType; search?: string; tags?: string[] },
+	): MarketplaceItem[] {
+		return items.filter((item) => {
+			// Type filter
+			if (filters.type && item.type !== filters.type) {
+				return false
+			}
+
+			// Search filter
+			if (filters.search) {
+				const searchTerm = filters.search.toLowerCase()
+				const searchableText = `${item.name} ${item.description}`.toLowerCase()
+				if (!searchableText.includes(searchTerm)) {
+					return false
+				}
+			}
+
+			// Tags filter
+			if (filters.tags?.length) {
+				if (!item.tags?.some((tag) => filters.tags!.includes(tag))) {
+					return false
+				}
+			}
+
+			return true
+		})
+	}
+
+	async updateWithFilteredItems(filters: {
+		type?: MarketplaceItemType
+		search?: string
+		tags?: string[]
+	}): Promise<MarketplaceItem[]> {
+		const allItems = await this.getCurrentItems()
+
+		if (!filters.type && !filters.search && (!filters.tags || filters.tags.length === 0)) {
+			return allItems
+		}
+
+		return this.filterItems(allItems, filters)
+	}
+
+	async installMarketplaceItem(
+		item: MarketplaceItem,
+		options?: { target?: "global" | "project"; parameters?: Record<string, any> },
+	): Promise<string> {
+		const { target = "project", parameters } = options || {}
+
+		vscode.window.showInformationMessage(t("marketplace:installation.installing", { itemName: item.name }))
+
+		try {
+			const result = await this.installer.installItem(item, { target, parameters })
+			vscode.window.showInformationMessage(t("marketplace:installation.installSuccess", { itemName: item.name }))
+
+			// Capture telemetry for successful installation
+			const telemetryProperties: Record<string, any> = {}
+			if (parameters && Object.keys(parameters).length > 0) {
+				telemetryProperties.hasParameters = true
+				// For MCP items with multiple installation methods, track which one was used
+				if (item.type === "mcp" && parameters._selectedIndex !== undefined && Array.isArray(item.content)) {
+					const selectedMethod = item.content[parameters._selectedIndex]
+					if (selectedMethod && selectedMethod.name) {
+						telemetryProperties.installationMethodName = selectedMethod.name
+					}
+				}
+			}
+
+			TelemetryService.instance.captureMarketplaceItemInstalled(
+				item.id,
+				item.type,
+				item.name,
+				target,
+				telemetryProperties,
+			)
+
+			// Open the config file that was modified, optionally at the specific line
+			const document = await vscode.workspace.openTextDocument(result.filePath)
+			const options: vscode.TextDocumentShowOptions = {}
+
+			if (result.line !== undefined) {
+				// Position cursor at the line where content was added
+				options.selection = new vscode.Range(result.line - 1, 0, result.line - 1, 0)
+			}
+
+			await vscode.window.showTextDocument(document, options)
+
+			return result.filePath
+		} catch (error) {
+			const errorMessage = error instanceof Error ? error.message : String(error)
+			vscode.window.showErrorMessage(
+				t("marketplace:installation.installError", { itemName: item.name, errorMessage }),
+			)
+			throw error
+		}
+	}
+
+	async removeInstalledMarketplaceItem(
+		item: MarketplaceItem,
+		options?: { target?: "global" | "project" },
+	): Promise<void> {
+		const { target = "project" } = options || {}
+
+		vscode.window.showInformationMessage(t("marketplace:installation.removing", { itemName: item.name }))
+
+		try {
+			await this.installer.removeItem(item, { target })
+			vscode.window.showInformationMessage(t("marketplace:installation.removeSuccess", { itemName: item.name }))
+
+			// Capture telemetry for successful removal
+			TelemetryService.instance.captureMarketplaceItemRemoved(item.id, item.type, item.name, target)
+		} catch (error) {
+			const errorMessage = error instanceof Error ? error.message : String(error)
+			vscode.window.showErrorMessage(
+				t("marketplace:installation.removeError", { itemName: item.name, errorMessage }),
+			)
+			throw error
+		}
+	}
+
+	async cleanup(): Promise<void> {
+		// Clear API cache if needed
+		this.configLoader.clearCache()
+	}
+
+	/**
+	 * Get installation metadata by checking config files for installed items
+	 */
+	async getInstallationMetadata(): Promise<{
+		project: Record<string, { type: string }>
+		global: Record<string, { type: string }>
+	}> {
+		const metadata = {
+			project: {} as Record<string, { type: string }>,
+			global: {} as Record<string, { type: string }>,
+		}
+
+		// Check project-level installations
+		await this.checkProjectInstallations(metadata.project)
+
+		// Check global-level installations
+		await this.checkGlobalInstallations(metadata.global)
+
+		return metadata
+	}
+
+	/**
+	 * Check for project-level installed items
+	 */
+	private async checkProjectInstallations(metadata: Record<string, { type: string }>): Promise<void> {
+		try {
+			const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
+			if (!workspaceFolder) {
+				return // No workspace, no project installations
+			}
+
+			// Check modes in .roomodes
+			const projectModesPath = path.join(workspaceFolder.uri.fsPath, ".roomodes")
+			try {
+				const content = await fs.readFile(projectModesPath, "utf-8")
+				const data = yaml.parse(content)
+				if (data?.customModes && Array.isArray(data.customModes)) {
+					for (const mode of data.customModes) {
+						if (mode.slug) {
+							metadata[mode.slug] = {
+								type: "mode",
+							}
+						}
+					}
+				}
+			} catch (error) {
+				// File doesn't exist or can't be read, skip
+			}
+
+			// Check MCPs in .roo/mcp.json
+			const projectMcpPath = path.join(workspaceFolder.uri.fsPath, ".roo", "mcp.json")
+			try {
+				const content = await fs.readFile(projectMcpPath, "utf-8")
+				const data = JSON.parse(content)
+				if (data?.mcpServers && typeof data.mcpServers === "object") {
+					for (const serverName of Object.keys(data.mcpServers)) {
+						metadata[serverName] = {
+							type: "mcp",
+						}
+					}
+				}
+			} catch (error) {
+				// File doesn't exist or can't be read, skip
+			}
+		} catch (error) {
+			console.error("Error checking project installations:", error)
+		}
+	}
+
+	/**
+	 * Check for global-level installed items
+	 */
+	private async checkGlobalInstallations(metadata: Record<string, { type: string }>): Promise<void> {
+		try {
+			const globalSettingsPath = await ensureSettingsDirectoryExists(this.context)
+
+			// Check global modes
+			const globalModesPath = path.join(globalSettingsPath, GlobalFileNames.customModes)
+			try {
+				const content = await fs.readFile(globalModesPath, "utf-8")
+				const data = yaml.parse(content)
+				if (data?.customModes && Array.isArray(data.customModes)) {
+					for (const mode of data.customModes) {
+						if (mode.slug) {
+							metadata[mode.slug] = {
+								type: "mode",
+							}
+						}
+					}
+				}
+			} catch (error) {
+				// File doesn't exist or can't be read, skip
+			}
+
+			// Check global MCPs
+			const globalMcpPath = path.join(globalSettingsPath, GlobalFileNames.mcpSettings)
+			try {
+				const content = await fs.readFile(globalMcpPath, "utf-8")
+				const data = JSON.parse(content)
+				if (data?.mcpServers && typeof data.mcpServers === "object") {
+					for (const serverName of Object.keys(data.mcpServers)) {
+						metadata[serverName] = {
+							type: "mcp",
+						}
+					}
+				}
+			} catch (error) {
+				// File doesn't exist or can't be read, skip
+			}
+		} catch (error) {
+			console.error("Error checking global installations:", error)
+		}
+	}
+}
--- a/src/services/marketplace/RemoteConfigLoader.ts
+++ b/src/services/marketplace/RemoteConfigLoader.ts
@ -0,0 +1,129 @@
+import axios from "axios"
+import * as yaml from "yaml"
+import { z } from "zod"
+import { getRooCodeApiUrl } from "@roo-code/cloud"
+import { MarketplaceItem, MarketplaceItemType } from "./types"
+import { modeMarketplaceItemSchema, mcpMarketplaceItemSchema } from "./schemas"
+
+// Response schemas for YAML API responses
+const modeMarketplaceResponse = z.object({
+	items: z.array(modeMarketplaceItemSchema),
+})
+
+const mcpMarketplaceResponse = z.object({
+	items: z.array(mcpMarketplaceItemSchema),
+})
+
+export class RemoteConfigLoader {
+	private apiBaseUrl: string
+	private cache: Map<string, { data: MarketplaceItem[]; timestamp: number }> = new Map()
+	private cacheDuration = 5 * 60 * 1000 // 5 minutes
+
+	constructor() {
+		this.apiBaseUrl = getRooCodeApiUrl()
+	}
+
+	async loadAllItems(): Promise<MarketplaceItem[]> {
+		const items: MarketplaceItem[] = []
+
+		const [modes, mcps] = await Promise.all([this.fetchModes(), this.fetchMcps()])
+
+		items.push(...modes, ...mcps)
+		return items
+	}
+
+	private async fetchModes(): Promise<MarketplaceItem[]> {
+		const cacheKey = "modes"
+		const cached = this.getFromCache(cacheKey)
+		if (cached) return cached
+
+		const data = await this.fetchWithRetry<string>(`${this.apiBaseUrl}/api/marketplace/modes`)
+
+		// Parse and validate YAML response
+		const yamlData = yaml.parse(data)
+		const validated = modeMarketplaceResponse.parse(yamlData)
+
+		const items = validated.items.map((item) => ({
+			type: "mode" as MarketplaceItemType,
+			...item,
+		}))
+
+		this.setCache(cacheKey, items)
+		return items
+	}
+
+	private async fetchMcps(): Promise<MarketplaceItem[]> {
+		const cacheKey = "mcps"
+		const cached = this.getFromCache(cacheKey)
+		if (cached) return cached
+
+		const data = await this.fetchWithRetry<string>(`${this.apiBaseUrl}/api/marketplace/mcps`)
+
+		// Parse and validate YAML response
+		const yamlData = yaml.parse(data)
+		const validated = mcpMarketplaceResponse.parse(yamlData)
+
+		const items = validated.items.map((item) => ({
+			type: "mcp" as MarketplaceItemType,
+			...item,
+		}))
+
+		this.setCache(cacheKey, items)
+		return items
+	}
+
+	private async fetchWithRetry<T>(url: string, maxRetries = 3): Promise<T> {
+		let lastError: Error
+
+		for (let i = 0; i < maxRetries; i++) {
+			try {
+				const response = await axios.get(url, {
+					timeout: 10000, // 10 second timeout
+					headers: {
+						Accept: "application/json",
+						"Content-Type": "application/json",
+					},
+				})
+				return response.data as T
+			} catch (error) {
+				lastError = error as Error
+				if (i < maxRetries - 1) {
+					// Exponential backoff: 1s, 2s, 4s
+					const delay = Math.pow(2, i) * 1000
+					await new Promise((resolve) => setTimeout(resolve, delay))
+				}
+			}
+		}
+
+		throw lastError!
+	}
+
+	async getItem(id: string, type: MarketplaceItemType): Promise<MarketplaceItem | null> {
+		const items = await this.loadAllItems()
+		return items.find((item) => item.id === id && item.type === type) || null
+	}
+
+	private getFromCache(key: string): MarketplaceItem[] | null {
+		const cached = this.cache.get(key)
+		if (!cached) return null
+
+		const now = Date.now()
+		if (now - cached.timestamp > this.cacheDuration) {
+			this.cache.delete(key)
+			return null
+		}
+
+		return cached.data
+	}
+
+	private setCache(key: string, data: MarketplaceItem[]): void {
+		this.cache.set(key, {
+			data,
+			timestamp: Date.now(),
+		})
+	}
+
+	clearCache(): void {
+		this.cache.clear()
+	}
+}
--- a/src/services/marketplace/SimpleInstaller.ts
+++ b/src/services/marketplace/SimpleInstaller.ts
@ -0,0 +1,347 @@
+import * as vscode from "vscode"
+import * as path from "path"
+import * as fs from "fs/promises"
+import * as yaml from "yaml"
+import { MarketplaceItem, MarketplaceItemType, InstallMarketplaceItemOptions, McpParameter } from "./types"
+import { GlobalFileNames } from "../../shared/globalFileNames"
+import { ensureSettingsDirectoryExists } from "../../utils/globalContext"
+
+export interface InstallOptions extends InstallMarketplaceItemOptions {
+	target: "project" | "global"
+	selectedIndex?: number // Which installation method to use (for array content)
+}
+
+export class SimpleInstaller {
+	constructor(private readonly context: vscode.ExtensionContext) {}
+
+	async installItem(item: MarketplaceItem, options: InstallOptions): Promise<{ filePath: string; line?: number }> {
+		const { target } = options
+
+		switch (item.type) {
+			case "mode":
+				return await this.installMode(item, target)
+			case "mcp":
+				return await this.installMcp(item, target, options)
+			default:
+				throw new Error(`Unsupported item type: ${item.type}`)
+		}
+	}
+
+	private async installMode(
+		item: MarketplaceItem,
+		target: "project" | "global",
+	): Promise<{ filePath: string; line?: number }> {
+		if (!item.content) {
+			throw new Error("Mode item missing content")
+		}
+
+		// Modes should always have string content, not array
+		if (Array.isArray(item.content)) {
+			throw new Error("Mode content should not be an array")
+		}
+
+		const filePath = await this.getModeFilePath(target)
+		const modeData = yaml.parse(item.content)
+
+		// Read existing file or create new structure
+		let existingData: any = { customModes: [] }
+		try {
+			const existing = await fs.readFile(filePath, "utf-8")
+			existingData = yaml.parse(existing) || { customModes: [] }
+		} catch (error: any) {
+			if (error.code === "ENOENT") {
+				// File doesn't exist, use default structure - this is fine
+				existingData = { customModes: [] }
+			} else if (error.name === "YAMLParseError" || error.message?.includes("YAML")) {
+				// YAML parsing error - don't overwrite the file!
+				const fileName = target === "project" ? ".roomodes" : "custom-modes.yaml"
+				throw new Error(
+					`Cannot install mode: The ${fileName} file contains invalid YAML. ` +
+						`Please fix the syntax errors in the file before installing new modes.`,
+				)
+			} else {
+				// Other unexpected errors - re-throw
+				throw error
+			}
+		}
+
+		// Ensure customModes array exists
+		if (!existingData.customModes) {
+			existingData.customModes = []
+		}
+
+		// The content is now a single mode object directly
+		if (!modeData.slug) {
+			throw new Error("Invalid mode content: mode missing slug")
+		}
+
+		// Remove existing mode with same slug if it exists
+		existingData.customModes = existingData.customModes.filter((mode: any) => mode.slug !== modeData.slug)
+
+		// Add the new mode
+		existingData.customModes.push(modeData)
+		const addedModeIndex = existingData.customModes.length - 1
+
+		// Write back to file
+		await fs.mkdir(path.dirname(filePath), { recursive: true })
+		const yamlContent = yaml.stringify(existingData)
+		await fs.writeFile(filePath, yamlContent, "utf-8")
+
+		// Calculate approximate line number where the new mode was added
+		let line: number | undefined
+		if (addedModeIndex >= 0) {
+			const lines = yamlContent.split("\n")
+			// Find the line containing the slug of the added mode
+			const addedMode = existingData.customModes[addedModeIndex]
+			if (addedMode?.slug) {
+				const slugLineIndex = lines.findIndex(
+					(l) => l.includes(`slug: ${addedMode.slug}`) || l.includes(`slug: "${addedMode.slug}"`),
+				)
+				if (slugLineIndex >= 0) {
+					line = slugLineIndex + 1 // Convert to 1-based line number
+				}
+			}
+		}
+
+		return { filePath, line }
+	}
+
+	private async installMcp(
+		item: MarketplaceItem,
+		target: "project" | "global",
+		options?: InstallOptions,
+	): Promise<{ filePath: string; line?: number }> {
+		if (!item.content) {
+			throw new Error("MCP item missing content")
+		}
+
+		// Get the content to use
+		let contentToUse: string
+		if (Array.isArray(item.content)) {
+			// Array of McpInstallationMethod objects
+			const index = options?.selectedIndex ?? 0
+			const method = item.content[index] || item.content[0]
+			contentToUse = method.content
+		} else {
+			contentToUse = item.content
+		}
+
+		// Get method-specific parameters if using array content
+		let methodParameters: McpParameter[] = []
+		if (Array.isArray(item.content)) {
+			const index = options?.selectedIndex ?? 0
+			const method = item.content[index] || item.content[0]
+			methodParameters = method.parameters || []
+		}
+
+		// Merge parameters (method-specific override global)
+		const allParameters = [...(item.parameters || []), ...methodParameters]
+		const uniqueParameters = Array.from(new Map(allParameters.map((p) => [p.key, p])).values())
+
+		// Replace parameters if provided
+		if (options?.parameters && uniqueParameters.length > 0) {
+			for (const param of uniqueParameters) {
+				const value = options.parameters[param.key]
+				if (value !== undefined) {
+					contentToUse = contentToUse.replace(new RegExp(`{{${param.key}}}`, "g"), String(value))
+				}
+			}
+		}
+
+		// Handle _selectedIndex from parameters if provided
+		if (options?.parameters?._selectedIndex !== undefined && Array.isArray(item.content)) {
+			const index = options.parameters._selectedIndex
+			if (index >= 0 && index < item.content.length) {
+				// Array of McpInstallationMethod objects
+				const method = item.content[index]
+				contentToUse = method.content
+				methodParameters = method.parameters || []
+
+				// Re-merge parameters with the newly selected method
+				const allParametersForNewMethod = [...(item.parameters || []), ...methodParameters]
+				const uniqueParametersForNewMethod = Array.from(
+					new Map(allParametersForNewMethod.map((p) => [p.key, p])).values(),
+				)
+
+				// Re-apply parameter replacements to the newly selected content
+				for (const param of uniqueParametersForNewMethod) {
+					const value = options.parameters[param.key]
+					if (value !== undefined) {
+						contentToUse = contentToUse.replace(new RegExp(`{{${param.key}}}`, "g"), String(value))
+					}
+				}
+			}
+		}
+
+		const filePath = await this.getMcpFilePath(target)
+		const mcpData = JSON.parse(contentToUse)
+
+		// Read existing file or create new structure
+		let existingData: any = { mcpServers: {} }
+		try {
+			const existing = await fs.readFile(filePath, "utf-8")
+			existingData = JSON.parse(existing) || { mcpServers: {} }
+		} catch (error: any) {
+			if (error.code === "ENOENT") {
+				// File doesn't exist, use default structure
+				existingData = { mcpServers: {} }
+			} else if (error instanceof SyntaxError) {
+				// JSON parsing error - don't overwrite the file!
+				const fileName = target === "project" ? ".roo/mcp.json" : "mcp-settings.json"
+				throw new Error(
+					`Cannot install MCP server: The ${fileName} file contains invalid JSON. ` +
+						`Please fix the syntax errors in the file before installing new servers.`,
+				)
+			} else {
+				// Other unexpected errors - re-throw
+				throw error
+			}
+		}
+
+		// Ensure mcpServers object exists
+		if (!existingData.mcpServers) {
+			existingData.mcpServers = {}
+		}
+
+		// Use the item id as the server name
+		const serverName = item.id
+
+		// Add or update the single server
+		existingData.mcpServers[serverName] = mcpData
+
+		// Write back to file
+		await fs.mkdir(path.dirname(filePath), { recursive: true })
+		const jsonContent = JSON.stringify(existingData, null, 2)
+		await fs.writeFile(filePath, jsonContent, "utf-8")
+
+		// Calculate approximate line number where the new server was added
+		let line: number | undefined
+		if (serverName) {
+			const lines = jsonContent.split("\n")
+			// Find the line containing the server name
+			const serverLineIndex = lines.findIndex((l) => l.includes(`"${serverName}"`))
+			if (serverLineIndex >= 0) {
+				line = serverLineIndex + 1 // Convert to 1-based line number
+			}
+		}
+
+		return { filePath, line }
+	}
+
+	async removeItem(item: MarketplaceItem, options: InstallOptions): Promise<void> {
+		const { target } = options
+
+		switch (item.type) {
+			case "mode":
+				await this.removeMode(item, target)
+				break
+			case "mcp":
+				await this.removeMcp(item, target)
+				break
+			default:
+				throw new Error(`Unsupported item type: ${item.type}`)
+		}
+	}
+
+	private async removeMode(item: MarketplaceItem, target: "project" | "global"): Promise<void> {
+		const filePath = await this.getModeFilePath(target)
+
+		try {
+			const existing = await fs.readFile(filePath, "utf-8")
+			let existingData: any
+
+			try {
+				existingData = yaml.parse(existing)
+			} catch (parseError) {
+				// If we can't parse the file, we can't safely remove a mode
+				const fileName = target === "project" ? ".roomodes" : "custom-modes.yaml"
+				throw new Error(
+					`Cannot remove mode: The ${fileName} file contains invalid YAML. ` +
+						`Please fix the syntax errors before removing modes.`,
+				)
+			}
+
+			if (existingData?.customModes) {
+				// Parse the item content to get the slug
+				let content: string
+				if (Array.isArray(item.content)) {
+					// Array of McpInstallationMethod objects - use first method
+					content = item.content[0].content
+				} else {
+					content = item.content
+				}
+				const modeData = yaml.parse(content || "")
+
+				if (!modeData.slug) {
+					return // Nothing to remove if no slug
+				}
+
+				// Remove mode with matching slug
+				existingData.customModes = existingData.customModes.filter((mode: any) => mode.slug !== modeData.slug)
+
+				// Always write back the file, even if empty
+				await fs.writeFile(filePath, yaml.stringify(existingData), "utf-8")
+			}
+		} catch (error: any) {
+			if (error.code === "ENOENT") {
+				// File doesn't exist, nothing to remove
+				return
+			}
+			throw error
+		}
+	}
+
+	private async removeMcp(item: MarketplaceItem, target: "project" | "global"): Promise<void> {
+		const filePath = await this.getMcpFilePath(target)
+
+		try {
+			const existing = await fs.readFile(filePath, "utf-8")
+			const existingData = JSON.parse(existing)
+
+			if (existingData?.mcpServers) {
+				// Parse the item content to get server names
+				let content: string
+				if (Array.isArray(item.content)) {
+					// Array of McpInstallationMethod objects - use first method
+					content = item.content[0].content
+				} else {
+					content = item.content
+				}
+
+				const serverName = item.id
+				delete existingData.mcpServers[serverName]
+
+				// Always write back the file, even if empty
+				await fs.writeFile(filePath, JSON.stringify(existingData, null, 2), "utf-8")
+			}
+		} catch (error) {
+			// File doesn't exist or other error, nothing to remove
+		}
+	}
+
+	private async getModeFilePath(target: "project" | "global"): Promise<string> {
+		if (target === "project") {
+			const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
+			if (!workspaceFolder) {
+				throw new Error("No workspace folder found")
+			}
+			return path.join(workspaceFolder.uri.fsPath, ".roomodes")
+		} else {
+			const globalSettingsPath = await ensureSettingsDirectoryExists(this.context)
+			return path.join(globalSettingsPath, GlobalFileNames.customModes)
+		}
+	}
+
+	private async getMcpFilePath(target: "project" | "global"): Promise<string> {
+		if (target === "project") {
+			const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
+			if (!workspaceFolder) {
+				throw new Error("No workspace folder found")
+			}
+			return path.join(workspaceFolder.uri.fsPath, ".roo", "mcp.json")
+		} else {
+			const globalSettingsPath = await ensureSettingsDirectoryExists(this.context)
+			return path.join(globalSettingsPath, GlobalFileNames.mcpSettings)
+		}
+	}
+}
--- a/src/services/marketplace/tests/MarketplaceManager.spec.ts
+++ b/src/services/marketplace/tests/MarketplaceManager.spec.ts
@ -0,0 +1,237 @@
+import { MarketplaceManager } from "../MarketplaceManager"
+import { vi } from "vitest"
+
+// Mock dependencies for vitest
+vi.mock("fs/promises", () => ({
+	readFile: vi.fn(),
+}))
+vi.mock("yaml", () => ({
+	parse: vi.fn(),
+}))
+vi.mock("vscode", () => ({
+	workspace: {
+		workspaceFolders: [
+			{
+				uri: { fsPath: "/test/workspace" },
+			},
+		],
+		openTextDocument: vi.fn(),
+	},
+	window: {
+		showInformationMessage: vi.fn(),
+		showErrorMessage: vi.fn(),
+		showTextDocument: vi.fn(),
+	},
+	Range: class MockRange {
+		start: { line: number; character: number }
+		end: { line: number; character: number }
+
+		constructor(startLine: number, startCharacter: number, endLine: number, endCharacter: number) {
+			this.start = { line: startLine, character: startCharacter }
+			this.end = { line: endLine, character: endCharacter }
+		}
+	},
+}))
+vi.mock("../../../shared/globalFileNames", () => ({
+	GlobalFileNames: {
+		mcpSettings: "mcp_settings.json",
+		customModes: "custom_modes.yaml",
+	},
+}))
+vi.mock("../../../utils/globalContext", () => ({
+	ensureSettingsDirectoryExists: vi.fn().mockResolvedValue("/mock/global/settings"),
+}))
+
+// Import the mocked modules
+import * as fs from "fs/promises"
+import * as yaml from "yaml"
+
+const mockFs = fs as any
+const mockYaml = yaml as any
+
+// Create a mock vscode module for type safety
+const mockVscode = {
+	workspace: {
+		workspaceFolders: [
+			{
+				uri: { fsPath: "/test/workspace" },
+			},
+		],
+	},
+} as any
+
+describe("MarketplaceManager", () => {
+	let marketplaceManager: MarketplaceManager
+	let mockContext: any
+
+	beforeEach(() => {
+		vi.clearAllMocks()
+
+		// Mock VSCode workspace
+		mockVscode.workspace = {
+			workspaceFolders: [
+				{
+					uri: { fsPath: "/test/workspace" },
+				},
+			],
+		} as any
+
+		// Mock extension context
+		mockContext = {} as any
+
+		marketplaceManager = new MarketplaceManager(mockContext)
+	})
+
+	describe("getInstallationMetadata", () => {
+		it("should return empty metadata when no config files exist", async () => {
+			// Mock file read failures (files don't exist)
+			mockFs.readFile.mockRejectedValue(new Error("ENOENT: no such file or directory"))
+
+			const result = await marketplaceManager.getInstallationMetadata()
+
+			expect(result).toEqual({
+				project: {},
+				global: {},
+			})
+		})
+
+		it("should parse project MCP configuration correctly", async () => {
+			const mockMcpConfig = {
+				mcpServers: {
+					"test-mcp": {
+						command: "node",
+						args: ["test.js"],
+					},
+				},
+			}
+
+			mockFs.readFile.mockImplementation((filePath: any) => {
+				// Normalize path separators for cross-platform compatibility
+				const normalizedPath = filePath.replace(/\\/g, "/")
+				if (normalizedPath.includes(".roo/mcp.json")) {
+					return Promise.resolve(JSON.stringify(mockMcpConfig))
+				}
+				return Promise.reject(new Error("ENOENT"))
+			})
+
+			const result = await marketplaceManager.getInstallationMetadata()
+
+			expect(result.project["test-mcp"]).toEqual({
+				type: "mcp",
+			})
+		})
+
+		it("should parse project modes configuration correctly", async () => {
+			const mockModesConfig = {
+				customModes: [
+					{
+						slug: "test-mode",
+						name: "Test Mode",
+						description: "A test mode",
+					},
+				],
+			}
+
+			mockFs.readFile.mockImplementation((filePath: any) => {
+				// Normalize path separators for cross-platform compatibility
+				const normalizedPath = filePath.replace(/\\/g, "/")
+				if (normalizedPath.includes(".roomodes")) {
+					return Promise.resolve("mock-yaml-content")
+				}
+				return Promise.reject(new Error("ENOENT"))
+			})
+
+			mockYaml.parse.mockReturnValue(mockModesConfig)
+
+			const result = await marketplaceManager.getInstallationMetadata()
+
+			expect(result.project["test-mode"]).toEqual({
+				type: "mode",
+			})
+		})
+
+		it("should parse global configurations correctly", async () => {
+			const mockGlobalMcp = {
+				mcpServers: {
+					"global-mcp": {
+						command: "node",
+						args: ["global.js"],
+					},
+				},
+			}
+
+			const mockGlobalModes = {
+				customModes: [
+					{
+						slug: "global-mode",
+						name: "Global Mode",
+						description: "A global mode",
+					},
+				],
+			}
+
+			mockFs.readFile.mockImplementation((filePath: any) => {
+				// Normalize path separators for cross-platform compatibility
+				const normalizedPath = filePath.replace(/\\/g, "/")
+				if (normalizedPath.includes("mcp_settings.json")) {
+					return Promise.resolve(JSON.stringify(mockGlobalMcp))
+				}
+				if (normalizedPath.includes("custom_modes.yaml")) {
+					return Promise.resolve("mock-yaml-content")
+				}
+				return Promise.reject(new Error("ENOENT"))
+			})
+
+			mockYaml.parse.mockReturnValue(mockGlobalModes)
+
+			const result = await marketplaceManager.getInstallationMetadata()
+
+			expect(result.global["global-mcp"]).toEqual({
+				type: "mcp",
+			})
+			expect(result.global["global-mode"]).toEqual({
+				type: "mode",
+			})
+		})
+
+		it("should handle mixed project and global installations", async () => {
+			const mockProjectMcp = {
+				mcpServers: {
+					"project-mcp": { command: "node", args: ["project.js"] },
+				},
+			}
+
+			const mockGlobalModes = {
+				customModes: [
+					{
+						slug: "global-mode",
+						name: "Global Mode",
+					},
+				],
+			}
+
+			mockFs.readFile.mockImplementation((filePath: any) => {
+				// Normalize path separators for cross-platform compatibility
+				const normalizedPath = filePath.replace(/\\/g, "/")
+				if (normalizedPath.includes(".roo/mcp.json")) {
+					return Promise.resolve(JSON.stringify(mockProjectMcp))
+				}
+				if (normalizedPath.includes("custom_modes.yaml")) {
+					return Promise.resolve("mock-yaml-content")
+				}
+				return Promise.reject(new Error("ENOENT"))
+			})
+
+			mockYaml.parse.mockReturnValue(mockGlobalModes)
+
+			const result = await marketplaceManager.getInstallationMetadata()
+
+			expect(result.project["project-mcp"]).toEqual({
+				type: "mcp",
+			})
+			expect(result.global["global-mode"]).toEqual({
+				type: "mode",
+			})
+		})
+	})
+})
--- a/src/services/marketplace/tests/MarketplaceManager.test.ts
+++ b/src/services/marketplace/tests/MarketplaceManager.test.ts
@ -0,0 +1,269 @@
+import { MarketplaceManager } from "../MarketplaceManager"
+import { MarketplaceItem } from "../types"
+
+// Mock axios
+jest.mock("axios")
+
+// Mock the cloud config
+jest.mock("@roo-code/cloud", () => ({
+	getRooCodeApiUrl: () => "https://test.api.com",
+}))
+
+// Mock TelemetryService
+jest.mock("../../../../packages/telemetry/src/TelemetryService", () => ({
+	TelemetryService: {
+		instance: {
+			captureMarketplaceItemInstalled: jest.fn(),
+			captureMarketplaceItemRemoved: jest.fn(),
+		},
+	},
+}))
+
+// Mock vscode first
+jest.mock("vscode", () => ({
+	workspace: {
+		workspaceFolders: [
+			{
+				uri: { fsPath: "/test/workspace" },
+				name: "test",
+				index: 0,
+			},
+		],
+		openTextDocument: jest.fn(),
+	},
+	window: {
+		showInformationMessage: jest.fn(),
+		showErrorMessage: jest.fn(),
+		showTextDocument: jest.fn(),
+	},
+	Range: jest.fn().mockImplementation((startLine, startChar, endLine, endChar) => ({
+		start: { line: startLine, character: startChar },
+		end: { line: endLine, character: endChar },
+	})),
+}))
+
+const mockContext = {
+	subscriptions: [],
+	workspaceState: {
+		get: jest.fn(),
+		update: jest.fn(),
+	},
+	globalState: {
+		get: jest.fn(),
+		update: jest.fn(),
+	},
+	extensionUri: { fsPath: "/test/extension" },
+} as any
+
+// Mock fs
+jest.mock("fs/promises", () => ({
+	readFile: jest.fn(),
+	access: jest.fn(),
+	writeFile: jest.fn(),
+	mkdir: jest.fn(),
+}))
+
+// Mock yaml
+jest.mock("yaml", () => ({
+	parse: jest.fn(),
+	stringify: jest.fn(),
+}))
+
+describe("MarketplaceManager", () => {
+	let manager: MarketplaceManager
+
+	beforeEach(() => {
+		manager = new MarketplaceManager(mockContext)
+		jest.clearAllMocks()
+	})
+
+	describe("filterItems", () => {
+		it("should filter items by search term", () => {
+			const items: MarketplaceItem[] = [
+				{
+					id: "test-mode",
+					name: "Test Mode",
+					description: "A test mode for testing",
+					type: "mode",
+					content: "# Test Mode\nThis is a test mode.",
+				},
+				{
+					id: "other-mode",
+					name: "Other Mode",
+					description: "Another mode",
+					type: "mode",
+					content: "# Other Mode\nThis is another mode.",
+				},
+			]
+
+			const filtered = manager.filterItems(items, { search: "test" })
+
+			expect(filtered).toHaveLength(1)
+			expect(filtered[0].name).toBe("Test Mode")
+		})
+
+		it("should filter items by type", () => {
+			const items: MarketplaceItem[] = [
+				{
+					id: "test-mode",
+					name: "Test Mode",
+					description: "A test mode",
+					type: "mode",
+					content: "# Test Mode",
+				},
+				{
+					id: "test-mcp",
+					name: "Test MCP",
+					description: "A test MCP",
+					type: "mcp",
+					content: '{"command": "node", "args": ["server.js"]}',
+				},
+			]
+
+			const filtered = manager.filterItems(items, { type: "mode" })
+
+			expect(filtered).toHaveLength(1)
+			expect(filtered[0].type).toBe("mode")
+		})
+
+		it("should return empty array when no items match", () => {
+			const items: MarketplaceItem[] = [
+				{
+					id: "test-mode",
+					name: "Test Mode",
+					description: "A test mode",
+					type: "mode",
+					content: "# Test Mode",
+				},
+			]
+
+			const filtered = manager.filterItems(items, { search: "nonexistent" })
+
+			expect(filtered).toHaveLength(0)
+		})
+	})
+
+	describe("getMarketplaceItems", () => {
+		it("should return items from API", async () => {
+			// Mock the config loader to return test data
+			const mockItems: MarketplaceItem[] = [
+				{
+					id: "test-mode",
+					name: "Test Mode",
+					description: "A test mode",
+					type: "mode",
+					content: "# Test Mode",
+				},
+			]
+
+			// Mock the loadAllItems method
+			jest.spyOn(manager["configLoader"], "loadAllItems").mockResolvedValue(mockItems)
+
+			const result = await manager.getMarketplaceItems()
+
+			expect(result.items).toHaveLength(1)
+			expect(result.items[0].name).toBe("Test Mode")
+		})
+
+		it("should handle API errors gracefully", async () => {
+			// Mock the config loader to throw an error
+			jest.spyOn(manager["configLoader"], "loadAllItems").mockRejectedValue(new Error("API request failed"))
+
+			const result = await manager.getMarketplaceItems()
+
+			expect(result.items).toHaveLength(0)
+			expect(result.errors).toEqual(["API request failed"])
+		})
+	})
+
+	describe("installMarketplaceItem", () => {
+		it("should install a mode item", async () => {
+			const item: MarketplaceItem = {
+				id: "test-mode",
+				name: "Test Mode",
+				description: "A test mode",
+				type: "mode",
+				content: "# Test Mode\nThis is a test mode.",
+			}
+
+			// Mock the installer
+			jest.spyOn(manager["installer"], "installItem").mockResolvedValue({
+				filePath: "/test/path/.roomodes",
+				line: 5,
+			})
+
+			const result = await manager.installMarketplaceItem(item)
+
+			expect(manager["installer"].installItem).toHaveBeenCalledWith(item, { target: "project" })
+			expect(result).toBe("/test/path/.roomodes")
+		})
+
+		it("should install an MCP item", async () => {
+			const item: MarketplaceItem = {
+				id: "test-mcp",
+				name: "Test MCP",
+				description: "A test MCP",
+				type: "mcp",
+				content: '{"command": "node", "args": ["server.js"]}',
+			}
+
+			// Mock the installer
+			jest.spyOn(manager["installer"], "installItem").mockResolvedValue({
+				filePath: "/test/path/.roo/mcp.json",
+				line: 3,
+			})
+
+			const result = await manager.installMarketplaceItem(item)
+
+			expect(manager["installer"].installItem).toHaveBeenCalledWith(item, { target: "project" })
+			expect(result).toBe("/test/path/.roo/mcp.json")
+		})
+	})
+
+	describe("removeInstalledMarketplaceItem", () => {
+		it("should remove a mode item", async () => {
+			const item: MarketplaceItem = {
+				id: "test-mode",
+				name: "Test Mode",
+				description: "A test mode",
+				type: "mode",
+				content: "# Test Mode",
+			}
+
+			// Mock the installer
+			jest.spyOn(manager["installer"], "removeItem").mockResolvedValue()
+
+			await manager.removeInstalledMarketplaceItem(item)
+
+			expect(manager["installer"].removeItem).toHaveBeenCalledWith(item, { target: "project" })
+		})
+
+		it("should remove an MCP item", async () => {
+			const item: MarketplaceItem = {
+				id: "test-mcp",
+				name: "Test MCP",
+				description: "A test MCP",
+				type: "mcp",
+				content: '{"command": "node", "args": ["server.js"]}',
+			}
+
+			// Mock the installer
+			jest.spyOn(manager["installer"], "removeItem").mockResolvedValue()
+
+			await manager.removeInstalledMarketplaceItem(item)
+
+			expect(manager["installer"].removeItem).toHaveBeenCalledWith(item, { target: "project" })
+		})
+	})
+
+	describe("cleanup", () => {
+		it("should clear API cache", async () => {
+			// Mock the clearCache method
+			jest.spyOn(manager["configLoader"], "clearCache")
+
+			await manager.cleanup()
+
+			expect(manager["configLoader"].clearCache).toHaveBeenCalled()
+		})
+	})
+})
--- a/src/services/marketplace/tests/RemoteConfigLoader.test.ts
+++ b/src/services/marketplace/tests/RemoteConfigLoader.test.ts
@ -0,0 +1,333 @@
+import axios from "axios"
+import { RemoteConfigLoader } from "../RemoteConfigLoader"
+import { MarketplaceItemType } from "../types"
+
+// Mock axios
+jest.mock("axios")
+const mockedAxios = axios as jest.Mocked<typeof axios>
+
+// Mock the cloud config
+jest.mock("@roo-code/cloud", () => ({
+	getRooCodeApiUrl: () => "https://test.api.com",
+}))
+
+describe("RemoteConfigLoader", () => {
+	let loader: RemoteConfigLoader
+
+	beforeEach(() => {
+		loader = new RemoteConfigLoader()
+		jest.clearAllMocks()
+		// Clear any existing cache
+		loader.clearCache()
+	})
+
+	describe("loadAllItems", () => {
+		it("should fetch and combine modes and MCPs from API", async () => {
+			const mockModesYaml = `items:
+  - id: "test-mode"
+    name: "Test Mode"
+    description: "A test mode"
+    content: "customModes:\\n  - slug: test\\n    name: Test"`
+
+			const mockMcpsYaml = `items:
+  - id: "test-mcp"
+    name: "Test MCP"
+    description: "A test MCP"
+    url: "https://github.com/test/test-mcp"
+    content: '{"command": "test"}'`
+
+			mockedAxios.get.mockImplementation((url) => {
+				if (url.includes("/modes")) {
+					return Promise.resolve({ data: mockModesYaml })
+				}
+				if (url.includes("/mcps")) {
+					return Promise.resolve({ data: mockMcpsYaml })
+				}
+				return Promise.reject(new Error("Unknown URL"))
+			})
+
+			const items = await loader.loadAllItems()
+
+			expect(mockedAxios.get).toHaveBeenCalledTimes(2)
+			expect(mockedAxios.get).toHaveBeenCalledWith(
+				"https://test.api.com/api/marketplace/modes",
+				expect.objectContaining({
+					timeout: 10000,
+					headers: {
+						Accept: "application/json",
+						"Content-Type": "application/json",
+					},
+				}),
+			)
+			expect(mockedAxios.get).toHaveBeenCalledWith(
+				"https://test.api.com/api/marketplace/mcps",
+				expect.objectContaining({
+					timeout: 10000,
+					headers: {
+						Accept: "application/json",
+						"Content-Type": "application/json",
+					},
+				}),
+			)
+
+			expect(items).toHaveLength(2)
+			expect(items[0]).toEqual({
+				type: "mode",
+				id: "test-mode",
+				name: "Test Mode",
+				description: "A test mode",
+				content: "customModes:\n  - slug: test\n    name: Test",
+			})
+			expect(items[1]).toEqual({
+				type: "mcp",
+				id: "test-mcp",
+				name: "Test MCP",
+				description: "A test MCP",
+				url: "https://github.com/test/test-mcp",
+				content: '{"command": "test"}',
+			})
+		})
+
+		it("should use cache on subsequent calls", async () => {
+			const mockModesYaml = `items:
+  - id: "test-mode"
+    name: "Test Mode"
+    description: "A test mode"
+    content: "test content"`
+
+			const mockMcpsYaml = `items:
+  - id: "test-mcp"
+    name: "Test MCP"
+    description: "A test MCP"
+    url: "https://github.com/test/test-mcp"
+    content: "test content"`
+
+			mockedAxios.get.mockImplementation((url) => {
+				if (url.includes("/modes")) {
+					return Promise.resolve({ data: mockModesYaml })
+				}
+				if (url.includes("/mcps")) {
+					return Promise.resolve({ data: mockMcpsYaml })
+				}
+				return Promise.reject(new Error("Unknown URL"))
+			})
+
+			// First call - should hit API
+			const items1 = await loader.loadAllItems()
+			expect(mockedAxios.get).toHaveBeenCalledTimes(2)
+
+			// Second call - should use cache
+			const items2 = await loader.loadAllItems()
+			expect(mockedAxios.get).toHaveBeenCalledTimes(2) // Still 2, not 4
+
+			expect(items1).toEqual(items2)
+		})
+
+		it("should retry on network failures", async () => {
+			const mockModesYaml = `items:
+  - id: "test-mode"
+    name: "Test Mode"
+    description: "A test mode"
+    content: "test content"`
+
+			const mockMcpsYaml = `items: []`
+
+			// Mock modes endpoint to fail twice then succeed
+			let modesCallCount = 0
+			mockedAxios.get.mockImplementation((url) => {
+				if (url.includes("/modes")) {
+					modesCallCount++
+					if (modesCallCount <= 2) {
+						return Promise.reject(new Error("Network error"))
+					}
+					return Promise.resolve({ data: mockModesYaml })
+				}
+				if (url.includes("/mcps")) {
+					return Promise.resolve({ data: mockMcpsYaml })
+				}
+				return Promise.reject(new Error("Unknown URL"))
+			})
+
+			const items = await loader.loadAllItems()
+
+			// Should have retried modes endpoint 3 times (2 failures + 1 success)
+			expect(modesCallCount).toBe(3)
+			expect(items).toHaveLength(1)
+			expect(items[0].type).toBe("mode")
+		})
+
+		it("should throw error after max retries", async () => {
+			mockedAxios.get.mockRejectedValue(new Error("Persistent network error"))
+
+			await expect(loader.loadAllItems()).rejects.toThrow("Persistent network error")
+
+			// Both endpoints will be called with retries since Promise.all starts both promises
+			// Each endpoint retries 3 times, but due to Promise.all behavior, one might fail faster
+			expect(mockedAxios.get).toHaveBeenCalledWith(
+				expect.stringContaining("/api/marketplace/"),
+				expect.any(Object),
+			)
+			// Verify we got at least some retry attempts (should be at least 2 calls)
+			expect(mockedAxios.get.mock.calls.length).toBeGreaterThanOrEqual(2)
+		})
+
+		it("should handle invalid data gracefully", async () => {
+			const invalidModesYaml = `items:
+  - id: "invalid-mode"
+    # Missing required fields like name and description`
+
+			const validMcpsYaml = `items:
+  - id: "valid-mcp"
+    name: "Valid MCP"
+    description: "A valid MCP"
+    url: "https://github.com/test/test-mcp"
+    content: "test content"`
+
+			mockedAxios.get.mockImplementation((url) => {
+				if (url.includes("/modes")) {
+					return Promise.resolve({ data: invalidModesYaml })
+				}
+				if (url.includes("/mcps")) {
+					return Promise.resolve({ data: validMcpsYaml })
+				}
+				return Promise.reject(new Error("Unknown URL"))
+			})
+
+			// Should throw validation error for invalid modes
+			await expect(loader.loadAllItems()).rejects.toThrow()
+		})
+	})
+
+	describe("getItem", () => {
+		it("should find specific item by id and type", async () => {
+			const mockModesYaml = `items:
+  - id: "target-mode"
+    name: "Target Mode"
+    description: "The mode we want"
+    content: "test content"`
+
+			const mockMcpsYaml = `items:
+  - id: "target-mcp"
+    name: "Target MCP"
+    description: "The MCP we want"
+    url: "https://github.com/test/test-mcp"
+    content: "test content"`
+
+			mockedAxios.get.mockImplementation((url) => {
+				if (url.includes("/modes")) {
+					return Promise.resolve({ data: mockModesYaml })
+				}
+				if (url.includes("/mcps")) {
+					return Promise.resolve({ data: mockMcpsYaml })
+				}
+				return Promise.reject(new Error("Unknown URL"))
+			})
+
+			const modeItem = await loader.getItem("target-mode", "mode" as MarketplaceItemType)
+			const mcpItem = await loader.getItem("target-mcp", "mcp" as MarketplaceItemType)
+			const notFound = await loader.getItem("nonexistent", "mode" as MarketplaceItemType)
+
+			expect(modeItem).toEqual({
+				type: "mode",
+				id: "target-mode",
+				name: "Target Mode",
+				description: "The mode we want",
+				content: "test content",
+			})
+
+			expect(mcpItem).toEqual({
+				type: "mcp",
+				id: "target-mcp",
+				name: "Target MCP",
+				description: "The MCP we want",
+				url: "https://github.com/test/test-mcp",
+				content: "test content",
+			})
+
+			expect(notFound).toBeNull()
+		})
+	})
+
+	describe("clearCache", () => {
+		it("should clear cache and force fresh API calls", async () => {
+			const mockModesYaml = `items:
+  - id: "test-mode"
+    name: "Test Mode"
+    description: "A test mode"
+    content: "test content"`
+
+			const mockMcpsYaml = `items: []`
+
+			mockedAxios.get.mockImplementation((url) => {
+				if (url.includes("/modes")) {
+					return Promise.resolve({ data: mockModesYaml })
+				}
+				if (url.includes("/mcps")) {
+					return Promise.resolve({ data: mockMcpsYaml })
+				}
+				return Promise.reject(new Error("Unknown URL"))
+			})
+
+			// First call
+			await loader.loadAllItems()
+			expect(mockedAxios.get).toHaveBeenCalledTimes(2)
+
+			// Second call - should use cache
+			await loader.loadAllItems()
+			expect(mockedAxios.get).toHaveBeenCalledTimes(2)
+
+			// Clear cache
+			loader.clearCache()
+
+			// Third call - should hit API again
+			await loader.loadAllItems()
+			expect(mockedAxios.get).toHaveBeenCalledTimes(4)
+		})
+	})
+
+	describe("cache expiration", () => {
+		it("should expire cache after 5 minutes", async () => {
+			const mockModesYaml = `items:
+  - id: "test-mode"
+    name: "Test Mode"
+    description: "A test mode"
+    content: "test content"`
+
+			const mockMcpsYaml = `items: []`
+
+			mockedAxios.get.mockImplementation((url) => {
+				if (url.includes("/modes")) {
+					return Promise.resolve({ data: mockModesYaml })
+				}
+				if (url.includes("/mcps")) {
+					return Promise.resolve({ data: mockMcpsYaml })
+				}
+				return Promise.reject(new Error("Unknown URL"))
+			})
+
+			// Mock Date.now to control time
+			const originalDateNow = Date.now
+			let currentTime = 1000000
+
+			Date.now = jest.fn(() => currentTime)
+
+			// First call
+			await loader.loadAllItems()
+			expect(mockedAxios.get).toHaveBeenCalledTimes(2)
+
+			// Second call immediately - should use cache
+			await loader.loadAllItems()
+			expect(mockedAxios.get).toHaveBeenCalledTimes(2)
+
+			// Advance time by 6 minutes (360,000 ms)
+			currentTime += 6 * 60 * 1000
+
+			// Third call - cache should be expired
+			await loader.loadAllItems()
+			expect(mockedAxios.get).toHaveBeenCalledTimes(4)
+
+			// Restore original Date.now
+			Date.now = originalDateNow
+		})
+	})
+})
--- a/src/services/marketplace/tests/SimpleInstaller.test.ts
+++ b/src/services/marketplace/tests/SimpleInstaller.test.ts
@ -0,0 +1,225 @@
+import { SimpleInstaller } from "../SimpleInstaller"
+import * as fs from "fs/promises"
+import * as yaml from "yaml"
+import * as vscode from "vscode"
+import { MarketplaceItem } from "../types"
+import * as path from "path"
+
+jest.mock("fs/promises")
+jest.mock("vscode", () => ({
+	workspace: {
+		workspaceFolders: [
+			{
+				uri: { fsPath: "/test/workspace" },
+				name: "test",
+				index: 0,
+			},
+		],
+	},
+}))
+jest.mock("../../../utils/globalContext")
+
+const mockFs = fs as jest.Mocked<typeof fs>
+
+describe("SimpleInstaller", () => {
+	let installer: SimpleInstaller
+	let mockContext: vscode.ExtensionContext
+
+	beforeEach(() => {
+		mockContext = {} as vscode.ExtensionContext
+		installer = new SimpleInstaller(mockContext)
+		jest.clearAllMocks()
+
+		// Mock mkdir to always succeed
+		mockFs.mkdir.mockResolvedValue(undefined as any)
+	})
+
+	describe("installMode", () => {
+		const mockModeItem: MarketplaceItem = {
+			id: "test-mode",
+			name: "Test Mode",
+			description: "A test mode for testing",
+			type: "mode",
+			content: yaml.stringify({
+				slug: "test",
+				name: "Test Mode",
+				roleDefinition: "Test role",
+				groups: ["read"],
+			}),
+		}
+
+		it("should install mode when .roomodes file does not exist", async () => {
+			// Mock file not found error
+			const notFoundError = new Error("File not found") as any
+			notFoundError.code = "ENOENT"
+			mockFs.readFile.mockRejectedValueOnce(notFoundError)
+			mockFs.writeFile.mockResolvedValueOnce(undefined as any)
+
+			const result = await installer.installItem(mockModeItem, { target: "project" })
+
+			expect(result.filePath).toBe(path.join("/test/workspace", ".roomodes"))
+			expect(mockFs.writeFile).toHaveBeenCalled()
+
+			// Verify the written content contains the new mode
+			const writtenContent = mockFs.writeFile.mock.calls[0][1] as string
+			const writtenData = yaml.parse(writtenContent)
+			expect(writtenData.customModes).toHaveLength(1)
+			expect(writtenData.customModes[0].slug).toBe("test")
+		})
+
+		it("should install mode when .roomodes contains valid YAML", async () => {
+			const existingContent = yaml.stringify({
+				customModes: [{ slug: "existing", name: "Existing Mode", roleDefinition: "Existing", groups: [] }],
+			})
+
+			mockFs.readFile.mockResolvedValueOnce(existingContent)
+			mockFs.writeFile.mockResolvedValueOnce(undefined as any)
+
+			await installer.installItem(mockModeItem, { target: "project" })
+
+			expect(mockFs.writeFile).toHaveBeenCalled()
+			const writtenContent = mockFs.writeFile.mock.calls[0][1] as string
+			const writtenData = yaml.parse(writtenContent)
+
+			// Should contain both existing and new mode
+			expect(writtenData.customModes).toHaveLength(2)
+			expect(writtenData.customModes.find((m: any) => m.slug === "existing")).toBeDefined()
+			expect(writtenData.customModes.find((m: any) => m.slug === "test")).toBeDefined()
+		})
+
+		it("should throw error when .roomodes contains invalid YAML", async () => {
+			const invalidYaml = "invalid: yaml: content: {"
+
+			mockFs.readFile.mockResolvedValueOnce(invalidYaml)
+
+			await expect(installer.installItem(mockModeItem, { target: "project" })).rejects.toThrow(
+				"Cannot install mode: The .roomodes file contains invalid YAML",
+			)
+
+			// Should NOT write to file
+			expect(mockFs.writeFile).not.toHaveBeenCalled()
+		})
+
+		it("should replace existing mode with same slug", async () => {
+			const existingContent = yaml.stringify({
+				customModes: [{ slug: "test", name: "Old Test Mode", roleDefinition: "Old role", groups: [] }],
+			})
+
+			mockFs.readFile.mockResolvedValueOnce(existingContent)
+			mockFs.writeFile.mockResolvedValueOnce(undefined as any)
+
+			await installer.installItem(mockModeItem, { target: "project" })
+
+			const writtenContent = mockFs.writeFile.mock.calls[0][1] as string
+			const writtenData = yaml.parse(writtenContent)
+
+			// Should contain only one mode with updated content
+			expect(writtenData.customModes).toHaveLength(1)
+			expect(writtenData.customModes[0].slug).toBe("test")
+			expect(writtenData.customModes[0].name).toBe("Test Mode") // New name
+		})
+	})
+
+	describe("installMcp", () => {
+		const mockMcpItem: MarketplaceItem = {
+			id: "test-mcp",
+			name: "Test MCP",
+			description: "A test MCP server for testing",
+			type: "mcp",
+			content: JSON.stringify({
+				command: "test-server",
+				args: ["--test"],
+			}),
+		}
+
+		it("should install MCP when mcp.json file does not exist", async () => {
+			const notFoundError = new Error("File not found") as any
+			notFoundError.code = "ENOENT"
+			mockFs.readFile.mockRejectedValueOnce(notFoundError)
+			mockFs.writeFile.mockResolvedValueOnce(undefined as any)
+
+			const result = await installer.installItem(mockMcpItem, { target: "project" })
+
+			expect(result.filePath).toBe(path.join("/test/workspace", ".roo", "mcp.json"))
+			expect(mockFs.writeFile).toHaveBeenCalled()
+
+			// Verify the written content contains the new server
+			const writtenContent = mockFs.writeFile.mock.calls[0][1] as string
+			const writtenData = JSON.parse(writtenContent)
+			expect(writtenData.mcpServers["test-mcp"]).toBeDefined()
+		})
+
+		it("should throw error when mcp.json contains invalid JSON", async () => {
+			const invalidJson = '{ "mcpServers": { invalid json'
+
+			mockFs.readFile.mockResolvedValueOnce(invalidJson)
+
+			await expect(installer.installItem(mockMcpItem, { target: "project" })).rejects.toThrow(
+				"Cannot install MCP server: The .roo/mcp.json file contains invalid JSON",
+			)
+
+			// Should NOT write to file
+			expect(mockFs.writeFile).not.toHaveBeenCalled()
+		})
+
+		it("should install MCP when mcp.json contains valid JSON", async () => {
+			const existingContent = JSON.stringify({
+				mcpServers: {
+					"existing-server": { command: "existing", args: [] },
+				},
+			})
+
+			mockFs.readFile.mockResolvedValueOnce(existingContent)
+			mockFs.writeFile.mockResolvedValueOnce(undefined as any)
+
+			await installer.installItem(mockMcpItem, { target: "project" })
+
+			const writtenContent = mockFs.writeFile.mock.calls[0][1] as string
+			const writtenData = JSON.parse(writtenContent)
+
+			// Should contain both existing and new server
+			expect(Object.keys(writtenData.mcpServers)).toHaveLength(2)
+			expect(writtenData.mcpServers["existing-server"]).toBeDefined()
+			expect(writtenData.mcpServers["test-mcp"]).toBeDefined()
+		})
+	})
+
+	describe("removeMode", () => {
+		const mockModeItem: MarketplaceItem = {
+			id: "test-mode",
+			name: "Test Mode",
+			description: "A test mode for testing",
+			type: "mode",
+			content: yaml.stringify({
+				slug: "test",
+				name: "Test Mode",
+				roleDefinition: "Test role",
+				groups: ["read"],
+			}),
+		}
+
+		it("should throw error when .roomodes contains invalid YAML during removal", async () => {
+			const invalidYaml = "invalid: yaml: content: {"
+
+			mockFs.readFile.mockResolvedValueOnce(invalidYaml)
+
+			await expect(installer.removeItem(mockModeItem, { target: "project" })).rejects.toThrow(
+				"Cannot remove mode: The .roomodes file contains invalid YAML",
+			)
+
+			// Should NOT write to file
+			expect(mockFs.writeFile).not.toHaveBeenCalled()
+		})
+
+		it("should do nothing when file does not exist", async () => {
+			const notFoundError = new Error("File not found") as any
+			notFoundError.code = "ENOENT"
+			mockFs.readFile.mockRejectedValueOnce(notFoundError)
+
+			// Should not throw
+			await installer.removeItem(mockModeItem, { target: "project" })
+
+			expect(mockFs.writeFile).not.toHaveBeenCalled()
+		})
+	})
+})
--- a/src/services/marketplace/tests/marketplace-setting-check.test.ts
+++ b/src/services/marketplace/tests/marketplace-setting-check.test.ts
@ -0,0 +1,87 @@
+import { webviewMessageHandler } from "../../../core/webview/webviewMessageHandler"
+import { MarketplaceManager } from "../MarketplaceManager"
+
+// Mock the provider and marketplace manager
+const mockProvider = {
+	getState: jest.fn(),
+	postStateToWebview: jest.fn(),
+} as any
+
+const mockMarketplaceManager = {
+	updateWithFilteredItems: jest.fn(),
+} as any
+
+describe("Marketplace Setting Check", () => {
+	beforeEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it("should skip API calls when marketplace is disabled", async () => {
+		// Mock experiments with marketplace disabled
+		mockProvider.getState.mockResolvedValue({
+			experiments: { marketplace: false },
+		})
+
+		const message = {
+			type: "filterMarketplaceItems" as const,
+			filters: { type: "mcp", search: "", tags: [] },
+		}
+
+		await webviewMessageHandler(mockProvider, message, mockMarketplaceManager)
+
+		// Should not call marketplace manager methods
+		expect(mockMarketplaceManager.updateWithFilteredItems).not.toHaveBeenCalled()
+		expect(mockProvider.postStateToWebview).not.toHaveBeenCalled()
+	})
+
+	it("should allow API calls when marketplace is enabled", async () => {
+		// Mock experiments with marketplace enabled
+		mockProvider.getState.mockResolvedValue({
+			experiments: { marketplace: true },
+		})
+
+		const message = {
+			type: "filterMarketplaceItems" as const,
+			filters: { type: "mcp", search: "", tags: [] },
+		}
+
+		await webviewMessageHandler(mockProvider, message, mockMarketplaceManager)
+
+		// Should call marketplace manager methods
+		expect(mockMarketplaceManager.updateWithFilteredItems).toHaveBeenCalledWith({
+			type: "mcp",
+			search: "",
+			tags: [],
+		})
+		expect(mockProvider.postStateToWebview).toHaveBeenCalled()
+	})
+
+	it("should skip installation when marketplace is disabled", async () => {
+		// Mock experiments with marketplace disabled
+		mockProvider.getState.mockResolvedValue({
+			experiments: { marketplace: false },
+		})
+
+		const mockInstallMarketplaceItem = jest.fn()
+		const mockMarketplaceManagerWithInstall = {
+			installMarketplaceItem: mockInstallMarketplaceItem,
+		}
+
+		const message = {
+			type: "installMarketplaceItem" as const,
+			mpItem: {
+				id: "test-item",
+				name: "Test Item",
+				type: "mcp" as const,
+				description: "Test description",
+				content: "test content",
+			},
+			mpInstallOptions: { target: "project" as const },
+		}
+
+		await webviewMessageHandler(mockProvider, message, mockMarketplaceManagerWithInstall as any)
+
+		// Should not call install method
+		expect(mockInstallMarketplaceItem).not.toHaveBeenCalled()
+	})
+})
--- a/src/services/marketplace/tests/nested-parameters.spec.ts
+++ b/src/services/marketplace/tests/nested-parameters.spec.ts
@ -0,0 +1,231 @@
+import { describe, it, expect } from "vitest"
+import { mcpInstallationMethodSchema, mcpMarketplaceItemYamlSchema } from "../schemas"
+import { McpInstallationMethod, McpMarketplaceItem } from "../types"
+
+describe("Nested Parameters", () => {
+	describe("McpInstallationMethod Schema", () => {
+		it("should validate installation method without parameters", () => {
+			const method = {
+				name: "Docker Installation",
+				content: '{"command": "docker", "args": ["run", "image"]}',
+			}
+
+			const result = mcpInstallationMethodSchema.parse(method)
+			expect(result.parameters).toBeUndefined()
+		})
+
+		it("should validate installation method with parameters", () => {
+			const method = {
+				name: "Docker Installation",
+				content: '{"command": "docker", "args": ["run", "-p", "{{port}}:8080", "{{image}}"]}',
+				parameters: [
+					{
+						name: "Port",
+						key: "port",
+						placeholder: "8080",
+						optional: true,
+					},
+					{
+						name: "Docker Image",
+						key: "image",
+						placeholder: "latest",
+					},
+				],
+			}
+
+			const result = mcpInstallationMethodSchema.parse(method)
+			expect(result.parameters).toHaveLength(2)
+			expect(result.parameters![0].key).toBe("port")
+			expect(result.parameters![0].optional).toBe(true)
+			expect(result.parameters![1].key).toBe("image")
+			expect(result.parameters![1].optional).toBe(false)
+		})
+
+		it("should validate installation method with empty parameters array", () => {
+			const method = {
+				name: "Simple Installation",
+				content: '{"command": "npm", "args": ["start"]}',
+				parameters: [],
+			}
+
+			const result = mcpInstallationMethodSchema.parse(method)
+			expect(result.parameters).toEqual([])
+		})
+	})
+
+	describe("McpMarketplaceItem with Nested Parameters", () => {
+		it("should validate MCP item with global and method-specific parameters", () => {
+			const item = {
+				id: "multi-method-mcp",
+				name: "Multi-Method MCP",
+				description: "MCP with multiple installation methods",
+				url: "https://github.com/example/mcp",
+				parameters: [
+					{
+						name: "API Key",
+						key: "api_key",
+						placeholder: "Enter your API key",
+					},
+				],
+				content: [
+					{
+						name: "Docker Installation",
+						content: '{"command": "docker", "args": ["-e", "API_KEY={{api_key}}", "-p", "{{port}}:8080"]}',
+						parameters: [
+							{
+								name: "Port",
+								key: "port",
+								placeholder: "8080",
+								optional: true,
+							},
+						],
+					},
+					{
+						name: "NPM Installation",
+						content: '{"command": "npx", "args": ["package@{{version}}", "--api-key", "{{api_key}}"]}',
+						parameters: [
+							{
+								name: "Package Version",
+								key: "version",
+								placeholder: "latest",
+								optional: true,
+							},
+						],
+					},
+				],
+			}
+
+			const result = mcpMarketplaceItemYamlSchema.parse(item)
+			expect(result.parameters).toHaveLength(1)
+			expect(result.parameters![0].key).toBe("api_key")
+
+			expect(Array.isArray(result.content)).toBe(true)
+			const methods = result.content as McpInstallationMethod[]
+			expect(methods).toHaveLength(2)
+
+			expect(methods[0].parameters).toHaveLength(1)
+			expect(methods[0].parameters![0].key).toBe("port")
+
+			expect(methods[1].parameters).toHaveLength(1)
+			expect(methods[1].parameters![0].key).toBe("version")
+		})
+
+		it("should validate MCP item with only global parameters", () => {
+			const item = {
+				id: "global-only-mcp",
+				name: "Global Only MCP",
+				description: "MCP with only global parameters",
+				url: "https://github.com/example/mcp",
+				parameters: [
+					{
+						name: "API Key",
+						key: "api_key",
+						placeholder: "Enter your API key",
+					},
+				],
+				content: [
+					{
+						name: "Installation",
+						content: '{"command": "npm", "args": ["--api-key", "{{api_key}}"]}',
+					},
+				],
+			}
+
+			const result = mcpMarketplaceItemYamlSchema.parse(item)
+			expect(result.parameters).toHaveLength(1)
+
+			const methods = result.content as McpInstallationMethod[]
+			expect(methods[0].parameters).toBeUndefined()
+		})
+
+		it("should validate MCP item with only method-specific parameters", () => {
+			const item = {
+				id: "method-only-mcp",
+				name: "Method Only MCP",
+				description: "MCP with only method-specific parameters",
+				url: "https://github.com/example/mcp",
+				content: [
+					{
+						name: "Docker Installation",
+						content: '{"command": "docker", "args": ["-p", "{{port}}:8080"]}',
+						parameters: [
+							{
+								name: "Port",
+								key: "port",
+								placeholder: "8080",
+								optional: true,
+							},
+						],
+					},
+				],
+			}
+
+			const result = mcpMarketplaceItemYamlSchema.parse(item)
+			expect(result.parameters).toBeUndefined()
+
+			const methods = result.content as McpInstallationMethod[]
+			expect(methods[0].parameters).toHaveLength(1)
+			expect(methods[0].parameters![0].key).toBe("port")
+		})
+
+		it("should validate MCP item with no parameters at all", () => {
+			const item = {
+				id: "no-params-mcp",
+				name: "No Parameters MCP",
+				description: "MCP with no parameters",
+				url: "https://github.com/example/mcp",
+				content: [
+					{
+						name: "Simple Installation",
+						content: '{"command": "npm", "args": ["start"]}',
+					},
+				],
+			}
+
+			const result = mcpMarketplaceItemYamlSchema.parse(item)
+			expect(result.parameters).toBeUndefined()
+
+			const methods = result.content as McpInstallationMethod[]
+			expect(methods[0].parameters).toBeUndefined()
+		})
+	})
+
+	describe("Parameter Key Conflicts", () => {
+		it("should allow same parameter key in global and method-specific parameters", () => {
+			const item = {
+				id: "conflict-mcp",
+				name: "Conflict MCP",
+				description: "MCP with parameter key conflicts",
+				url: "https://github.com/example/mcp",
+				parameters: [
+					{
+						name: "Global Version",
+						key: "version",
+						placeholder: "1.0.0",
+					},
+				],
+				content: [
+					{
+						name: "Method Installation",
+						content: '{"command": "npm", "args": ["package@{{version}}"]}',
+						parameters: [
+							{
+								name: "Method Version",
+								key: "version",
+								placeholder: "latest",
+								optional: true,
+							},
+						],
+					},
+				],
+			}
+
+			// This should validate successfully - the conflict resolution happens at runtime
+			const result = mcpMarketplaceItemYamlSchema.parse(item)
+			expect(result.parameters![0].key).toBe("version")
+
+			const methods = result.content as McpInstallationMethod[]
+			expect(methods[0].parameters![0].key).toBe("version")
+		})
+	})
+})
--- a/src/services/marketplace/tests/optional-parameters.spec.ts
+++ b/src/services/marketplace/tests/optional-parameters.spec.ts
@ -0,0 +1,89 @@
+import { describe, it, expect } from "vitest"
+import { mcpParameterSchema } from "../schemas"
+import { McpParameter } from "../types"
+
+describe("Optional Parameters", () => {
+	describe("McpParameter Schema", () => {
+		it("should validate parameter with optional field set to true", () => {
+			const param = {
+				name: "Test Parameter",
+				key: "test_key",
+				placeholder: "Enter value",
+				optional: true,
+			}
+
+			const result = mcpParameterSchema.parse(param)
+			expect(result.optional).toBe(true)
+		})
+
+		it("should validate parameter with optional field set to false", () => {
+			const param = {
+				name: "Test Parameter",
+				key: "test_key",
+				placeholder: "Enter value",
+				optional: false,
+			}
+
+			const result = mcpParameterSchema.parse(param)
+			expect(result.optional).toBe(false)
+		})
+
+		it("should default optional to false when not provided", () => {
+			const param = {
+				name: "Test Parameter",
+				key: "test_key",
+				placeholder: "Enter value",
+			}
+
+			const result = mcpParameterSchema.parse(param)
+			expect(result.optional).toBe(false)
+		})
+
+		it("should validate parameter without placeholder", () => {
+			const param = {
+				name: "Test Parameter",
+				key: "test_key",
+				optional: true,
+			}
+
+			const result = mcpParameterSchema.parse(param)
+			expect(result.optional).toBe(true)
+			expect(result.placeholder).toBeUndefined()
+		})
+
+		it("should require name and key fields", () => {
+			expect(() => {
+				mcpParameterSchema.parse({
+					key: "test_key",
+					optional: true,
+				})
+			}).toThrow()
+
+			expect(() => {
+				mcpParameterSchema.parse({
+					name: "Test Parameter",
+					optional: true,
+				})
+			}).toThrow()
+		})
+	})
+
+	describe("Type Definitions", () => {
+		it("should allow optional field in McpParameter interface", () => {
+			const requiredParam: McpParameter = {
+				name: "Required Param",
+				key: "required_key",
+			}
+
+			const optionalParam: McpParameter = {
+				name: "Optional Param",
+				key: "optional_key",
+				optional: true,
+			}
+
+			// These should compile without errors
+			expect(requiredParam.optional).toBeUndefined()
+			expect(optionalParam.optional).toBe(true)
+		})
+	})
+})
--- a/src/services/marketplace/index.ts
+++ b/src/services/marketplace/index.ts
@ -0,0 +1,4 @@
+export * from "./SimpleInstaller"
+export * from "./MarketplaceManager"
+export * from "./types"
+export * from "./schemas"
--- a/src/services/marketplace/schemas.ts
+++ b/src/services/marketplace/schemas.ts
@ -0,0 +1,84 @@
+import { z } from "zod"
+
+/**
+ * Schema for MCP parameter definitions
+ */
+export const mcpParameterSchema = z.object({
+	name: z.string().min(1),
+	key: z.string().min(1),
+	placeholder: z.string().optional(),
+	optional: z.boolean().optional().default(false),
+})
+
+/**
+ * Schema for MCP installation method with name
+ */
+export const mcpInstallationMethodSchema = z.object({
+	name: z.string().min(1),
+	content: z.string().min(1),
+	parameters: z.array(mcpParameterSchema).optional(),
+	prerequisites: z.array(z.string()).optional(),
+})
+
+/**
+ * Component type validation
+ */
+export const marketplaceItemTypeSchema = z.enum(["mode", "mcp"] as const)
+
+/**
+ * Schema for a marketplace item (supports both mode and mcp types)
+ */
+export const marketplaceItemSchema = z.object({
+	id: z.string().min(1),
+	name: z.string().min(1, "Name is required"),
+	description: z.string(),
+	type: marketplaceItemTypeSchema,
+	author: z.string().optional(),
+	authorUrl: z.string().url("Author URL must be a valid URL").optional(),
+	tags: z.array(z.string()).optional(),
+	content: z.union([z.string().min(1), z.array(mcpInstallationMethodSchema)]), // Embedded content (YAML for modes, JSON for mcps, or named methods)
+	prerequisites: z.array(z.string()).optional(),
+})
+
+/**
+ * Local marketplace config schema (JSON format)
+ */
+export const marketplaceConfigSchema = z.object({
+	items: z.record(z.string(), marketplaceItemSchema),
+})
+
+/**
+ * Local marketplace YAML config schema (uses any for items since they're validated separately by type)
+ */
+export const marketplaceYamlConfigSchema = z.object({
+	items: z.array(z.any()), // Items are validated separately by type-specific schemas
+})
+
+// Schemas for YAML files (without type field, as type is added programmatically)
+export const modeMarketplaceItemYamlSchema = z.object({
+	id: z.string(),
+	name: z.string(),
+	description: z.string(),
+	author: z.string().optional(),
+	authorUrl: z.string().url().optional(),
+	tags: z.array(z.string()).optional(),
+	content: z.string(),
+	prerequisites: z.array(z.string()).optional(),
+})
+
+export const mcpMarketplaceItemYamlSchema = z.object({
+	id: z.string(),
+	name: z.string(),
+	description: z.string(),
+	author: z.string().optional(),
+	authorUrl: z.string().url().optional(),
+	url: z.string().url(), // Required url field
+	tags: z.array(z.string()).optional(),
+	content: z.union([z.string(), z.array(mcpInstallationMethodSchema)]),
+	parameters: z.array(mcpParameterSchema).optional(),
+	prerequisites: z.array(z.string()).optional(),
+})
+
+// Export aliases for backward compatibility (these are the same as the YAML schemas)
+export const modeMarketplaceItemSchema = modeMarketplaceItemYamlSchema
+export const mcpMarketplaceItemSchema = mcpMarketplaceItemYamlSchema
--- a/src/services/marketplace/types.ts
+++ b/src/services/marketplace/types.ts
@ -0,0 +1,92 @@
+/**
+ * Supported component types
+ */
+export type MarketplaceItemType = "mode" | "mcp"
+
+/**
+ * Local marketplace config types
+ */
+export interface MarketplaceConfig<T = any> {
+	items: Record<string, T>
+}
+
+export interface MarketplaceYamlConfig<T = any> {
+	items: T[]
+}
+
+export interface ModeMarketplaceItem {
+	id: string
+	name: string
+	description: string
+	author?: string
+	authorUrl?: string
+	tags?: string[]
+	content: string // Embedded YAML content for .roomodes
+	prerequisites?: string[]
+}
+
+export interface McpParameter {
+	name: string
+	key: string
+	placeholder?: string
+	optional?: boolean // Defaults to false if not provided
+}
+
+export interface McpInstallationMethod {
+	name: string
+	content: string
+	parameters?: McpParameter[]
+	prerequisites?: string[]
+}
+
+export interface McpMarketplaceItem {
+	id: string
+	name: string
+	description: string
+	author?: string
+	authorUrl?: string
+	url: string // Required url field
+	tags?: string[]
+	content: string | McpInstallationMethod[] // Can be a single config or array of named methods
+	parameters?: McpParameter[]
+	prerequisites?: string[]
+}
+
+/**
+ * Unified marketplace item for UI
+ */
+export interface MarketplaceItem {
+	id: string
+	name: string
+	description: string
+	type: MarketplaceItemType
+	author?: string
+	authorUrl?: string
+	url?: string // Optional - only MCPs have url
+	tags?: string[]
+	content: string | McpInstallationMethod[] // Can be a single config or array of named methods
+	parameters?: McpParameter[] // Optional parameters for MCPs
+	prerequisites?: string[]
+}
+
+export interface InstallMarketplaceItemOptions {
+	/**
+	 * Specify the target scope
+	 *
+	 * @default 'project'
+	 */
+	target?: "global" | "project"
+	/**
+	 * Parameters provided by the user for configurable marketplace items
+	 */
+	parameters?: Record<string, any>
+}
+
+export interface RemoveInstalledMarketplaceItemOptions {
+	/**
+	 * Specify the target scope
+	 *
+	 * @default 'project'
+	 */
+	target?: "global" | "project"
+}
--- a/src/shared/ExtensionMessage.ts
+++ b/src/shared/ExtensionMessage.ts
@ -16,6 +16,7 @@ import { GitCommit } from "../utils/git"
 import { McpServer } from "./mcp"
 import { Mode } from "./modes"
 import { RouterModels } from "./api"
+import { MarketplaceItem } from "../services/marketplace/types"

 export interface LanguageModelChatSelector {
 	vendor?: string
@ -73,16 +74,20 @@ export interface ExtensionMessage {
 		| "indexingStatusUpdate"
 		| "indexCleared"
 		| "codebaseIndexConfig"
+		| "marketplaceInstallResult"
 	text?: string
+	payload?: any // Add a generic payload for now, can refine later
 	action?:
 		| "chatButtonClicked"
 		| "mcpButtonClicked"
 		| "settingsButtonClicked"
 		| "historyButtonClicked"
 		| "promptsButtonClicked"
+		| "marketplaceButtonClicked"
 		| "accountButtonClicked"
 		| "didBecomeVisible"
 		| "focusInput"
+		| "switchTab"
 	invoke?: "newChat" | "sendMessage" | "primaryButtonClick" | "secondaryButtonClick" | "setChatBoxMessage"
 	state?: ExtensionState
 	images?: string[]
@ -112,8 +117,10 @@ export interface ExtensionMessage {
 	error?: string
 	setting?: string
 	value?: any
+	items?: MarketplaceItem[]
 	userInfo?: CloudUserInfo
 	organizationAllowList?: OrganizationAllowList
+	tab?: string
 }

 export type ExtensionState = Pick<
@ -225,6 +232,8 @@ export type ExtensionState = Pick<

 	autoCondenseContext: boolean
 	autoCondenseContextPercent: number
+	marketplaceItems?: MarketplaceItem[]
+	marketplaceInstalledMetadata?: { project: Record<string, any>; global: Record<string, any> }
 }

 export interface ClineSayTool {
--- a/src/shared/WebviewMessage.ts
+++ b/src/shared/WebviewMessage.ts
@ -1,6 +1,8 @@
 import { z } from "zod"

 import type { ProviderSettings, PromptComponent, ModeConfig } from "@roo-code/types"
+import { InstallMarketplaceItemOptions, MarketplaceItem } from "../services/marketplace/types"
+import { marketplaceItemSchema } from "../services/marketplace/schemas"

 import { Mode } from "./modes"

@ -149,7 +151,18 @@ export interface WebviewMessage {
 		| "indexingStatusUpdate"
 		| "indexCleared"
 		| "codebaseIndexConfig"
+		| "setHistoryPreviewCollapsed"
+		| "openExternal"
+		| "filterMarketplaceItems"
+		| "marketplaceButtonClicked"
+		| "installMarketplaceItem"
+		| "installMarketplaceItemWithParameters"
+		| "cancelMarketplaceInstall"
+		| "removeInstalledMarketplaceItem"
+		| "marketplaceInstallResult"
+		| "switchTab"
 	text?: string
+	tab?: "settings" | "history" | "mcp" | "modes" | "chat" | "marketplace" | "account"
 	disabled?: boolean
 	askResponse?: ClineAskResponse
 	apiConfiguration?: ProviderSettings
@ -178,6 +191,11 @@ export interface WebviewMessage {
 	hasSystemPromptOverride?: boolean
 	terminalOperation?: "continue" | "abort"
 	historyPreviewCollapsed?: boolean
+	filters?: { type?: string; search?: string; tags?: string[] }
+	url?: string // For openExternal
+	mpItem?: MarketplaceItem
+	mpInstallOptions?: InstallMarketplaceItemOptions
+	config?: Record<string, any> // Add config to the payload
 }

 export const checkoutDiffPayloadSchema = z.object({
@ -207,8 +225,18 @@ export interface IndexClearedPayload {
 	error?: string
 }

+export const installMarketplaceItemWithParametersPayloadSchema = z.object({
+	item: marketplaceItemSchema.strict(),
+	parameters: z.record(z.string(), z.any()),
+})
+
+export type InstallMarketplaceItemWithParametersPayload = z.infer<
+	typeof installMarketplaceItemWithParametersPayloadSchema
+>
+
 export type WebViewMessagePayload =
 	| CheckpointDiffPayload
 	| CheckpointRestorePayload
 	| IndexingStatusPayload
 	| IndexClearedPayload
+	| InstallMarketplaceItemWithParametersPayload
--- a/src/shared/tests/experiments.test.ts
+++ b/src/shared/tests/experiments.test.ts
@ -18,6 +18,7 @@ describe("experiments", () => {
 		it("returns false when POWER_STEERING experiment is not enabled", () => {
 			const experiments: Record<ExperimentId, boolean> = {
 				powerSteering: false,
+				marketplace: false,
 				concurrentFileReads: false,
 				disableCompletionCommand: false,
 			}
@ -27,6 +28,7 @@ describe("experiments", () => {
 		it("returns true when experiment POWER_STEERING is enabled", () => {
 			const experiments: Record<ExperimentId, boolean> = {
 				powerSteering: true,
+				marketplace: false,
 				concurrentFileReads: false,
 				disableCompletionCommand: false,
 			}
@ -36,10 +38,70 @@ describe("experiments", () => {
 		it("returns false when experiment is not present", () => {
 			const experiments: Record<ExperimentId, boolean> = {
 				powerSteering: false,
+				marketplace: false,
 				concurrentFileReads: false,
 				disableCompletionCommand: false,
 			}
 			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.POWER_STEERING)).toBe(false)
 		})
+
+		it("returns false when CONCURRENT_FILE_READS experiment is not enabled", () => {
+			const experiments: Record<ExperimentId, boolean> = {
+				powerSteering: false,
+				marketplace: false,
+				concurrentFileReads: false,
+				disableCompletionCommand: false,
+			}
+			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.CONCURRENT_FILE_READS)).toBe(false)
+		})
+
+		it("returns true when CONCURRENT_FILE_READS experiment is enabled", () => {
+			const experiments: Record<ExperimentId, boolean> = {
+				powerSteering: false,
+				marketplace: false,
+				concurrentFileReads: true,
+				disableCompletionCommand: false,
+			}
+			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.CONCURRENT_FILE_READS)).toBe(true)
+		})
+	})
+	describe("MARKETPLACE", () => {
+		it("is configured correctly", () => {
+			expect(EXPERIMENT_IDS.MARKETPLACE).toBe("marketplace")
+			expect(experimentConfigsMap.MARKETPLACE).toMatchObject({
+				enabled: false,
+			})
+		})
+	})
+
+	describe("isEnabled for MARKETPLACE", () => {
+		it("returns false when MARKETPLACE experiment is not enabled", () => {
+			const experiments: Record<ExperimentId, boolean> = {
+				powerSteering: false,
+				marketplace: false,
+				concurrentFileReads: false,
+				disableCompletionCommand: false,
+			}
+			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.MARKETPLACE)).toBe(false)
+		})
+
+		it("returns true when MARKETPLACE experiment is enabled", () => {
+			const experiments: Record<ExperimentId, boolean> = {
+				powerSteering: false,
+				marketplace: true,
+				concurrentFileReads: false,
+				disableCompletionCommand: false,
+			}
+			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.MARKETPLACE)).toBe(true)
+		})
+
+		it("returns false when MARKETPLACE experiment is not present", () => {
+			const experiments: Record<ExperimentId, boolean> = {
+				powerSteering: false,
+				concurrentFileReads: false,
+				// marketplace missing
+			} as any
+			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.MARKETPLACE)).toBe(false)
+		})
 	})
 })
--- a/src/shared/experiments.ts
+++ b/src/shared/experiments.ts
@ -1,9 +1,10 @@
 import type { AssertEqual, Equals, Keys, Values, ExperimentId } from "@roo-code/types"

 export const EXPERIMENT_IDS = {
-	POWER_STEERING: "powerSteering",
+	MARKETPLACE: "marketplace",
 	CONCURRENT_FILE_READS: "concurrentFileReads",
 	DISABLE_COMPLETION_COMMAND: "disableCompletionCommand",
+	POWER_STEERING: "powerSteering",
 } as const satisfies Record<string, ExperimentId>

 type _AssertExperimentIds = AssertEqual<Equals<ExperimentId, Values<typeof EXPERIMENT_IDS>>>
@ -15,9 +16,10 @@ interface ExperimentConfig {
 }

 export const experimentConfigsMap: Record<ExperimentKey, ExperimentConfig> = {
-	POWER_STEERING: { enabled: false },
+	MARKETPLACE: { enabled: false },
 	CONCURRENT_FILE_READS: { enabled: false },
 	DISABLE_COMPLETION_COMMAND: { enabled: false },
+	POWER_STEERING: { enabled: false },
 }

 export const experimentDefault = Object.fromEntries(
--- a/src/utils/globalContext.ts
+++ b/src/utils/globalContext.ts
@ -0,0 +1,13 @@
+import { mkdir } from "fs/promises"
+import { join } from "path"
+import { ExtensionContext } from "vscode"
+
+export async function getGlobalFsPath(context: ExtensionContext): Promise<string> {
+	return context.globalStorageUri.fsPath
+}
+
+export async function ensureSettingsDirectoryExists(context: ExtensionContext): Promise<string> {
+	const settingsDir = join(context.globalStorageUri.fsPath, "settings")
+	await mkdir(settingsDir, { recursive: true })
+	return settingsDir
+}
--- a/webview-ui/src/App.tsx
+++ b/webview-ui/src/App.tsx
@ -1,10 +1,11 @@
-import { useCallback, useEffect, useRef, useState } from "react"
+import { useCallback, useEffect, useRef, useState, useMemo } from "react"
 import { useEvent } from "react-use"
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query"

 import { ExtensionMessage } from "@roo/ExtensionMessage"
-
 import TranslationProvider from "./i18n/TranslationContext"
+import { MarketplaceViewStateManager } from "./components/marketplace/MarketplaceViewStateManager"
+
 import { vscode } from "./utils/vscode"
 import { telemetryClient } from "./utils/TelemetryClient"
 import { ExtensionStateContextProvider, useExtensionState } from "./context/ExtensionStateContext"
@ -13,11 +14,12 @@ import HistoryView from "./components/history/HistoryView"
 import SettingsView, { SettingsViewRef } from "./components/settings/SettingsView"
 import WelcomeView from "./components/welcome/WelcomeView"
 import McpView from "./components/mcp/McpView"
+import { MarketplaceView } from "./components/marketplace/MarketplaceView"
 import ModesView from "./components/modes/ModesView"
 import { HumanRelayDialog } from "./components/human-relay/HumanRelayDialog"
 import { AccountView } from "./components/account/AccountView"

-type Tab = "settings" | "history" | "mcp" | "modes" | "chat" | "account"
+type Tab = "settings" | "history" | "mcp" | "modes" | "chat" | "marketplace" | "account"

 const tabsByMessageAction: Partial<Record<NonNullable<ExtensionMessage["action"]>, Tab>> = {
 	chatButtonClicked: "chat",
@ -25,6 +27,7 @@ const tabsByMessageAction: Partial<Record<NonNullable<ExtensionMessage["action"]
 	promptsButtonClicked: "modes",
 	mcpButtonClicked: "mcp",
 	historyButtonClicked: "history",
+	marketplaceButtonClicked: "marketplace",
 	accountButtonClicked: "account",
 }

@ -36,10 +39,14 @@ const App = () => {
 		telemetrySetting,
 		telemetryKey,
 		machineId,
+		experiments,
 		cloudUserInfo,
 		cloudIsAuthenticated,
 	} = useExtensionState()

+	// Create a persistent state manager
+	const marketplaceStateManager = useMemo(() => new MarketplaceViewStateManager(), [])
+
 	const [showAnnouncement, setShowAnnouncement] = useState(false)
 	const [tab, setTab] = useState<Tab>("chat")

@ -73,12 +80,28 @@ const App = () => {
 			const message: ExtensionMessage = e.data

 			if (message.type === "action" && message.action) {
-				const newTab = tabsByMessageAction[message.action]
-				const section = message.values?.section as string | undefined
+				// Handle switchTab action with tab parameter
+				if (message.action === "switchTab" && message.tab) {
+					const targetTab = message.tab as Tab
+					// Don't switch to marketplace tab if the experiment is disabled
+					if (targetTab === "marketplace" && !experiments.marketplace) {
+						return
+					}
+					switchTab(targetTab)
+					setCurrentSection(undefined)
+				} else {
+					// Handle other actions using the mapping
+					const newTab = tabsByMessageAction[message.action]
+					const section = message.values?.section as string | undefined

-				if (newTab) {
-					switchTab(newTab)
-					setCurrentSection(section)
+					if (newTab) {
+						// Don't switch to marketplace tab if the experiment is disabled
+						if (newTab === "marketplace" && !experiments.marketplace) {
+							return
+						}
+						switchTab(newTab)
+						setCurrentSection(section)
+					}
 				}
 			}

@ -91,7 +114,7 @@ const App = () => {
 				chatViewRef.current?.acceptInput()
 			}
 		},
-		[switchTab],
+		[switchTab, experiments],
 	)

 	useEvent("message", onMessage)
@ -128,6 +151,9 @@ const App = () => {
 			{tab === "settings" && (
 				<SettingsView ref={settingsRef} onDone={() => setTab("chat")} targetSection={currentSection} />
 			)}
+			{tab === "marketplace" && (
+				<MarketplaceView stateManager={marketplaceStateManager} onDone={() => switchTab("chat")} />
+			)}
 			{tab === "account" && (
 				<AccountView
 					userInfo={cloudUserInfo}
--- a/webview-ui/src/mocks/lucide-react.ts
+++ b/webview-ui/src/mocks/lucide-react.ts
@ -6,3 +6,6 @@ export const Loader = () => React.createElement("div")
 export const X = () => React.createElement("div")
 export const Edit = () => React.createElement("div")
 export const Database = (props: any) => React.createElement("span", { "data-testid": "database-icon", ...props })
+export const MoreVertical = () => React.createElement("div", {}, "VerticalMenu")
+export const ExternalLink = () => React.createElement("div")
+export const Download = () => React.createElement("div")
--- a/webview-ui/src/tests/App.test.tsx
+++ b/webview-ui/src/tests/App.test.tsx
@ -67,12 +67,30 @@ jest.mock("@src/components/modes/ModesView", () => ({
 	},
 }))

+jest.mock("@src/components/marketplace/MarketplaceView", () => ({
+	MarketplaceView: function MarketplaceView({ onDone }: { onDone: () => void }) {
+		return (
+			<div data-testid="marketplace-view" onClick={onDone}>
+				Marketplace View
+			</div>
+		)
+	},
+}))
+
+jest.mock("@src/components/account/AccountView", () => ({
+	AccountView: function AccountView({ onDone }: { onDone: () => void }) {
+		return (
+			<div data-testid="account-view" onClick={onDone}>
+				Account View
+			</div>
+		)
+	},
+}))
+
+const mockUseExtensionState = jest.fn()
+
 jest.mock("@src/context/ExtensionStateContext", () => ({
-	useExtensionState: () => ({
-		didHydrateState: true,
-		showWelcome: false,
-		shouldShowAnnouncement: false,
-	}),
+	useExtensionState: () => mockUseExtensionState(),
 	ExtensionStateContextProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
 }))

@ -80,6 +98,15 @@ describe("App", () => {
 	beforeEach(() => {
 		jest.clearAllMocks()
 		window.removeEventListener("message", () => {})
+
+		// Set up default mock return value
+		mockUseExtensionState.mockReturnValue({
+			didHydrateState: true,
+			showWelcome: false,
+			shouldShowAnnouncement: false,
+			experiments: { marketplace: false },
+			language: "en",
+		})
 	})

 	afterEach(() => {
@ -196,4 +223,75 @@ describe("App", () => {
 		expect(chatView.getAttribute("data-hidden")).toBe("false")
 		expect(screen.queryByTestId(`${view}-view`)).not.toBeInTheDocument()
 	})
+
+	describe("marketplace experiment", () => {
+		it("does not switch to marketplace tab when experiment is disabled", async () => {
+			mockUseExtensionState.mockReturnValue({
+				didHydrateState: true,
+				showWelcome: false,
+				shouldShowAnnouncement: false,
+				experiments: { marketplace: false },
+				language: "en",
+			})
+
+			render(<AppWithProviders />)
+
+			act(() => {
+				triggerMessage("marketplaceButtonClicked")
+			})
+
+			// Should remain on chat view
+			const chatView = screen.getByTestId("chat-view")
+			expect(chatView.getAttribute("data-hidden")).toBe("false")
+			expect(screen.queryByTestId("marketplace-view")).not.toBeInTheDocument()
+		})
+
+		it("switches to marketplace tab when experiment is enabled", async () => {
+			mockUseExtensionState.mockReturnValue({
+				didHydrateState: true,
+				showWelcome: false,
+				shouldShowAnnouncement: false,
+				experiments: { marketplace: true },
+				language: "en",
+			})
+
+			render(<AppWithProviders />)
+
+			act(() => {
+				triggerMessage("marketplaceButtonClicked")
+			})
+
+			const marketplaceView = await screen.findByTestId("marketplace-view")
+			expect(marketplaceView).toBeInTheDocument()
+
+			const chatView = screen.getByTestId("chat-view")
+			expect(chatView.getAttribute("data-hidden")).toBe("true")
+		})
+
+		it("returns to chat view when clicking done in marketplace view", async () => {
+			mockUseExtensionState.mockReturnValue({
+				didHydrateState: true,
+				showWelcome: false,
+				shouldShowAnnouncement: false,
+				experiments: { marketplace: true },
+				language: "en",
+			})
+
+			render(<AppWithProviders />)
+
+			act(() => {
+				triggerMessage("marketplaceButtonClicked")
+			})
+
+			const marketplaceView = await screen.findByTestId("marketplace-view")
+
+			act(() => {
+				marketplaceView.click()
+			})
+
+			const chatView = screen.getByTestId("chat-view")
+			expect(chatView.getAttribute("data-hidden")).toBe("false")
+			expect(screen.queryByTestId("marketplace-view")).not.toBeInTheDocument()
+		})
+	})
 })
--- a/webview-ui/src/components/marketplace/MarketplaceListView.tsx
+++ b/webview-ui/src/components/marketplace/MarketplaceListView.tsx
@ -0,0 +1,217 @@
+import * as React from "react"
+import { Input } from "@/components/ui/input"
+import { Button } from "@/components/ui/button"
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
+import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command"
+import { X, ChevronsUpDown } from "lucide-react"
+import { MarketplaceItemCard } from "./components/MarketplaceItemCard"
+import { MarketplaceViewStateManager } from "./MarketplaceViewStateManager"
+import { useAppTranslation } from "@/i18n/TranslationContext"
+import { useStateManager } from "./useStateManager"
+import { useExtensionState } from "@/context/ExtensionStateContext"
+
+export interface MarketplaceListViewProps {
+	stateManager: MarketplaceViewStateManager
+	allTags: string[]
+	filteredTags: string[]
+	filterByType?: "mcp" | "mode"
+}
+
+export function MarketplaceListView({ stateManager, allTags, filteredTags, filterByType }: MarketplaceListViewProps) {
+	const [state, manager] = useStateManager(stateManager)
+	const { t } = useAppTranslation()
+	const { marketplaceInstalledMetadata } = useExtensionState()
+	const [isTagPopoverOpen, setIsTagPopoverOpen] = React.useState(false)
+	const [tagSearch, setTagSearch] = React.useState("")
+	const allItems = state.displayItems || []
+	const items = filterByType ? allItems.filter((item) => item.type === filterByType) : allItems
+	const isEmpty = items.length === 0
+
+	return (
+		<>
+			<div className="mb-4">
+				<div className="relative">
+					<Input
+						type="text"
+						placeholder={
+							filterByType === "mcp"
+								? t("marketplace:filters.search.placeholderMcp")
+								: filterByType === "mode"
+									? t("marketplace:filters.search.placeholderMode")
+									: t("marketplace:filters.search.placeholder")
+						}
+						value={state.filters.search}
+						onChange={(e) =>
+							manager.transition({
+								type: "UPDATE_FILTERS",
+								payload: { filters: { search: e.target.value } },
+							})
+						}
+					/>
+				</div>
+				{allTags.length > 0 && (
+					<div className="mt-2">
+						<div className="flex items-center justify-between mb-1">
+							<div className="flex items-center gap-1">
+								<label className="font-medium text-sm">{t("marketplace:filters.tags.label")}</label>
+							</div>
+							{state.filters.tags.length > 0 && (
+								<Button
+									className="shadow-none font-normal flex items-center gap-1 h-auto py-0.5 px-1.5 text-xs"
+									size="sm"
+									variant="secondary"
+									onClick={(e) => {
+										e.stopPropagation() // Prevent popover from closing if it's open
+										manager.transition({
+											type: "UPDATE_FILTERS",
+											payload: { filters: { tags: [] } },
+										})
+									}}>
+									<span className="codicon codicon-close"></span>
+									{t("marketplace:filters.tags.clear")}
+								</Button>
+							)}
+						</div>
+
+						<Popover open={isTagPopoverOpen} onOpenChange={(open) => setIsTagPopoverOpen(open)}>
+							<PopoverTrigger asChild>
+								<Button
+									variant="combobox"
+									role="combobox"
+									aria-expanded={isTagPopoverOpen}
+									className="w-full justify-between h-7">
+									<span className="truncate">
+										{state.filters.tags.length > 0
+											? state.filters.tags
+													.map((t: string) => t.charAt(0).toUpperCase() + t.slice(1))
+													.join(", ")
+											: t("marketplace:filters.none")}
+									</span>
+									<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+								</Button>
+							</PopoverTrigger>
+							<PopoverContent
+								className="w-[var(--radix-popover-trigger-width)] p-0"
+								onClick={(e) => e.stopPropagation()}>
+								<Command>
+									<div className="relative">
+										<CommandInput
+											className="h-9 pr-8"
+											placeholder={t("marketplace:filters.tags.placeholder")}
+											value={tagSearch}
+											onValueChange={setTagSearch}
+										/>
+										{tagSearch && (
+											<Button
+												variant="ghost"
+												size="icon"
+												className="absolute right-1 top-1/2 transform -translate-y-1/2 h-7 w-7"
+												onClick={() => setTagSearch("")}>
+												<X className="h-4 w-4" />
+											</Button>
+										)}
+									</div>
+									<CommandList className="max-h-[200px] overflow-y-auto bg-vscode-dropdown-background divide-y divide-vscode-panel-border">
+										<CommandEmpty className="p-2 text-sm text-vscode-descriptionForeground">
+											{t("marketplace:filters.tags.noResults")}
+										</CommandEmpty>
+										<CommandGroup>
+											{filteredTags.map((tag: string) => (
+												<CommandItem
+													key={tag}
+													value={tag}
+													onSelect={() => {
+														const isSelected = state.filters.tags.includes(tag)
+														manager.transition({
+															type: "UPDATE_FILTERS",
+															payload: {
+																filters: {
+																	tags: isSelected
+																		? state.filters.tags.filter((t) => t !== tag)
+																		: [...state.filters.tags, tag],
+																},
+															},
+														})
+													}}
+													data-selected={state.filters.tags.includes(tag)}
+													className="grid grid-cols-[1rem_1fr] gap-2 cursor-pointer text-sm capitalize"
+													onMouseDown={(e) => {
+														e.stopPropagation()
+														e.preventDefault()
+													}}>
+													{state.filters.tags.includes(tag) ? (
+														<span className="codicon codicon-check" />
+													) : (
+														<span />
+													)}
+													{tag}
+												</CommandItem>
+											))}
+										</CommandGroup>
+									</CommandList>
+								</Command>
+							</PopoverContent>
+						</Popover>
+						{state.filters.tags.length > 0 && (
+							<div className="text-xs text-vscode-descriptionForeground mt-2 flex items-center min-h-[16px]">
+								<span className="codicon codicon-tag mr-1"></span>
+								{t("marketplace:filters.tags.selected")}
+							</div>
+						)}
+					</div>
+				)}
+			</div>
+
+			{state.isFetching && isEmpty && (
+				<div className="flex flex-col items-center justify-center h-64 text-vscode-descriptionForeground animate-fade-in">
+					<div className="animate-spin mb-4">
+						<span className="codicon codicon-sync text-3xl"></span>
+					</div>
+					<p>{t("marketplace:items.refresh.refreshing")}</p>
+					<p className="text-sm mt-2 animate-pulse">{t("marketplace:items.refresh.mayTakeMoment")}</p>
+				</div>
+			)}
+
+			{!state.isFetching && isEmpty && (
+				<div className="flex flex-col items-center justify-center h-64 text-vscode-descriptionForeground animate-fade-in">
+					<span className="codicon codicon-inbox text-4xl mb-4 opacity-70"></span>
+					<p className="font-medium">{t("marketplace:items.empty.noItems")}</p>
+					<p className="text-sm mt-2">{t("marketplace:items.empty.adjustFilters")}</p>
+					<Button
+						onClick={() =>
+							manager.transition({
+								type: "UPDATE_FILTERS",
+								payload: { filters: { search: "", type: "", tags: [] } },
+							})
+						}
+						className="mt-4 bg-vscode-button-secondaryBackground text-vscode-button-secondaryForeground hover:bg-vscode-button-secondaryHoverBackground transition-colors">
+						<span className="codicon codicon-clear-all mr-2"></span>
+						{t("marketplace:items.empty.clearAllFilters")}
+					</Button>
+				</div>
+			)}
+
+			{!state.isFetching && !isEmpty && (
+				<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-1 xl:grid-cols-2 gap-3 pb-3">
+					{items.map((item) => (
+						<MarketplaceItemCard
+							key={item.id}
+							item={item}
+							filters={state.filters}
+							setFilters={(filters) =>
+								manager.transition({
+									type: "UPDATE_FILTERS",
+									payload: { filters },
+								})
+							}
+							installed={{
+								project: marketplaceInstalledMetadata?.project?.[item.id],
+								global: marketplaceInstalledMetadata?.global?.[item.id],
+							}}
+						/>
+					))}
+				</div>
+			)}
+		</>
+	)
+}
--- a/webview-ui/src/components/marketplace/MarketplaceView.tsx
+++ b/webview-ui/src/components/marketplace/MarketplaceView.tsx
@ -0,0 +1,145 @@
+import { useState, useEffect, useMemo } from "react"
+import { Button } from "@/components/ui/button"
+import { Tab, TabContent, TabHeader } from "../common/Tab"
+import { MarketplaceViewStateManager } from "./MarketplaceViewStateManager"
+import { useStateManager } from "./useStateManager"
+import { useAppTranslation } from "@/i18n/TranslationContext"
+import { vscode } from "@/utils/vscode"
+import { MarketplaceListView } from "./MarketplaceListView"
+import { cn } from "@/lib/utils"
+import { TooltipProvider } from "@/components/ui/tooltip"
+
+interface MarketplaceViewProps {
+	onDone?: () => void
+	stateManager: MarketplaceViewStateManager
+}
+export function MarketplaceView({ stateManager, onDone }: MarketplaceViewProps) {
+	const { t } = useAppTranslation()
+	const [state, manager] = useStateManager(stateManager)
+	const [hasReceivedInitialState, setHasReceivedInitialState] = useState(false)
+
+	// Track when we receive the initial state
+	useEffect(() => {
+		// Check if we already have items (state might have been received before mount)
+		if (state.allItems.length > 0 && !hasReceivedInitialState) {
+			setHasReceivedInitialState(true)
+		}
+	}, [state.allItems, hasReceivedInitialState])
+
+	// Ensure marketplace state manager processes messages when component mounts
+	useEffect(() => {
+		// When the marketplace view first mounts, we need to trigger a state update
+		// to ensure we get the current marketplace items. We do this by sending
+		// a filter message with empty filters, which will cause the extension to
+		// send back the full state including all marketplace items.
+		if (!hasReceivedInitialState && state.allItems.length === 0) {
+			// Send empty filter to trigger state update
+			vscode.postMessage({
+				type: "filterMarketplaceItems",
+				filters: {
+					type: "",
+					search: "",
+					tags: [],
+				},
+			})
+		}
+
+		// Listen for state changes to know when initial data arrives
+		const unsubscribe = manager.onStateChange((newState) => {
+			if (newState.allItems.length > 0 && !hasReceivedInitialState) {
+				setHasReceivedInitialState(true)
+			}
+		})
+
+		const handleVisibilityMessage = (event: MessageEvent) => {
+			const message = event.data
+			if (message.type === "webviewVisible" && message.visible === true) {
+				// Data will be automatically fresh when panel becomes visible
+				// No manual fetching needed since we removed caching
+			}
+		}
+
+		window.addEventListener("message", handleVisibilityMessage)
+		return () => {
+			window.removeEventListener("message", handleVisibilityMessage)
+			unsubscribe()
+		}
+	}, [manager, hasReceivedInitialState, state.allItems.length])
+
+	// Memoize all available tags
+	const allTags = useMemo(
+		() => Array.from(new Set(state.allItems.flatMap((item) => item.tags || []))).sort(),
+		[state.allItems],
+	)
+
+	// Memoize filtered tags
+	const filteredTags = useMemo(() => allTags, [allTags])
+
+	return (
+		<TooltipProvider>
+			<Tab>
+				<TabHeader className="flex flex-col sticky top-0 z-10 px-3 py-2">
+					<div className="flex justify-between items-center px-2">
+						<h3 className="font-bold m-0">{t("marketplace:title")}</h3>
+						<div className="flex gap-2 items-center">
+							<Button
+								variant="default"
+								onClick={() => {
+									onDone?.()
+								}}>
+								{t("marketplace:done")}
+							</Button>
+						</div>
+					</div>
+
+					<div className="w-full mt-2">
+						<div className="flex relative py-1">
+							<div className="absolute w-full h-[2px] -bottom-[2px] bg-vscode-input-border">
+								<div
+									className={cn(
+										"absolute w-1/2 h-[2px] bottom-0 bg-vscode-button-background transition-all duration-300 ease-in-out",
+										{
+											"left-0": state.activeTab === "mcp",
+											"left-1/2": state.activeTab === "mode",
+										},
+									)}
+								/>
+							</div>
+							<button
+								className="flex items-center justify-center gap-2 flex-1 text-sm font-medium rounded-sm transition-colors duration-300 relative z-10 text-vscode-foreground"
+								onClick={() => manager.transition({ type: "SET_ACTIVE_TAB", payload: { tab: "mcp" } })}>
+								MCP
+							</button>
+							<button
+								className="flex items-center justify-center gap-2 flex-1 text-sm font-medium rounded-sm transition-colors duration-300 relative z-10 text-vscode-foreground"
+								onClick={() =>
+									manager.transition({ type: "SET_ACTIVE_TAB", payload: { tab: "mode" } })
+								}>
+								Modes
+							</button>
+						</div>
+					</div>
+				</TabHeader>
+
+				<TabContent className="p-3 pt-2">
+					{state.activeTab === "mcp" && (
+						<MarketplaceListView
+							stateManager={stateManager}
+							allTags={allTags}
+							filteredTags={filteredTags}
+							filterByType="mcp"
+						/>
+					)}
+					{state.activeTab === "mode" && (
+						<MarketplaceListView
+							stateManager={stateManager}
+							allTags={allTags}
+							filteredTags={filteredTags}
+							filterByType="mode"
+						/>
+					)}
+				</TabContent>
+			</Tab>
+		</TooltipProvider>
+	)
+}
--- a/webview-ui/src/components/marketplace/MarketplaceViewStateManager.ts
+++ b/webview-ui/src/components/marketplace/MarketplaceViewStateManager.ts
@ -0,0 +1,345 @@
+/**
+ * MarketplaceViewStateManager
+ *
+ * This class manages the state for the marketplace view in the Roo Code extensions interface.
+ *
+ * IMPORTANT: Fixed issue where the marketplace feature was causing the Roo Code extensions interface
+ * to switch to the browse tab and redraw it every 30 seconds. The fix prevents unnecessary tab switching
+ * and redraws by:
+ * 1. Only updating the UI when necessary
+ * 2. Preserving the current tab when handling timeouts
+ * 3. Using minimal state updates to avoid resetting scroll position
+ */
+
+import { MarketplaceItem } from "../../../../src/services/marketplace/types"
+import { vscode } from "../../utils/vscode"
+import { WebviewMessage } from "../../../../src/shared/WebviewMessage"
+
+export interface ViewState {
+	allItems: MarketplaceItem[]
+	displayItems?: MarketplaceItem[] // Items currently being displayed (filtered or all)
+	isFetching: boolean
+	activeTab: "mcp" | "mode"
+	filters: {
+		type: string
+		search: string
+		tags: string[]
+	}
+}
+
+type TransitionPayloads = {
+	FETCH_ITEMS: undefined
+	FETCH_COMPLETE: { items: MarketplaceItem[] }
+	FETCH_ERROR: undefined
+	SET_ACTIVE_TAB: { tab: ViewState["activeTab"] }
+	UPDATE_FILTERS: { filters: Partial<ViewState["filters"]> }
+}
+
+export interface ViewStateTransition {
+	type: keyof TransitionPayloads
+	payload?: TransitionPayloads[keyof TransitionPayloads]
+}
+
+export type StateChangeHandler = (state: ViewState) => void
+
+export class MarketplaceViewStateManager {
+	private state: ViewState = this.loadInitialState()
+
+	private loadInitialState(): ViewState {
+		// Always start with default state - no sessionStorage caching
+		// This ensures fresh data from the extension is always used
+		return this.getDefaultState()
+	}
+
+	private getDefaultState(): ViewState {
+		return {
+			allItems: [],
+			displayItems: [], // Always initialize as empty array, not undefined
+			isFetching: false,
+			activeTab: "mcp",
+			filters: {
+				type: "",
+				search: "",
+				tags: [],
+			},
+		}
+	}
+	// Removed auto-polling timeout
+	private stateChangeHandlers: Set<StateChangeHandler> = new Set()
+
+	// Empty constructor is required for test initialization
+	constructor() {
+		// Initialize is now handled by the loadInitialState call in the property initialization
+	}
+
+	public initialize(): void {
+		// Set initial state
+		this.state = this.getDefaultState()
+	}
+
+	public onStateChange(handler: StateChangeHandler): () => void {
+		this.stateChangeHandlers.add(handler)
+		return () => this.stateChangeHandlers.delete(handler)
+	}
+
+	public cleanup(): void {
+		// Reset fetching state
+		if (this.state.isFetching) {
+			this.state.isFetching = false
+			this.notifyStateChange()
+		}
+
+		// Clear handlers but preserve state
+		this.stateChangeHandlers.clear()
+	}
+
+	public getState(): ViewState {
+		// Only create new arrays if they exist and have items
+		const allItems = this.state.allItems.length ? [...this.state.allItems] : []
+		// Ensure displayItems is always an array, never undefined
+		const displayItems = this.state.displayItems ? [...this.state.displayItems] : []
+		const tags = this.state.filters.tags.length ? [...this.state.filters.tags] : []
+
+		// Create minimal new state object
+		return {
+			...this.state,
+			allItems,
+			displayItems,
+			filters: {
+				...this.state.filters,
+				tags,
+			},
+		}
+	}
+
+	/**
+	 * Notify all registered handlers of a state change
+	 * @param preserveTab If true, ensures the active tab is not changed during notification
+	 */
+	private notifyStateChange(preserveTab: boolean = false): void {
+		const newState = this.getState() // Use getState to ensure proper copying
+
+		if (preserveTab) {
+			// When preserveTab is true, we're careful not to cause tab switching
+			// This is used during timeout handling to prevent disrupting the user
+			this.stateChangeHandlers.forEach((handler) => {
+				// Store the current active tab
+				const currentTab = newState.activeTab
+
+				// Create a state update that won't change the active tab
+				const safeState = {
+					...newState,
+					// Don't change these properties to avoid UI disruption
+					activeTab: currentTab,
+				}
+				handler(safeState)
+			})
+		} else {
+			// Normal state change notification
+			this.stateChangeHandlers.forEach((handler) => {
+				handler(newState)
+			})
+		}
+
+		// Removed sessionStorage caching to ensure fresh data from extension is always used
+		// This prevents old cached marketplace items from overriding fresh data
+	}
+
+	public async transition(transition: ViewStateTransition): Promise<void> {
+		switch (transition.type) {
+			case "FETCH_ITEMS": {
+				// Fetch functionality removed - data comes automatically from extension
+				// No manual fetching needed since we removed caching
+				break
+			}
+
+			case "FETCH_COMPLETE": {
+				const { items } = transition.payload as TransitionPayloads["FETCH_COMPLETE"]
+				// No timeout to clear anymore
+
+				// Compare with current state to avoid unnecessary updates
+				if (JSON.stringify(items) === JSON.stringify(this.state.allItems)) {
+					// No changes: update only isFetching flag and send minimal update
+					this.state.isFetching = false
+					this.stateChangeHandlers.forEach((handler) => {
+						handler({
+							...this.getState(),
+							isFetching: false,
+						})
+					})
+					break
+				}
+
+				// Update allItems as source of truth
+				this.state = {
+					...this.state,
+					allItems: [...items],
+					displayItems: this.isFilterActive() ? this.filterItems([...items]) : [...items],
+					isFetching: false,
+				}
+
+				// Notify state change
+				this.notifyStateChange()
+				break
+			}
+
+			case "FETCH_ERROR": {
+				// Preserve current filters and items
+				const { filters, activeTab, allItems, displayItems } = this.state
+
+				// Reset state but preserve filters and items
+				this.state = {
+					...this.getDefaultState(),
+					filters,
+					activeTab,
+					allItems,
+					displayItems,
+					isFetching: false,
+				}
+				this.notifyStateChange()
+				break
+			}
+
+			case "SET_ACTIVE_TAB": {
+				const { tab } = transition.payload as TransitionPayloads["SET_ACTIVE_TAB"]
+
+				// Update tab state
+				this.state = {
+					...this.state,
+					activeTab: tab,
+				}
+
+				// Tab switching no longer triggers fetch - data comes automatically from extension
+
+				this.notifyStateChange()
+				break
+			}
+
+			case "UPDATE_FILTERS": {
+				const { filters = {} } = (transition.payload as TransitionPayloads["UPDATE_FILTERS"]) || {}
+
+				// Create new filters object preserving existing values for undefined fields
+				const updatedFilters = {
+					type: filters.type !== undefined ? filters.type : this.state.filters.type,
+					search: filters.search !== undefined ? filters.search : this.state.filters.search,
+					tags: filters.tags !== undefined ? filters.tags : this.state.filters.tags,
+				}
+
+				// Update state
+				this.state = {
+					...this.state,
+					filters: updatedFilters,
+				}
+
+				// Send filter message
+				vscode.postMessage({
+					type: "filterMarketplaceItems",
+					filters: updatedFilters,
+				} as WebviewMessage)
+
+				this.notifyStateChange()
+
+				break
+			}
+		}
+	}
+
+	public isFilterActive(): boolean {
+		return !!(this.state.filters.type || this.state.filters.search || this.state.filters.tags.length > 0)
+	}
+
+	public filterItems(items: MarketplaceItem[]): MarketplaceItem[] {
+		const { type, search, tags } = this.state.filters
+
+		return items
+			.map((item) => {
+				// Create a copy of the item to modify
+				const itemCopy = { ...item }
+
+				// Check specific match conditions for the main item
+				const typeMatch = !type || item.type === type
+				const nameMatch = search ? item.name.toLowerCase().includes(search.toLowerCase()) : false
+				const descriptionMatch = search
+					? (item.description || "").toLowerCase().includes(search.toLowerCase())
+					: false
+				const tagMatch = tags.length > 0 ? item.tags?.some((tag) => tags.includes(tag)) : false
+
+				// Determine if the main item matches all filters
+				const mainItemMatches =
+					typeMatch && (!search || nameMatch || descriptionMatch) && (!tags.length || tagMatch)
+
+				const hasMatchingSubcomponents = false
+
+				// Return the item if it matches or has matching subcomponents
+				if (mainItemMatches || Boolean(hasMatchingSubcomponents)) {
+					return itemCopy
+				}
+
+				return null
+			})
+			.filter((item): item is MarketplaceItem => item !== null)
+	}
+
+	public async handleMessage(message: any): Promise<void> {
+		// Handle empty or invalid message
+		if (!message || !message.type || message.type === "invalidType") {
+			this.state = {
+				...this.getDefaultState(),
+			}
+			this.notifyStateChange()
+			return
+		}
+
+		// Handle state updates
+		if (message.type === "state") {
+			// Handle empty state
+			if (!message.state) {
+				this.state = {
+					...this.getDefaultState(),
+				}
+				this.notifyStateChange()
+				return
+			}
+
+			// Handle state updates for marketplace items
+			// The state.marketplaceItems come from ClineProvider, see the file src/core/webview/ClineProvider.ts
+			const marketplaceItems = message.state.marketplaceItems
+
+			if (marketplaceItems !== undefined) {
+				// Always use the marketplace items from the extension when they're provided
+				// This ensures fresh data is always displayed
+				const items = [...marketplaceItems]
+				const newDisplayItems = this.isFilterActive() ? this.filterItems(items) : items
+
+				// Update state in a single operation
+				this.state = {
+					...this.state,
+					isFetching: false,
+					allItems: items,
+					displayItems: newDisplayItems,
+				}
+				// Notification is handled below after all state parts are processed
+			}
+
+			// Notify state change once after processing all parts (sources, metadata, items)
+			// This prevents multiple redraws for a single 'state' message
+			// Determine if notification should preserve tab based on item update logic
+			const isOnMcpTab = this.state.activeTab === "mcp"
+			const hasCurrentItems = (this.state.allItems || []).length > 0
+			const preserveTab = !isOnMcpTab && hasCurrentItems
+
+			this.notifyStateChange(preserveTab)
+		}
+
+		// Handle marketplace button clicks
+		if (message.type === "marketplaceButtonClicked") {
+			if (message.text) {
+				// Error case
+				void this.transition({ type: "FETCH_ERROR" })
+			} else {
+				// Refresh request
+				void this.transition({ type: "FETCH_ITEMS" })
+			}
+		}
+	}
+}
--- a/webview-ui/src/components/marketplace/tests/MarketplaceListView.test.tsx
+++ b/webview-ui/src/components/marketplace/tests/MarketplaceListView.test.tsx
@ -0,0 +1,146 @@
+import { render, screen, fireEvent } from "@testing-library/react"
+import { MarketplaceListView } from "../MarketplaceListView"
+import { ViewState } from "../MarketplaceViewStateManager"
+import userEvent from "@testing-library/user-event"
+import { TooltipProvider } from "@/components/ui/tooltip"
+import { ExtensionStateContextProvider } from "@/context/ExtensionStateContext"
+
+jest.mock("@/i18n/TranslationContext", () => ({
+	useAppTranslation: () => ({
+		t: (key: string) => key,
+	}),
+}))
+
+class MockResizeObserver {
+	observe() {}
+	unobserve() {}
+	disconnect() {}
+}
+
+global.ResizeObserver = MockResizeObserver
+
+const mockTransition = jest.fn()
+const mockState: ViewState = {
+	allItems: [],
+	displayItems: [],
+	isFetching: false,
+	activeTab: "mcp",
+	filters: {
+		type: "",
+		search: "",
+		tags: [],
+	},
+}
+
+jest.mock("../useStateManager", () => ({
+	useStateManager: () => [mockState, { transition: mockTransition }],
+}))
+
+jest.mock("lucide-react", () => {
+	return new Proxy(
+		{},
+		{
+			get: function (_obj, prop) {
+				if (prop === "__esModule") {
+					return true
+				}
+				return () => <div data-testid={`${String(prop)}-icon`}>{String(prop)}</div>
+			},
+		},
+	)
+})
+
+const defaultProps = {
+	stateManager: {} as any,
+	allTags: ["tag1", "tag2"],
+	filteredTags: ["tag1", "tag2"],
+}
+
+describe("MarketplaceListView", () => {
+	beforeEach(() => {
+		jest.clearAllMocks()
+		mockState.filters.tags = []
+		mockState.isFetching = false
+		mockState.displayItems = []
+	})
+
+	const renderWithProviders = (props = {}) =>
+		render(
+			<ExtensionStateContextProvider>
+				<TooltipProvider>
+					<MarketplaceListView {...defaultProps} {...props} />
+				</TooltipProvider>
+			</ExtensionStateContextProvider>,
+		)
+
+	it("renders search input", () => {
+		renderWithProviders()
+
+		const searchInput = screen.getByPlaceholderText("marketplace:filters.search.placeholder")
+		expect(searchInput).toBeInTheDocument()
+	})
+
+	it("does not render type filter (removed in simplified interface)", () => {
+		renderWithProviders()
+
+		expect(screen.queryByText("marketplace:filters.type.label")).not.toBeInTheDocument()
+		expect(screen.queryByText("marketplace:filters.type.all")).not.toBeInTheDocument()
+	})
+
+	it("does not render sort options (removed in simplified interface)", () => {
+		renderWithProviders()
+
+		expect(screen.queryByText("marketplace:filters.sort.label")).not.toBeInTheDocument()
+		expect(screen.queryByText("marketplace:filters.sort.name")).not.toBeInTheDocument()
+	})
+
+	it("renders tags section when tags are available", () => {
+		renderWithProviders()
+
+		expect(screen.getByText("marketplace:filters.tags.label")).toBeInTheDocument()
+	})
+
+	it("shows loading state when fetching", () => {
+		mockState.isFetching = true
+
+		renderWithProviders()
+
+		expect(screen.getByText("marketplace:items.refresh.refreshing")).toBeInTheDocument()
+		expect(screen.getByText("marketplace:items.refresh.mayTakeMoment")).toBeInTheDocument()
+	})
+
+	it("shows empty state when no items and not fetching", () => {
+		renderWithProviders()
+
+		expect(screen.getByText("marketplace:items.empty.noItems")).toBeInTheDocument()
+		expect(screen.getByText("marketplace:items.empty.adjustFilters")).toBeInTheDocument()
+	})
+
+	it("updates search filter when typing", () => {
+		renderWithProviders()
+
+		const searchInput = screen.getByPlaceholderText("marketplace:filters.search.placeholder")
+		fireEvent.change(searchInput, { target: { value: "test" } })
+
+		expect(mockTransition).toHaveBeenCalledWith({
+			type: "UPDATE_FILTERS",
+			payload: { filters: { search: "test" } },
+		})
+	})
+
+	it("shows clear tags button when tags are selected", async () => {
+		const user = userEvent.setup()
+		mockState.filters.tags = ["tag1"]
+
+		renderWithProviders()
+
+		const clearButton = screen.getByText("marketplace:filters.tags.clear")
+		expect(clearButton).toBeInTheDocument()
+
+		await user.click(clearButton)
+		expect(mockTransition).toHaveBeenCalledWith({
+			type: "UPDATE_FILTERS",
+			payload: { filters: { tags: [] } },
+		})
+	})
+})
--- a/webview-ui/src/components/marketplace/tests/MarketplaceView.spec.tsx
+++ b/webview-ui/src/components/marketplace/tests/MarketplaceView.spec.tsx
@ -0,0 +1,96 @@
+import React from "react"
+import { render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { MarketplaceView } from "../MarketplaceView"
+import { MarketplaceViewStateManager } from "../MarketplaceViewStateManager"
+
+// Mock all the dependencies to keep the test simple
+jest.mock("@/utils/vscode", () => ({
+	vscode: {
+		postMessage: jest.fn(),
+		getState: jest.fn(() => ({})),
+		setState: jest.fn(),
+	},
+}))
+
+jest.mock("@/i18n/TranslationContext", () => ({
+	useAppTranslation: () => ({
+		t: (key: string) => key,
+	}),
+}))
+
+jest.mock("../useStateManager", () => ({
+	useStateManager: () => [
+		{
+			allItems: [],
+			displayItems: [],
+			isFetching: false,
+			activeTab: "mcp",
+			filters: { type: "", search: "", tags: [] },
+		},
+		{
+			transition: jest.fn(),
+			onStateChange: jest.fn(() => jest.fn()),
+		},
+	],
+}))
+
+jest.mock("../MarketplaceListView", () => ({
+	MarketplaceListView: ({ filterByType }: { filterByType: string }) => (
+		<div data-testid="marketplace-list-view">MarketplaceListView - {filterByType}</div>
+	),
+}))
+
+// Mock Tab components to avoid ExtensionStateContext dependency
+jest.mock("@/components/common/Tab", () => ({
+	Tab: ({ children, ...props }: any) => <div {...props}>{children}</div>,
+	TabHeader: ({ children, ...props }: any) => <div {...props}>{children}</div>,
+	TabContent: ({ children, ...props }: any) => <div {...props}>{children}</div>,
+	TabList: ({ children, ...props }: any) => <div {...props}>{children}</div>,
+	TabTrigger: ({ children, ...props }: any) => <button {...props}>{children}</button>,
+}))
+
+// Mock ResizeObserver
+class MockResizeObserver {
+	observe() {}
+	unobserve() {}
+	disconnect() {}
+}
+global.ResizeObserver = MockResizeObserver
+
+describe("MarketplaceView", () => {
+	const mockOnDone = jest.fn()
+	const mockStateManager = new MarketplaceViewStateManager()
+
+	beforeEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it("renders without crashing", () => {
+		render(<MarketplaceView stateManager={mockStateManager} onDone={mockOnDone} />)
+
+		expect(screen.getByText("marketplace:title")).toBeInTheDocument()
+		expect(screen.getByText("marketplace:done")).toBeInTheDocument()
+	})
+
+	it("calls onDone when Done button is clicked", async () => {
+		const user = userEvent.setup()
+		render(<MarketplaceView stateManager={mockStateManager} onDone={mockOnDone} />)
+
+		await user.click(screen.getByText("marketplace:done"))
+		expect(mockOnDone).toHaveBeenCalledTimes(1)
+	})
+
+	it("renders tab buttons", () => {
+		render(<MarketplaceView stateManager={mockStateManager} onDone={mockOnDone} />)
+
+		expect(screen.getByText("MCP")).toBeInTheDocument()
+		expect(screen.getByText("Modes")).toBeInTheDocument()
+	})
+
+	it("renders MarketplaceListView", () => {
+		render(<MarketplaceView stateManager={mockStateManager} onDone={mockOnDone} />)
+
+		expect(screen.getByTestId("marketplace-list-view")).toBeInTheDocument()
+	})
+})
--- a/webview-ui/src/components/marketplace/components/MarketplaceInstallModal.tsx
+++ b/webview-ui/src/components/marketplace/components/MarketplaceInstallModal.tsx
@ -0,0 +1,375 @@
+import React, { useState, useMemo, useEffect } from "react"
+import { MarketplaceItem, McpParameter, McpInstallationMethod } from "../../../../../src/services/marketplace/types"
+import { vscode } from "@/utils/vscode"
+import { useAppTranslation } from "@/i18n/TranslationContext"
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+} from "@/components/ui/dialog"
+import { Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+
+interface MarketplaceInstallModalProps {
+	item: MarketplaceItem | null
+	isOpen: boolean
+	onClose: () => void
+	hasWorkspace: boolean
+}
+
+export const MarketplaceInstallModal: React.FC<MarketplaceInstallModalProps> = ({
+	item,
+	isOpen,
+	onClose,
+	hasWorkspace,
+}) => {
+	const { t } = useAppTranslation()
+	const [scope, setScope] = useState<"project" | "global">(hasWorkspace ? "project" : "global")
+	const [selectedMethodIndex, setSelectedMethodIndex] = useState(0)
+	const [parameterValues, setParameterValues] = useState<Record<string, string>>({})
+	const [validationError, setValidationError] = useState<string | null>(null)
+	const [installationComplete, setInstallationComplete] = useState(false)
+
+	// Reset state when item changes
+	React.useEffect(() => {
+		if (item) {
+			setSelectedMethodIndex(0)
+			setParameterValues({})
+			setValidationError(null)
+			setInstallationComplete(false)
+		}
+	}, [item])
+
+	// Check if item has multiple installation methods
+	const hasMultipleMethods = useMemo(() => {
+		return item && Array.isArray(item.content) && item.content.length > 1
+	}, [item])
+
+	// Get installation method names (for display in dropdown)
+	const methodNames = useMemo(() => {
+		if (!item || !Array.isArray(item.content)) return []
+
+		// Content is an array of McpInstallationMethod objects
+		return (item.content as Array<{ name: string; content: string }>).map((method) => method.name)
+	}, [item])
+
+	// Get effective parameters for the selected method (global + method-specific)
+	const effectiveParameters = useMemo(() => {
+		if (!item) return []
+
+		const globalParams = item.parameters || []
+		let methodParams: McpParameter[] = []
+
+		// Get method-specific parameters if content is an array
+		if (Array.isArray(item.content)) {
+			const selectedMethod = item.content[selectedMethodIndex] as McpInstallationMethod
+			methodParams = selectedMethod?.parameters || []
+		}
+
+		// Create map with global params first, then override with method-specific ones
+		const paramMap = new Map<string, McpParameter>()
+		globalParams.forEach((p) => paramMap.set(p.key, p))
+		methodParams.forEach((p) => paramMap.set(p.key, p))
+
+		return Array.from(paramMap.values())
+	}, [item, selectedMethodIndex])
+
+	// Get effective prerequisites for the selected method (global + method-specific)
+	const effectivePrerequisites = useMemo(() => {
+		if (!item) return []
+
+		const globalPrereqs = item.prerequisites || []
+		let methodPrereqs: string[] = []
+
+		// Get method-specific prerequisites if content is an array
+		if (Array.isArray(item.content)) {
+			const selectedMethod = item.content[selectedMethodIndex] as McpInstallationMethod
+			methodPrereqs = selectedMethod?.prerequisites || []
+		}
+
+		// Combine and deduplicate prerequisites
+		const allPrereqs = [...globalPrereqs, ...methodPrereqs]
+		return Array.from(new Set(allPrereqs))
+	}, [item, selectedMethodIndex])
+
+	// Update parameter values when method changes
+	React.useEffect(() => {
+		if (item) {
+			// Get effective parameters for current method
+			const globalParams = item.parameters || []
+			let methodParams: McpParameter[] = []
+
+			if (Array.isArray(item.content)) {
+				const selectedMethod = item.content[selectedMethodIndex] as McpInstallationMethod
+				methodParams = selectedMethod?.parameters || []
+			}
+
+			// Create map with global params first, then override with method-specific ones
+			const paramMap = new Map<string, McpParameter>()
+			globalParams.forEach((p) => paramMap.set(p.key, p))
+			methodParams.forEach((p) => paramMap.set(p.key, p))
+
+			const currentEffectiveParams = Array.from(paramMap.values())
+
+			// Initialize parameter values for effective parameters
+			setParameterValues((prev) => {
+				const newValues: Record<string, string> = {}
+				currentEffectiveParams.forEach((param) => {
+					// Keep existing value if it exists, otherwise empty string
+					newValues[param.key] = prev[param.key] || ""
+				})
+				return newValues
+			})
+		}
+	}, [item, selectedMethodIndex])
+
+	// Listen for installation result messages
+	useEffect(() => {
+		const handleMessage = (event: MessageEvent) => {
+			const message = event.data
+			if (message.type === "marketplaceInstallResult" && message.slug === item?.id) {
+				if (message.success) {
+					// Installation succeeded - show success state
+					setInstallationComplete(true)
+					setValidationError(null)
+				} else {
+					// Installation failed - show error
+					setValidationError(message.error || "Installation failed")
+					setInstallationComplete(false)
+				}
+			}
+		}
+
+		window.addEventListener("message", handleMessage)
+		return () => window.removeEventListener("message", handleMessage)
+	}, [item?.id])
+
+	const handleInstall = () => {
+		if (!item) return
+
+		// Clear previous validation error
+		setValidationError(null)
+
+		// Validate required parameters from effective parameters (global + method-specific)
+		for (const param of effectiveParameters) {
+			// Only validate if parameter is not optional (optional defaults to false)
+			if (!param.optional && !parameterValues[param.key]?.trim()) {
+				setValidationError(t("marketplace:install.validationRequired", { paramName: param.name }))
+				return
+			}
+		}
+
+		// Prepare parameters - ensure optional parameters have empty string if not provided
+		const finalParameters: Record<string, any> = { ...parameterValues }
+		for (const param of effectiveParameters) {
+			if (param.optional && !finalParameters[param.key]) {
+				finalParameters[param.key] = ""
+			}
+		}
+
+		// Send install message with parameters
+		vscode.postMessage({
+			type: "installMarketplaceItem",
+			mpItem: item,
+			mpInstallOptions: {
+				target: scope,
+				parameters: {
+					...finalParameters,
+					_selectedIndex: hasMultipleMethods ? selectedMethodIndex : undefined,
+				},
+			},
+		})
+
+		// Don't show success immediately - wait for backend result
+		// The success state will be shown when installation actually succeeds
+		setValidationError(null)
+	}
+
+	const handlePostInstallAction = (tab: "mcp" | "modes") => {
+		// Send message to switch to the appropriate tab
+		vscode.postMessage({ type: "switchTab", tab })
+		// Close the modal
+		onClose()
+	}
+
+	if (!item) return null
+
+	return (
+		<Dialog open={isOpen} onOpenChange={onClose}>
+			<DialogContent className="sm:max-w-[500px]">
+				<DialogHeader>
+					<DialogTitle>
+						{installationComplete
+							? t("marketplace:install.successTitle", { name: item.name })
+							: item.type === "mcp"
+								? t("marketplace:install.titleMcp", { name: item.name })
+								: t("marketplace:install.titleMode", { name: item.name })}
+					</DialogTitle>
+					<DialogDescription>
+						{installationComplete ? (
+							t("marketplace:install.successDescription")
+						) : item.type === "mcp" && item.url ? (
+							<a
+								href={item.url}
+								target="_blank"
+								rel="noopener noreferrer"
+								className="text-primary hover:underline inline-flex items-center gap-1">
+								{t("marketplace:install.moreInfoMcp", { name: item.name })}
+							</a>
+						) : null}
+					</DialogDescription>
+				</DialogHeader>
+
+				{installationComplete ? (
+					// Post-installation options
+					<div className="space-y-4 py-2">
+						<div className="text-center space-y-4">
+							<div className="text-green-500 text-lg">✓ {t("marketplace:install.installed")}</div>
+							<p className="text-sm text-muted-foreground">
+								{item.type === "mcp"
+									? t("marketplace:install.whatNextMcp")
+									: t("marketplace:install.whatNextMode")}
+							</p>
+						</div>
+					</div>
+				) : (
+					// Installation configuration
+					<div className="space-y-4 py-2">
+						{/* Installation Scope */}
+						<div className="space-y-2">
+							<div className="text-base font-semibold">{t("marketplace:install.scope")}</div>
+							<div className="space-y-2">
+								<label className="flex items-center space-x-2">
+									<input
+										type="radio"
+										name="scope"
+										value="project"
+										checked={scope === "project"}
+										onChange={() => setScope("project")}
+										disabled={!hasWorkspace}
+										className="rounded-full"
+									/>
+									<span className={!hasWorkspace ? "opacity-50" : ""}>
+										{t("marketplace:install.project")}
+									</span>
+								</label>
+								<label className="flex items-center space-x-2">
+									<input
+										type="radio"
+										name="scope"
+										value="global"
+										checked={scope === "global"}
+										onChange={() => setScope("global")}
+										className="rounded-full"
+									/>
+									<span>{t("marketplace:install.global")}</span>
+								</label>
+							</div>
+						</div>
+
+						{/* Installation Method (if multiple) */}
+						{hasMultipleMethods && (
+							<div className="space-y-2">
+								<div className="text-base font-semibold">{t("marketplace:install.method")}</div>
+								<Select
+									value={String(selectedMethodIndex)}
+									onValueChange={(value) => setSelectedMethodIndex(Number(value))}>
+									<SelectTrigger>
+										<SelectValue />
+									</SelectTrigger>
+									<SelectContent>
+										{methodNames.map((name, index) => (
+											<SelectItem key={index} value={String(index)}>
+												{name}
+											</SelectItem>
+										))}
+									</SelectContent>
+								</Select>
+							</div>
+						)}
+
+						{/* Prerequisites */}
+						{effectivePrerequisites.length > 0 && (
+							<div className="space-y-2">
+								<div className="text-base font-semibold">{t("marketplace:install.prerequisites")}</div>
+								<ul className="list-disc list-inside space-y-1 text-sm">
+									{effectivePrerequisites.map((prereq, index) => (
+										<li key={index} className="text-muted-foreground">
+											{prereq}
+										</li>
+									))}
+								</ul>
+							</div>
+						)}
+
+						{/* Parameters */}
+						{effectiveParameters.length > 0 && (
+							<div className="space-y-3">
+								<div className="space-y-1">
+									<div className="text-base font-semibold">
+										{t("marketplace:install.configuration")}
+									</div>
+									<div className="text-sm text-muted-foreground">
+										{t("marketplace:install.configurationDescription")}
+									</div>
+								</div>
+								{effectiveParameters.map((param) => (
+									<div key={param.key} className="space-y-1">
+										<label htmlFor={param.key} className="text-sm">
+											{param.name}
+											{param.optional ? " (optional)" : ""}
+										</label>
+										<Input
+											id={param.key}
+											type="text"
+											placeholder={param.placeholder}
+											value={parameterValues[param.key] || ""}
+											onChange={(e) =>
+												setParameterValues((prev) => ({
+													...prev,
+													[param.key]: e.target.value,
+												}))
+											}
+										/>
+									</div>
+								))}
+							</div>
+						)}
+						{/* Validation Error */}
+						{validationError && (
+							<div className="text-sm text-red-500 bg-red-500/10 border border-red-500/20 rounded p-2">
+								{validationError}
+							</div>
+						)}
+					</div>
+				)}
+
+				<DialogFooter>
+					{installationComplete ? (
+						<>
+							<Button variant="outline" onClick={onClose}>
+								{t("marketplace:install.done")}
+							</Button>
+							<Button onClick={() => handlePostInstallAction(item.type === "mcp" ? "mcp" : "modes")}>
+								{item.type === "mcp"
+									? t("marketplace:install.goToMcp")
+									: t("marketplace:install.goToModes")}
+							</Button>
+						</>
+					) : (
+						<>
+							<Button variant="outline" onClick={onClose}>
+								{t("common:answers.cancel")}
+							</Button>
+							<Button onClick={handleInstall}>{t("marketplace:install.button")}</Button>
+						</>
+					)}
+				</DialogFooter>
+			</DialogContent>
+		</Dialog>
+	)
+}
--- a/webview-ui/src/components/marketplace/components/MarketplaceItemCard.tsx
+++ b/webview-ui/src/components/marketplace/components/MarketplaceItemCard.tsx
@ -0,0 +1,197 @@
+import React, { useMemo, useState } from "react"
+import { MarketplaceItem } from "../../../../../src/services/marketplace/types"
+import { vscode } from "@/utils/vscode"
+import { ViewState } from "../MarketplaceViewStateManager"
+import { useAppTranslation } from "@/i18n/TranslationContext"
+import { isValidUrl } from "../../../utils/url"
+import { cn } from "@/lib/utils"
+import { Button } from "@/components/ui/button"
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"
+import { MarketplaceInstallModal } from "./MarketplaceInstallModal"
+import { useExtensionState } from "@/context/ExtensionStateContext"
+
+interface ItemInstalledMetadata {
+	type: string
+}
+
+interface MarketplaceItemCardProps {
+	item: MarketplaceItem
+	filters: ViewState["filters"]
+	setFilters: (filters: Partial<ViewState["filters"]>) => void
+	installed: {
+		project: ItemInstalledMetadata | undefined
+		global: ItemInstalledMetadata | undefined
+	}
+}
+
+export const MarketplaceItemCard: React.FC<MarketplaceItemCardProps> = ({ item, filters, setFilters, installed }) => {
+	const { t } = useAppTranslation()
+	const { cwd } = useExtensionState()
+	const [showInstallModal, setShowInstallModal] = useState(false)
+
+	const typeLabel = useMemo(() => {
+		const labels: Partial<Record<MarketplaceItem["type"], string>> = {
+			mode: t("marketplace:filters.type.mode"),
+			mcp: t("marketplace:filters.type.mcpServer"),
+		}
+		return labels[item.type] ?? "N/A"
+	}, [item.type, t])
+
+	// Determine installation status
+	const isInstalledGlobally = !!installed.global
+	const isInstalledInProject = !!installed.project
+	const isInstalled = isInstalledGlobally || isInstalledInProject
+
+	const handleInstallClick = () => {
+		// Show modal for all item types (MCP and modes)
+		setShowInstallModal(true)
+	}
+
+	return (
+		<>
+			<div className="border border-vscode-panel-border rounded-sm p-3 bg-vscode-editor-background">
+				<div className="flex gap-2 items-start justify-between">
+					<div className="flex gap-2 items-start">
+						<div>
+							<h3 className="text-lg font-semibold text-vscode-foreground mt-0 mb-1 leading-none">
+								{item.url && isValidUrl(item.url) ? (
+									<Button
+										variant="link"
+										className="p-0 h-auto text-lg font-semibold text-vscode-foreground hover:underline"
+										onClick={() => vscode.postMessage({ type: "openExternal", url: item.url })}>
+										{item.name}
+									</Button>
+								) : (
+									item.name
+								)}
+							</h3>
+							<AuthorInfo item={item} typeLabel={typeLabel} />
+						</div>
+					</div>
+					<div className="flex items-center gap-1">
+						{isInstalled ? (
+							/* Single Remove button when installed */
+							<Tooltip>
+								<TooltipTrigger asChild>
+									<span className="inline-block">
+										<Button
+											size="sm"
+											variant="secondary"
+											className="text-xs h-5 py-0 px-2"
+											onClick={() => {
+												// Determine which installation to remove (prefer project over global)
+												const target = isInstalledInProject ? "project" : "global"
+												vscode.postMessage({
+													type: "removeInstalledMarketplaceItem",
+													mpItem: item,
+													mpInstallOptions: { target },
+												})
+											}}>
+											{t("marketplace:items.card.remove")}
+										</Button>
+									</span>
+								</TooltipTrigger>
+								<TooltipContent>
+									{isInstalledInProject
+										? t("marketplace:items.card.removeProjectTooltip")
+										: t("marketplace:items.card.removeGlobalTooltip")}
+								</TooltipContent>
+							</Tooltip>
+						) : (
+							/* Single Install button when not installed */
+							<Button
+								size="sm"
+								variant="default"
+								className="text-xs h-5 py-0 px-2"
+								onClick={handleInstallClick}>
+								{t("marketplace:items.card.install")}
+							</Button>
+						)}
+					</div>
+				</div>
+
+				<p className="my-2 text-vscode-foreground">{item.description}</p>
+
+				{/* Installation status badges and tags in the same row */}
+				{(isInstalled || (item.tags && item.tags.length > 0)) && (
+					<div className="relative flex gap-1 my-2 overflow-x-auto scrollbar-hide">
+						{/* Installation status badge on the left */}
+						{isInstalled && (
+							<span className="text-xs px-2 py-0.5 rounded-sm h-5 flex items-center bg-green-600/20 text-green-400 border border-green-600/30">
+								{t("marketplace:items.card.installed")}
+							</span>
+						)}
+
+						{/* Tags on the right */}
+						{item.tags &&
+							item.tags.length > 0 &&
+							item.tags.map((tag) => (
+								<Button
+									key={tag}
+									size="sm"
+									variant="secondary"
+									className={cn("rounded-sm capitalize text-xs px-2 h-5", {
+										"border-solid border-primary text-primary": filters.tags.includes(tag),
+									})}
+									onClick={() => {
+										const newTags = filters.tags.includes(tag)
+											? filters.tags.filter((t: string) => t !== tag)
+											: [...filters.tags, tag]
+										setFilters({ tags: newTags })
+									}}
+									title={
+										filters.tags.includes(tag)
+											? t("marketplace:filters.tags.clear", { count: tag })
+											: t("marketplace:filters.tags.clickToFilter")
+									}>
+									{tag}
+								</Button>
+							))}
+					</div>
+				)}
+			</div>
+
+			{/* Installation Modal - Outside the clickable card */}
+			<MarketplaceInstallModal
+				item={item}
+				isOpen={showInstallModal}
+				onClose={() => setShowInstallModal(false)}
+				hasWorkspace={!!cwd}
+			/>
+		</>
+	)
+}
+
+interface AuthorInfoProps {
+	item: MarketplaceItem
+	typeLabel: string
+}
+
+const AuthorInfo: React.FC<AuthorInfoProps> = ({ item, typeLabel }) => {
+	const { t } = useAppTranslation()
+
+	const handleOpenAuthorUrl = () => {
+		if (item.authorUrl && isValidUrl(item.authorUrl)) {
+			vscode.postMessage({ type: "openExternal", url: item.authorUrl })
+		}
+	}
+
+	if (item.author) {
+		return (
+			<p className="text-sm text-vscode-descriptionForeground my-0">
+				{typeLabel}{" "}
+				{item.authorUrl && isValidUrl(item.authorUrl) ? (
+					<Button
+						variant="link"
+						className="p-0 h-auto text-sm text-vscode-textLink hover:underline"
+						onClick={handleOpenAuthorUrl}>
+						{t("marketplace:items.card.by", { author: item.author })}
+					</Button>
+				) : (
+					t("marketplace:items.card.by", { author: item.author })
+				)}
+			</p>
+		)
+	}
+	return null
+}
--- a/webview-ui/src/components/marketplace/components/tests/MarketplaceInstallModal-optional-params.test.tsx
+++ b/webview-ui/src/components/marketplace/components/tests/MarketplaceInstallModal-optional-params.test.tsx
@ -0,0 +1,155 @@
+import React from "react"
+import { render, screen, fireEvent, waitFor } from "@testing-library/react"
+import { MarketplaceInstallModal } from "../MarketplaceInstallModal"
+import { MarketplaceItem } from "../../../../../../src/services/marketplace/types"
+
+// Mock vscode
+const mockPostMessage = jest.fn()
+jest.mock("@/utils/vscode", () => ({
+	vscode: {
+		postMessage: mockPostMessage,
+	},
+}))
+
+// Mock translation
+jest.mock("@/i18n/TranslationContext", () => ({
+	useAppTranslation: () => ({
+		t: (key: string, params?: any) => {
+			// Simple mock translation
+			if (key === "marketplace:install.configuration") return "Configuration"
+			if (key === "marketplace:install.button") return "Install"
+			if (key === "common:answers.cancel") return "Cancel"
+			if (key === "marketplace:install.validationRequired") {
+				return `Please provide a value for ${params?.paramName || "parameter"}`
+			}
+			return key
+		},
+	}),
+}))
+
+describe("MarketplaceInstallModal - Optional Parameters", () => {
+	const mockOnClose = jest.fn()
+
+	beforeEach(() => {
+		jest.clearAllMocks()
+	})
+
+	const createMcpItemWithParams = (parameters: any[]): MarketplaceItem => ({
+		id: "test-mcp",
+		name: "Test MCP",
+		description: "Test MCP with parameters",
+		type: "mcp",
+		content: '{"test-server": {"command": "test", "args": ["--key", "{{api_key}}", "--endpoint", "{{endpoint}}"]}}',
+		parameters,
+	})
+
+	it("should show (optional) label for optional parameters", () => {
+		const item = createMcpItemWithParams([
+			{
+				name: "API Key",
+				key: "api_key",
+				placeholder: "Enter API key",
+				optional: false,
+			},
+			{
+				name: "Custom Endpoint",
+				key: "endpoint",
+				placeholder: "Leave empty for default",
+				optional: true,
+			},
+		])
+
+		render(<MarketplaceInstallModal item={item} isOpen={true} onClose={mockOnClose} hasWorkspace={true} />)
+
+		expect(screen.getByText("API Key")).toBeInTheDocument()
+		expect(screen.getByText("Custom Endpoint (optional)")).toBeInTheDocument()
+	})
+
+	it("should render input fields correctly for optional parameters", () => {
+		const item = createMcpItemWithParams([
+			{
+				name: "API Key",
+				key: "api_key",
+				placeholder: "Enter API key",
+				optional: false,
+			},
+			{
+				name: "Custom Endpoint",
+				key: "endpoint",
+				placeholder: "Leave empty for default",
+				optional: true,
+			},
+		])
+
+		render(<MarketplaceInstallModal item={item} isOpen={true} onClose={mockOnClose} hasWorkspace={true} />)
+
+		// Check that input fields are rendered
+		const apiKeyInput = screen.getByPlaceholderText("Enter API key")
+		const endpointInput = screen.getByPlaceholderText("Leave empty for default")
+
+		expect(apiKeyInput).toBeInTheDocument()
+		expect(endpointInput).toBeInTheDocument()
+		expect(endpointInput).toHaveValue("")
+	})
+
+	it("should require non-optional parameters", async () => {
+		const item = createMcpItemWithParams([
+			{
+				name: "API Key",
+				key: "api_key",
+				placeholder: "Enter API key",
+				optional: false,
+			},
+			{
+				name: "Custom Endpoint",
+				key: "endpoint",
+				placeholder: "Leave empty for default",
+				optional: true,
+			},
+		])
+
+		render(<MarketplaceInstallModal item={item} isOpen={true} onClose={mockOnClose} hasWorkspace={true} />)
+
+		// Leave required parameter empty, fill optional one
+		const endpointInput = screen.getByPlaceholderText("Leave empty for default")
+		fireEvent.change(endpointInput, { target: { value: "https://custom.endpoint.com" } })
+
+		// Click install without filling required parameter
+		const installButton = screen.getByText("Install")
+		fireEvent.click(installButton)
+
+		// Should show validation error
+		await waitFor(() => {
+			expect(screen.getByText("Please provide a value for API Key")).toBeInTheDocument()
+		})
+
+		// Should not call postMessage
+		expect(mockPostMessage).not.toHaveBeenCalled()
+	})
+
+	it("should handle parameters without optional field (defaults to required)", async () => {
+		const item = createMcpItemWithParams([
+			{
+				name: "API Key",
+				key: "api_key",
+				placeholder: "Enter API key",
+				// No optional field - should default to required
+			},
+		])
+
+		render(<MarketplaceInstallModal item={item} isOpen={true} onClose={mockOnClose} hasWorkspace={true} />)
+
+		// Should not show (optional) label
+		expect(screen.getByText("API Key")).toBeInTheDocument()
+		expect(screen.queryByText("API Key (optional)")).not.toBeInTheDocument()
+
+		// Click install without filling parameter
+		const installButton = screen.getByText("Install")
+		fireEvent.click(installButton)
+
+		// Should show validation error
+		await waitFor(() => {
+			expect(screen.getByText("Please provide a value for API Key")).toBeInTheDocument()
+		})
+	})
+})
--- a/webview-ui/src/components/marketplace/components/tests/MarketplaceInstallModal.test.tsx
+++ b/webview-ui/src/components/marketplace/components/tests/MarketplaceInstallModal.test.tsx
@ -0,0 +1,217 @@
+import React from "react"
+import { render, screen, fireEvent, waitFor } from "@testing-library/react"
+import { MarketplaceInstallModal } from "../MarketplaceInstallModal"
+import { MarketplaceItem } from "../../../../../../src/services/marketplace/types"
+
+// Mock the vscode module before importing the component
+jest.mock("@/utils/vscode", () => ({
+	vscode: {
+		postMessage: jest.fn(),
+	},
+}))
+
+// Import the mocked vscode after setting up the mock
+import { vscode } from "@/utils/vscode"
+const mockedVscode = vscode as jest.Mocked<typeof vscode>
+
+// Mock the translation hook
+jest.mock("@/i18n/TranslationContext", () => ({
+	useAppTranslation: () => ({
+		t: (key: string, params?: any) => {
+			// Simple mock translation that returns the key with params
+			if (key === "marketplace:install.validationRequired") {
+				return `Please provide a value for ${params?.paramName || "parameter"}`
+			}
+			if (params) {
+				return `${key}:${JSON.stringify(params)}`
+			}
+			return key
+		},
+	}),
+}))
+
+describe("MarketplaceInstallModal - Nested Parameters", () => {
+	const mockOnClose = jest.fn()
+
+	beforeEach(() => {
+		jest.clearAllMocks()
+		// Reset the mock function
+		mockedVscode.postMessage.mockClear()
+	})
+
+	const createMockItem = (hasNestedParams = false): MarketplaceItem => ({
+		id: "test-item",
+		name: "Test MCP Server",
+		description: "A test MCP server",
+		type: "mcp",
+		author: "Test Author",
+		tags: ["test"],
+		// Global parameters
+		parameters: [
+			{
+				name: "Global API Key",
+				key: "apiKey",
+				placeholder: "Enter your API key",
+				optional: false,
+			},
+			{
+				name: "Global Optional Setting",
+				key: "globalOptional",
+				placeholder: "Optional setting",
+				optional: true,
+			},
+		],
+		content: hasNestedParams
+			? [
+					{
+						name: "NPM Installation",
+						content: "npm install {{packageName}}",
+						parameters: [
+							{
+								name: "Package Name",
+								key: "packageName",
+								placeholder: "Enter package name",
+								optional: false,
+							},
+							// Override global parameter
+							{
+								name: "NPM API Key",
+								key: "apiKey",
+								placeholder: "Enter NPM API key",
+								optional: false,
+							},
+						],
+					},
+					{
+						name: "Docker Installation",
+						content: "docker run {{imageName}}",
+						parameters: [
+							{
+								name: "Docker Image",
+								key: "imageName",
+								placeholder: "Enter image name",
+								optional: false,
+							},
+						],
+					},
+				]
+			: "npm install test-package",
+	})
+
+	it("should display global parameters when no nested parameters exist", () => {
+		const item = createMockItem(false)
+		render(<MarketplaceInstallModal item={item} isOpen={true} onClose={mockOnClose} hasWorkspace={true} />)
+
+		// Should show global parameters
+		expect(screen.getByPlaceholderText("Enter your API key")).toBeInTheDocument()
+		expect(screen.getByPlaceholderText("Optional setting")).toBeInTheDocument()
+	})
+
+	it("should display effective parameters for selected installation method", () => {
+		const item = createMockItem(true)
+		render(<MarketplaceInstallModal item={item} isOpen={true} onClose={mockOnClose} hasWorkspace={true} />)
+
+		// Should show method dropdown for multiple methods
+		expect(screen.getByRole("combobox")).toBeInTheDocument()
+
+		// Should show effective parameters (global + method-specific for NPM method)
+		expect(screen.getByPlaceholderText("Enter package name")).toBeInTheDocument() // Method-specific
+		expect(screen.getByPlaceholderText("Enter NPM API key")).toBeInTheDocument() // Overridden global
+		expect(screen.getByPlaceholderText("Optional setting")).toBeInTheDocument() // Global optional
+	})
+
+	it("should update parameters when switching installation methods", async () => {
+		const item = createMockItem(true)
+		render(<MarketplaceInstallModal item={item} isOpen={true} onClose={mockOnClose} hasWorkspace={true} />)
+
+		// Initially should show NPM method parameters
+		expect(screen.getByPlaceholderText("Enter package name")).toBeInTheDocument()
+		expect(screen.getByPlaceholderText("Enter NPM API key")).toBeInTheDocument()
+
+		// Switch to Docker method
+		const methodSelect = screen.getByRole("combobox")
+		fireEvent.click(methodSelect)
+
+		// Find and click Docker option
+		await waitFor(() => {
+			const dockerOption = screen.getByText("Docker Installation")
+			fireEvent.click(dockerOption)
+		})
+
+		// Should now show Docker method parameters
+		await waitFor(() => {
+			expect(screen.getByPlaceholderText("Enter image name")).toBeInTheDocument()
+			// Should still show global API key (not overridden in Docker method)
+			expect(screen.getByPlaceholderText("Enter your API key")).toBeInTheDocument()
+			expect(screen.getByPlaceholderText("Optional setting")).toBeInTheDocument()
+		})
+
+		// Package name parameter should no longer be visible
+		expect(screen.queryByPlaceholderText("Enter package name")).not.toBeInTheDocument()
+		expect(screen.queryByPlaceholderText("Enter NPM API key")).not.toBeInTheDocument()
+	})
+
+	it("should validate required parameters from effective parameters", async () => {
+		const item = createMockItem(true)
+		render(<MarketplaceInstallModal item={item} isOpen={true} onClose={mockOnClose} hasWorkspace={true} />)
+
+		// Try to install without filling required parameters
+		const installButton = screen.getByText("marketplace:install.button")
+		fireEvent.click(installButton)
+
+		// Should show validation error for missing required parameter
+		await waitFor(() => {
+			expect(screen.getByText(/Please provide a value for/)).toBeInTheDocument()
+		})
+
+		// Fill in the required parameters
+		const packageNameInput = screen.getByPlaceholderText("Enter package name")
+		const apiKeyInput = screen.getByPlaceholderText("Enter NPM API key")
+
+		fireEvent.change(packageNameInput, { target: { value: "test-package" } })
+		fireEvent.change(apiKeyInput, { target: { value: "test-api-key" } })
+
+		// Now install should work
+		fireEvent.click(installButton)
+
+		await waitFor(() => {
+			expect(mockedVscode.postMessage).toHaveBeenCalledWith({
+				type: "installMarketplaceItem",
+				mpItem: item,
+				mpInstallOptions: {
+					target: "project",
+					parameters: {
+						packageName: "test-package",
+						apiKey: "test-api-key", // Overridden value
+						globalOptional: "", // Optional parameter with empty string
+						_selectedIndex: 0,
+					},
+				},
+			})
+		})
+	})
+
+	it("should preserve parameter values when switching methods if keys match", async () => {
+		const item = createMockItem(true)
+		render(<MarketplaceInstallModal item={item} isOpen={true} onClose={mockOnClose} hasWorkspace={true} />)
+
+		// Fill in global optional parameter
+		const globalOptionalInput = screen.getByPlaceholderText("Optional setting")
+		fireEvent.change(globalOptionalInput, { target: { value: "test-value" } })
+
+		// Switch to Docker method
+		const methodSelect = screen.getByRole("combobox")
+		fireEvent.click(methodSelect)
+
+		await waitFor(() => {
+			const dockerOption = screen.getByText("Docker Installation")
+			fireEvent.click(dockerOption)
+		})
+
+		// Global optional parameter value should be preserved
+		await waitFor(() => {
+			const preservedInput = screen.getByPlaceholderText("Optional setting")
+			expect(preservedInput).toHaveValue("test-value")
+		})
+	})
+})
--- a/webview-ui/src/components/marketplace/components/tests/MarketplaceItemCard.test.tsx
+++ b/webview-ui/src/components/marketplace/components/tests/MarketplaceItemCard.test.tsx
@ -0,0 +1,223 @@
+import { render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { MarketplaceItemCard } from "../MarketplaceItemCard"
+import { vscode } from "@/utils/vscode"
+import { MarketplaceItem } from "../../../../../../src/services/marketplace/types"
+import { TooltipProvider } from "@/components/ui/tooltip"
+// Mock vscode API
+jest.mock("@/utils/vscode", () => ({
+	vscode: {
+		postMessage: jest.fn(),
+	},
+}))
+
+// Mock ExtensionStateContext
+jest.mock("@/context/ExtensionStateContext", () => ({
+	useExtensionState: () => ({
+		cwd: "/test/workspace",
+		filePaths: ["/test/workspace/file1.ts", "/test/workspace/file2.ts"],
+	}),
+}))
+
+// Mock translation hook
+jest.mock("@/i18n/TranslationContext", () => ({
+	useAppTranslation: () => ({
+		t: (key: string, params?: any) => {
+			if (key === "marketplace:items.card.by") {
+				return `by ${params.author}`
+			}
+			const translations: Record<string, any> = {
+				"marketplace:filters.type.mode": "Mode",
+				"marketplace:filters.type.mcpServer": "MCP Server",
+				"marketplace:filters.tags.clear": "Remove filter",
+				"marketplace:filters.tags.clickToFilter": "Add filter",
+				"marketplace:items.components": "Components", // This should be a string for the title prop
+				"marketplace:items.card.install": "Install",
+				"marketplace:items.card.installed": "Installed",
+				"marketplace:items.card.installProject": "Install Project",
+				"marketplace:items.card.removeProject": "Remove Project",
+				"marketplace:items.card.remove": "Remove",
+				"marketplace:items.card.removeProjectTooltip": "Remove from current project",
+				"marketplace:items.card.removeGlobalTooltip": "Remove from global configuration",
+				"marketplace:items.card.noWorkspaceTooltip": "Open a workspace to install marketplace items",
+				"marketplace:items.matched": "matched",
+			}
+			// Special handling for "marketplace:items.components" when it's used as a badge with count
+			if (key === "marketplace:items.components" && params?.count !== undefined) {
+				return `${params.count} Components`
+			}
+			// Special handling for "marketplace:items.matched" when it's used as a badge with count
+			if (key === "marketplace:items.matched" && params?.count !== undefined) {
+				return `${params.count} matched`
+			}
+			return translations[key] || key
+		},
+	}),
+}))
+
+const renderWithProviders = (ui: React.ReactElement) => {
+	return render(<TooltipProvider>{ui}</TooltipProvider>)
+}
+
+describe("MarketplaceItemCard", () => {
+	const defaultItem: MarketplaceItem = {
+		id: "test-item",
+		name: "Test Item",
+		description: "Test Description",
+		type: "mode",
+		author: "Test Author",
+		authorUrl: "https://example.com",
+		tags: ["test", "example"],
+		content: "test content",
+	}
+
+	const defaultProps = {
+		item: defaultItem,
+		filters: {
+			type: "",
+			search: "",
+			tags: [],
+		},
+		setFilters: jest.fn(),
+		installed: {
+			project: undefined,
+			global: undefined,
+		},
+	}
+
+	beforeEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it("renders basic item information", () => {
+		renderWithProviders(<MarketplaceItemCard {...defaultProps} />)
+
+		expect(screen.getByText("Test Item")).toBeInTheDocument()
+		expect(screen.getByText("Test Description")).toBeInTheDocument()
+		expect(screen.getByText("by Test Author")).toBeInTheDocument()
+	})
+
+	it("renders install button", () => {
+		renderWithProviders(<MarketplaceItemCard {...defaultProps} />)
+
+		// Should show install button
+		expect(screen.getByText("Install")).toBeInTheDocument()
+	})
+
+	it("renders tags and handles tag clicks", async () => {
+		const user = userEvent.setup()
+		const setFilters = jest.fn()
+
+		renderWithProviders(<MarketplaceItemCard {...defaultProps} setFilters={setFilters} />)
+
+		const tagButton = screen.getByText("test")
+		await user.click(tagButton)
+
+		expect(setFilters).toHaveBeenCalledWith({ tags: ["test"] })
+	})
+
+	it("handles author link click", async () => {
+		const user = userEvent.setup()
+		renderWithProviders(<MarketplaceItemCard {...defaultProps} />)
+
+		const authorLink = screen.getByText("by Test Author")
+		await user.click(authorLink)
+
+		expect(vscode.postMessage).toHaveBeenCalledWith({
+			type: "openExternal",
+			url: "https://example.com",
+		})
+	})
+
+	it("does not render invalid author URLs", () => {
+		const itemWithInvalidUrl: MarketplaceItem = {
+			...defaultItem,
+			authorUrl: "invalid-url",
+		}
+
+		renderWithProviders(<MarketplaceItemCard {...defaultProps} item={itemWithInvalidUrl} />)
+
+		const authorText = screen.getByText(/by Test Author/) // Changed to regex
+		expect(authorText.tagName).not.toBe("BUTTON")
+	})
+
+	describe("MarketplaceItemCard install button", () => {
+		it("renders install button", () => {
+			const setFilters = jest.fn()
+			const item: MarketplaceItem = {
+				id: "test-item",
+				name: "Test Item",
+				description: "Test Description",
+				type: "mode",
+				author: "Test Author",
+				authorUrl: "https://example.com",
+				tags: ["test", "example"],
+				content: "test content",
+			}
+			renderWithProviders(
+				<MarketplaceItemCard
+					item={item}
+					filters={{ type: "", search: "", tags: [] }}
+					setFilters={setFilters}
+					installed={{
+						project: undefined,
+						global: undefined,
+					}}
+				/>,
+			)
+
+			expect(screen.getByText("Install")).toBeInTheDocument()
+		})
+	})
+
+	it("shows install button when no workspace is open", async () => {
+		// Mock useExtensionState to simulate no workspace
+		// eslint-disable-next-line @typescript-eslint/no-require-imports
+		jest.spyOn(require("@/context/ExtensionStateContext"), "useExtensionState").mockReturnValue({
+			cwd: undefined,
+			filePaths: [],
+		} as any)
+
+		renderWithProviders(<MarketplaceItemCard {...defaultProps} />)
+
+		// Should still show the Install button (dropdown behavior is handled by MarketplaceItemActionsMenu)
+		expect(screen.getByText("Install")).toBeInTheDocument()
+	})
+
+	it("shows single Installed badge when item is installed", () => {
+		const installedProps = {
+			...defaultProps,
+			installed: {
+				project: { type: "mode" },
+				global: undefined,
+			},
+		}
+
+		renderWithProviders(<MarketplaceItemCard {...installedProps} />)
+
+		// Should show single "Installed" badge
+		expect(screen.getByText("Installed")).toBeInTheDocument()
+		// Should show Remove button instead of Install
+		expect(screen.getByText("Remove")).toBeInTheDocument()
+		// Should not show Install button
+		expect(screen.queryByText("Install")).not.toBeInTheDocument()
+	})
+
+	it("shows single Installed badge even when installed in both locations", () => {
+		const installedProps = {
+			...defaultProps,
+			installed: {
+				project: { type: "mode" },
+				global: { type: "mode" },
+			},
+		}
+
+		renderWithProviders(<MarketplaceItemCard {...installedProps} />)
+
+		// Should show only one "Installed" badge
+		const installedBadges = screen.getAllByText("Installed")
+		expect(installedBadges).toHaveLength(1)
+		// Should show Remove button
+		expect(screen.getByText("Remove")).toBeInTheDocument()
+	})
+})
--- a/webview-ui/src/components/marketplace/useStateManager.ts
+++ b/webview-ui/src/components/marketplace/useStateManager.ts
@ -0,0 +1,47 @@
+import { useState, useEffect } from "react"
+import { MarketplaceViewStateManager, ViewState } from "./MarketplaceViewStateManager"
+
+export function useStateManager(existingManager?: MarketplaceViewStateManager) {
+	const [manager] = useState(() => existingManager || new MarketplaceViewStateManager())
+	const [state, setState] = useState(() => manager.getState())
+
+	useEffect(() => {
+		const handleStateChange = (newState: ViewState) => {
+			setState((prevState) => {
+				// Compare specific state properties that matter for rendering
+				const hasChanged =
+					prevState.isFetching !== newState.isFetching ||
+					prevState.activeTab !== newState.activeTab ||
+					JSON.stringify(prevState.allItems) !== JSON.stringify(newState.allItems) ||
+					JSON.stringify(prevState.displayItems) !== JSON.stringify(newState.displayItems) ||
+					JSON.stringify(prevState.filters) !== JSON.stringify(newState.filters)
+
+				return hasChanged ? newState : prevState
+			})
+		}
+
+		const handleMessage = (event: MessageEvent) => {
+			manager.handleMessage(event.data)
+		}
+
+		// Register message handler immediately
+		window.addEventListener("message", handleMessage)
+
+		// Register state change handler
+		const unsubscribe = manager.onStateChange(handleStateChange)
+
+		// Force initial state sync
+		handleStateChange(manager.getState())
+
+		return () => {
+			window.removeEventListener("message", handleMessage)
+			unsubscribe()
+			// Don't cleanup the manager if it was provided externally
+			if (!existingManager) {
+				manager.cleanup()
+			}
+		}
+	}, [manager, existingManager])
+
+	return [state, manager] as const
+}
--- a/webview-ui/src/components/marketplace/utils/tests/grouping.test.ts
+++ b/webview-ui/src/components/marketplace/utils/tests/grouping.test.ts
@ -0,0 +1,120 @@
+import { groupItemsByType, formatItemText, getTotalItemCount, getUniqueTypes } from "../grouping"
+import { MarketplaceItem } from "../../../../../../src/services/marketplace/types"
+
+describe("grouping utilities", () => {
+	const mockItems: MarketplaceItem[] = [
+		{
+			id: "test-server",
+			name: "Test Server",
+			description: "A test MCP server",
+			type: "mcp",
+			content: "test content",
+		},
+		{
+			id: "test-mode",
+			name: "Test Mode",
+			description: "A test mode",
+			type: "mode",
+			content: "test content",
+		},
+		{
+			id: "another-server",
+			name: "Another Server",
+			description: "Another test MCP server",
+			type: "mcp",
+			content: "test content",
+		},
+	]
+
+	describe("groupItemsByType", () => {
+		it("should group items by type correctly", () => {
+			const result = groupItemsByType(mockItems)
+
+			expect(Object.keys(result)).toHaveLength(2)
+			expect(result["mcp"].items).toHaveLength(2)
+			expect(result["mode"].items).toHaveLength(1)
+
+			expect(result["mcp"].items[0].name).toBe("Test Server")
+			expect(result["mode"].items[0].name).toBe("Test Mode")
+		})
+
+		it("should handle empty items array", () => {
+			expect(groupItemsByType([])).toEqual({})
+			expect(groupItemsByType(undefined)).toEqual({})
+		})
+
+		it("should handle items with missing metadata", () => {
+			const itemsWithMissingData: MarketplaceItem[] = [
+				{
+					id: "test-item",
+					name: "",
+					description: "",
+					type: "mcp",
+					content: "test content",
+				},
+			]
+
+			const result = groupItemsByType(itemsWithMissingData)
+			expect(result["mcp"].items[0].name).toBe("Unnamed item")
+		})
+
+		it("should preserve item order within groups", () => {
+			const result = groupItemsByType(mockItems)
+			const servers = result["mcp"].items
+
+			expect(servers[0].name).toBe("Test Server")
+			expect(servers[1].name).toBe("Another Server")
+		})
+
+		it("should skip items without type", () => {
+			const itemsWithoutType = [
+				{
+					id: "test-item",
+					name: "Test Item",
+					description: "Test description",
+					type: undefined as any, // Force undefined type to test the skip logic
+					content: "test content",
+				},
+			] as MarketplaceItem[]
+
+			const result = groupItemsByType(itemsWithoutType)
+			expect(Object.keys(result)).toHaveLength(0)
+		})
+	})
+
+	describe("formatItemText", () => {
+		it("should format item with name and description", () => {
+			const item = { name: "Test", description: "Description" }
+			expect(formatItemText(item)).toBe("Test - Description")
+		})
+
+		it("should handle items without description", () => {
+			const item = { name: "Test" }
+			expect(formatItemText(item)).toBe("Test")
+		})
+	})
+
+	describe("getTotalItemCount", () => {
+		it("should count total items across all groups", () => {
+			const groups = groupItemsByType(mockItems)
+			expect(getTotalItemCount(groups)).toBe(3)
+		})
+
+		it("should handle empty groups", () => {
+			expect(getTotalItemCount({})).toBe(0)
+		})
+	})
+
+	describe("getUniqueTypes", () => {
+		it("should return sorted array of unique types", () => {
+			const groups = groupItemsByType(mockItems)
+			const types = getUniqueTypes(groups)
+
+			expect(types).toEqual(["mcp", "mode"])
+		})
+
+		it("should handle empty groups", () => {
+			expect(getUniqueTypes({})).toEqual([])
+		})
+	})
+})
--- a/webview-ui/src/components/marketplace/utils/grouping.ts
+++ b/webview-ui/src/components/marketplace/utils/grouping.ts
@ -0,0 +1,90 @@
+import { MarketplaceItem } from "../../../../../src/services/marketplace/types"
+
+export interface GroupedItems {
+	[type: string]: {
+		type: string
+		items: Array<{
+			name: string
+			description?: string
+			metadata?: any
+			path?: string
+			matchInfo?: {
+				matched: boolean
+				matchReason?: Record<string, boolean>
+			}
+		}>
+	}
+}
+
+/**
+ * Groups package items by their type
+ * @param items Array of items to group
+ * @returns Object with items grouped by type
+ */
+export function groupItemsByType(items: MarketplaceItem[] = []): GroupedItems {
+	if (!items?.length) {
+		return {}
+	}
+
+	const groups: GroupedItems = {}
+
+	for (const item of items) {
+		if (!item.type) continue
+
+		if (!groups[item.type]) {
+			groups[item.type] = {
+				type: item.type,
+				items: [],
+			}
+		}
+
+		groups[item.type].items.push({
+			name: item.name || "Unnamed item",
+			description: item.description,
+			metadata: undefined,
+			path: item.id, // Use id as path since MarketplaceItem doesn't have path
+			matchInfo: undefined,
+		})
+	}
+
+	return groups
+}
+
+/**
+ * Gets a formatted string representation of an item
+ * @param item The item to format
+ * @returns Formatted string with name and description
+ */
+export function formatItemText(item: { name: string; description?: string }): string {
+	if (!item.description) {
+		return item.name
+	}
+
+	const maxLength = 100
+	const result =
+		item.name +
+		" - " +
+		(item.description.length > maxLength ? item.description.substring(0, maxLength) + "..." : item.description)
+
+	return result
+}
+
+/**
+ * Gets the total number of items across all groups
+ * @param groups Grouped items object
+ * @returns Total number of items
+ */
+export function getTotalItemCount(groups: GroupedItems): number {
+	return Object.values(groups).reduce((total, group) => total + group.items.length, 0)
+}
+
+/**
+ * Gets an array of unique types from the grouped items
+ * @param groups Grouped items object
+ * @returns Array of type strings
+ */
+export function getUniqueTypes(groups: GroupedItems): string[] {
+	const types = Object.keys(groups)
+	types.sort()
+	return types
+}
--- a/webview-ui/src/components/settings/ExperimentalSettings.tsx
+++ b/webview-ui/src/components/settings/ExperimentalSettings.tsx
@ -78,7 +78,10 @@ export const ExperimentalSettings = ({
 								experimentKey={config[0]}
 								enabled={experiments[EXPERIMENT_IDS[config[0] as keyof typeof EXPERIMENT_IDS]] ?? false}
 								onChange={(enabled) =>
-									setExperimentEnabled(EXPERIMENT_IDS[config[0] as keyof typeof EXPERIMENT_IDS], enabled)
+									setExperimentEnabled(
+										EXPERIMENT_IDS[config[0] as keyof typeof EXPERIMENT_IDS],
+										enabled,
+									)
 								}
 							/>
 						)
--- a/webview-ui/src/context/tests/ExtensionStateContext.test.tsx
+++ b/webview-ui/src/context/tests/ExtensionStateContext.test.tsx
@ -222,7 +222,7 @@ describe("mergeExtensionState", () => {
 			apiConfiguration: { modelMaxThinkingTokens: 456, modelTemperature: 0.3 },
 			experiments: {
 				powerSteering: true,
-				autoCondenseContext: true,
+				marketplace: false,
 				concurrentFileReads: true,
 				disableCompletionCommand: false,
 			} as Record<ExperimentId, boolean>,
@ -237,7 +237,7 @@ describe("mergeExtensionState", () => {

 		expect(result.experiments).toEqual({
 			powerSteering: true,
-			autoCondenseContext: true,
+			marketplace: false,
 			concurrentFileReads: true,
 			disableCompletionCommand: false,
 		})
--- a/webview-ui/src/i18n/locales/ca/common.json
+++ b/webview-ui/src/i18n/locales/ca/common.json
@ -1,4 +1,11 @@
 {
+	"answers": {
+		"yes": "Sí",
+		"no": "No",
+		"cancel": "Cancel·lar",
+		"remove": "Eliminar",
+		"keep": "Mantenir"
+	},
 	"number_format": {
 		"thousand_suffix": "k",
 		"million_suffix": "m",
--- a/webview-ui/src/i18n/locales/ca/marketplace.json
+++ b/webview-ui/src/i18n/locales/ca/marketplace.json
@ -0,0 +1,128 @@
+{
+	"title": "Marketplace",
+	"tabs": {
+		"installed": "Instal·lat",
+		"settings": "Configuració",
+		"browse": "Navegar"
+	},
+	"done": "Fet",
+	"refresh": "Actualitzar",
+	"filters": {
+		"search": {
+			"placeholder": "Cercar elements del marketplace...",
+			"placeholderMcp": "Cercar MCPs...",
+			"placeholderMode": "Cercar modes..."
+		},
+		"type": {
+			"label": "Filtrar per tipus:",
+			"all": "Tots els tipus",
+			"mode": "Mode",
+			"mcpServer": "Servidor MCP"
+		},
+		"sort": {
+			"label": "Ordenar per:",
+			"name": "Nom",
+			"author": "Autor",
+			"lastUpdated": "Última actualització"
+		},
+		"tags": {
+			"label": "Filtrar per etiquetes:",
+			"clear": "Netejar etiquetes",
+			"placeholder": "Escriu per cercar i seleccionar etiquetes...",
+			"noResults": "No s'han trobat etiquetes coincidents",
+			"selected": "Mostrant elements amb qualsevol de les etiquetes seleccionades",
+			"clickToFilter": "Feu clic a les etiquetes per filtrar elements"
+		},
+		"none": "Cap"
+	},
+	"type-group": {
+		"modes": "Modes",
+		"mcps": "Servidors MCP"
+	},
+	"items": {
+		"empty": {
+			"noItems": "No s'han trobat elements del marketplace",
+			"withFilters": "Prova d'ajustar els filtres",
+			"noSources": "Prova d'afegir una font a la pestanya Fonts",
+			"adjustFilters": "Prova d'ajustar els filtres o termes de cerca",
+			"clearAllFilters": "Netejar tots els filtres"
+		},
+		"count": "{{count}} elements trobats",
+		"components": "{{count}} components",
+		"matched": "{{count}} coincidents",
+		"refresh": {
+			"button": "Actualitzar",
+			"refreshing": "Actualitzant...",
+			"mayTakeMoment": "Això pot trigar un moment."
+		},
+		"card": {
+			"by": "per {{author}}",
+			"from": "de {{source}}",
+			"install": "Instal·lar",
+			"installProject": "Instal·lar",
+			"installGlobal": "Instal·lar (Global)",
+			"remove": "Eliminar",
+			"removeProject": "Eliminar",
+			"removeGlobal": "Eliminar (Global)",
+			"viewSource": "Veure",
+			"viewOnSource": "Veure a {{source}}",
+			"noWorkspaceTooltip": "Obre un espai de treball per instal·lar elements del marketplace",
+			"installed": "Instal·lat",
+			"removeProjectTooltip": "Eliminar del projecte actual",
+			"removeGlobalTooltip": "Eliminar de la configuració global",
+			"actionsMenuLabel": "Més accions"
+		}
+	},
+	"install": {
+		"title": "Instal·lar {{name}}",
+		"titleMode": "Instal·lar mode {{name}}",
+		"titleMcp": "Instal·lar MCP {{name}}",
+		"scope": "Àmbit d'instal·lació",
+		"project": "Projecte (espai de treball actual)",
+		"global": "Global (tots els espais de treball)",
+		"method": "Mètode d'instal·lació",
+		"configuration": "Configuració",
+		"configurationDescription": "Configura els paràmetres necessaris per a aquest servidor MCP",
+		"button": "Instal·lar",
+		"successTitle": "{{name}} instal·lat",
+		"successDescription": "Instal·lació completada amb èxit",
+		"installed": "Instal·lat amb èxit!",
+		"whatNextMcp": "Ara pots configurar i utilitzar aquest servidor MCP. Feu clic a la icona MCP de la barra lateral per canviar de pestanya.",
+		"whatNextMode": "Ara pots utilitzar aquest mode. Feu clic a la icona Modes de la barra lateral per canviar de pestanya.",
+		"done": "Fet",
+		"goToMcp": "Anar a la pestanya MCP",
+		"goToModes": "Anar a la pestanya Modes",
+		"moreInfoMcp": "Veure documentació MCP de {{name}}",
+		"validationRequired": "Si us plau, proporciona un valor per a {{paramName}}",
+		"prerequisites": "Prerequisits"
+	},
+	"sources": {
+		"title": "Configurar fonts del marketplace",
+		"description": "Afegeix repositoris Git que continguin elements del marketplace. Aquests repositoris es recuperaran quan navegueu pel marketplace.",
+		"add": {
+			"title": "Afegir nova font",
+			"urlPlaceholder": "URL del repositori Git (p. ex., https://github.com/username/repo)",
+			"urlFormats": "Formats compatibles: HTTPS (https://github.com/username/repo), SSH (git@github.com:username/repo.git), o protocol Git (git://github.com/username/repo.git)",
+			"namePlaceholder": "Nom de visualització (màx. 20 caràcters)",
+			"button": "Afegir font"
+		},
+		"current": {
+			"title": "Fonts actuals",
+			"empty": "No hi ha fonts configurades. Afegeix una font per començar.",
+			"refresh": "Actualitzar aquesta font",
+			"remove": "Eliminar font"
+		},
+		"errors": {
+			"emptyUrl": "La URL no pot estar buida",
+			"invalidUrl": "Format d'URL no vàlid",
+			"nonVisibleChars": "La URL conté caràcters no visibles a part dels espais",
+			"invalidGitUrl": "La URL ha de ser una URL de repositori Git vàlida (p. ex., https://github.com/username/repo)",
+			"duplicateUrl": "Aquesta URL ja és a la llista (coincidència insensible a majúscules i espais)",
+			"nameTooLong": "El nom ha de tenir 20 caràcters o menys",
+			"nonVisibleCharsName": "El nom conté caràcters no visibles a part dels espais",
+			"duplicateName": "Aquest nom ja s'està utilitzant (coincidència insensible a majúscules i espais)",
+			"emojiName": "Els caràcters emoji poden causar problemes de visualització",
+			"maxSources": "Màxim de {{max}} fonts permeses"
+		}
+	}
+}
--- a/webview-ui/src/i18n/locales/ca/settings.json
+++ b/webview-ui/src/i18n/locales/ca/settings.json
@ -493,6 +493,10 @@
 			"name": "Habilitar lectura concurrent de fitxers",
 			"description": "Quan està habilitat, Roo pot llegir múltiples fitxers en una sola sol·licitud. Quan està deshabilitat, Roo ha de llegir fitxers un per un. Deshabilitar-ho pot ajudar quan es treballa amb models menys capaços o quan voleu més control sobre l'accés als fitxers."
 		},
+		"MARKETPLACE": {
+			"name": "Habilitar Marketplace",
+			"description": "Quan està habilitat, pots instal·lar MCP i modes personalitzats del Marketplace."
+		},
 		"DISABLE_COMPLETION_COMMAND": {
 			"name": "Desactivar l'execució de comandes a attempt_completion",
 			"description": "Quan està activat, l'eina attempt_completion no executarà comandes. Aquesta és una característica experimental per preparar la futura eliminació de l'execució de comandes en la finalització de tasques."
--- a/webview-ui/src/i18n/locales/de/common.json
+++ b/webview-ui/src/i18n/locales/de/common.json
@ -1,4 +1,11 @@
 {
+	"answers": {
+		"yes": "Ja",
+		"no": "Nein",
+		"cancel": "Abbrechen",
+		"remove": "Entfernen",
+		"keep": "Behalten"
+	},
 	"number_format": {
 		"thousand_suffix": "k",
 		"million_suffix": "m",
--- a/webview-ui/src/i18n/locales/de/marketplace.json
+++ b/webview-ui/src/i18n/locales/de/marketplace.json
@ -0,0 +1,128 @@
+{
+	"title": "Marketplace",
+	"tabs": {
+		"installed": "Installiert",
+		"settings": "Einstellungen",
+		"browse": "Durchsuchen"
+	},
+	"done": "Fertig",
+	"refresh": "Aktualisieren",
+	"filters": {
+		"search": {
+			"placeholder": "Marketplace-Elemente durchsuchen...",
+			"placeholderMcp": "MCPs durchsuchen...",
+			"placeholderMode": "Modi durchsuchen..."
+		},
+		"type": {
+			"label": "Nach Typ filtern:",
+			"all": "Alle Typen",
+			"mode": "Modus",
+			"mcpServer": "MCP-Server"
+		},
+		"sort": {
+			"label": "Sortieren nach:",
+			"name": "Name",
+			"author": "Autor",
+			"lastUpdated": "Zuletzt aktualisiert"
+		},
+		"tags": {
+			"label": "Nach Tags filtern:",
+			"clear": "Tags löschen",
+			"placeholder": "Zum Suchen und Auswählen von Tags eingeben...",
+			"noResults": "Keine passenden Tags gefunden",
+			"selected": "Zeige Elemente mit einem der ausgewählten Tags",
+			"clickToFilter": "Klicke auf Tags, um Elemente zu filtern"
+		},
+		"none": "Keine"
+	},
+	"type-group": {
+		"modes": "Modi",
+		"mcps": "MCP-Server"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Keine Marketplace-Elemente gefunden",
+			"withFilters": "Versuche deine Filter anzupassen",
+			"noSources": "Versuche eine Quelle im Quellen-Tab hinzuzufügen",
+			"adjustFilters": "Versuche deine Filter oder Suchbegriffe anzupassen",
+			"clearAllFilters": "Alle Filter löschen"
+		},
+		"count": "{{count}} Elemente gefunden",
+		"components": "{{count}} Komponenten",
+		"matched": "{{count}} gefunden",
+		"refresh": {
+			"button": "Aktualisieren",
+			"refreshing": "Wird aktualisiert...",
+			"mayTakeMoment": "Dies kann einen Moment dauern."
+		},
+		"card": {
+			"by": "von {{author}}",
+			"from": "von {{source}}",
+			"install": "Installieren",
+			"installProject": "Installieren",
+			"installGlobal": "Installieren (Global)",
+			"remove": "Entfernen",
+			"removeProject": "Entfernen",
+			"removeGlobal": "Entfernen (Global)",
+			"viewSource": "Anzeigen",
+			"viewOnSource": "Auf {{source}} anzeigen",
+			"noWorkspaceTooltip": "Öffne einen Arbeitsbereich, um Marketplace-Elemente zu installieren",
+			"installed": "Installiert",
+			"removeProjectTooltip": "Aus aktuellem Projekt entfernen",
+			"removeGlobalTooltip": "Aus globaler Konfiguration entfernen",
+			"actionsMenuLabel": "Weitere Aktionen"
+		}
+	},
+	"install": {
+		"title": "{{name}} installieren",
+		"titleMode": "{{name}} Modus installieren",
+		"titleMcp": "{{name}} MCP installieren",
+		"scope": "Installationsbereich",
+		"project": "Projekt (aktueller Arbeitsbereich)",
+		"global": "Global (alle Arbeitsbereiche)",
+		"method": "Installationsmethode",
+		"configuration": "Konfiguration",
+		"configurationDescription": "Konfiguriere die für diesen MCP-Server erforderlichen Parameter",
+		"button": "Installieren",
+		"successTitle": "{{name}} installiert",
+		"successDescription": "Installation erfolgreich abgeschlossen",
+		"installed": "Erfolgreich installiert!",
+		"whatNextMcp": "Du kannst diesen MCP-Server jetzt konfigurieren und verwenden. Klicke auf das MCP-Symbol in der Seitenleiste, um die Tabs zu wechseln.",
+		"whatNextMode": "Du kannst diesen Modus jetzt verwenden. Klicke auf das Modi-Symbol in der Seitenleiste, um die Tabs zu wechseln.",
+		"done": "Fertig",
+		"goToMcp": "Zum MCP-Tab gehen",
+		"goToModes": "Zum Modi-Tab gehen",
+		"moreInfoMcp": "{{name}} MCP-Dokumentation anzeigen",
+		"validationRequired": "Bitte gib einen Wert für {{paramName}} an",
+		"prerequisites": "Voraussetzungen"
+	},
+	"sources": {
+		"title": "Marketplace-Quellen konfigurieren",
+		"description": "Füge Git-Repositories hinzu, die Marketplace-Elemente enthalten. Diese Repositories werden beim Durchsuchen des Marketplace abgerufen.",
+		"add": {
+			"title": "Neue Quelle hinzufügen",
+			"urlPlaceholder": "Git-Repository-URL (z.B. https://github.com/username/repo)",
+			"urlFormats": "Unterstützte Formate: HTTPS (https://github.com/username/repo), SSH (git@github.com:username/repo.git) oder Git-Protokoll (git://github.com/username/repo.git)",
+			"namePlaceholder": "Anzeigename (max. 20 Zeichen)",
+			"button": "Quelle hinzufügen"
+		},
+		"current": {
+			"title": "Aktuelle Quellen",
+			"empty": "Keine Quellen konfiguriert. Füge eine Quelle hinzu, um zu beginnen.",
+			"refresh": "Diese Quelle aktualisieren",
+			"remove": "Quelle entfernen"
+		},
+		"errors": {
+			"emptyUrl": "URL darf nicht leer sein",
+			"invalidUrl": "Ungültiges URL-Format",
+			"nonVisibleChars": "URL enthält nicht sichtbare Zeichen außer Leerzeichen",
+			"invalidGitUrl": "URL muss eine gültige Git-Repository-URL sein (z.B. https://github.com/username/repo)",
+			"duplicateUrl": "Diese URL ist bereits in der Liste (Groß-/Kleinschreibung und Leerzeichen werden ignoriert)",
+			"nameTooLong": "Name muss 20 Zeichen oder weniger haben",
+			"nonVisibleCharsName": "Name enthält nicht sichtbare Zeichen außer Leerzeichen",
+			"duplicateName": "Dieser Name wird bereits verwendet (Groß-/Kleinschreibung und Leerzeichen werden ignoriert)",
+			"emojiName": "Emoji-Zeichen können Anzeigefehler verursachen",
+			"maxSources": "Maximal {{max}} Quellen erlaubt"
+		}
+	}
+}
--- a/webview-ui/src/i18n/locales/de/settings.json
+++ b/webview-ui/src/i18n/locales/de/settings.json
@ -493,6 +493,10 @@
 			"name": "Gleichzeitiges Lesen von Dateien aktivieren",
 			"description": "Wenn aktiviert, kann Roo mehrere Dateien in einer einzigen Anfrage lesen. Wenn deaktiviert, muss Roo Dateien nacheinander lesen. Das Deaktivieren kann helfen, wenn du mit weniger leistungsfähigen Modellen arbeitest oder mehr Kontrolle über den Dateizugriff möchtest."
 		},
+		"MARKETPLACE": {
+			"name": "Marketplace aktivieren",
+			"description": "Wenn aktiviert, kannst du MCP und benutzerdefinierte Modi aus dem Marketplace installieren und verwalten."
+		},
 		"DISABLE_COMPLETION_COMMAND": {
 			"name": "Befehlsausführung in attempt_completion deaktivieren",
 			"description": "Wenn aktiviert, führt das Tool attempt_completion keine Befehle aus. Dies ist eine experimentelle Funktion, um die Abschaffung der Befehlsausführung bei Aufgabenabschluss vorzubereiten."
--- a/webview-ui/src/i18n/locales/en/common.json
+++ b/webview-ui/src/i18n/locales/en/common.json
@ -1,4 +1,11 @@
 {
+	"answers": {
+		"yes": "Yes",
+		"no": "No",
+		"cancel": "Cancel",
+		"remove": "Remove",
+		"keep": "Keep"
+	},
 	"number_format": {
 		"thousand_suffix": "k",
 		"million_suffix": "m",
--- a/webview-ui/src/i18n/locales/en/marketplace.json
+++ b/webview-ui/src/i18n/locales/en/marketplace.json
@ -0,0 +1,128 @@
+{
+	"title": "Marketplace",
+	"tabs": {
+		"installed": "Installed",
+		"settings": "Settings",
+		"browse": "Browse"
+	},
+	"done": "Done",
+	"refresh": "Refresh",
+	"filters": {
+		"search": {
+			"placeholder": "Search marketplace items...",
+			"placeholderMcp": "Search MCPs...",
+			"placeholderMode": "Search Modes..."
+		},
+		"type": {
+			"label": "Filter by type:",
+			"all": "All types",
+			"mode": "Mode",
+			"mcpServer": "MCP Server"
+		},
+		"sort": {
+			"label": "Sort by:",
+			"name": "Name",
+			"author": "Author",
+			"lastUpdated": "Last Updated"
+		},
+		"tags": {
+			"label": "Filter by tags:",
+			"clear": "Clear tags",
+			"placeholder": "Type to search and select tags...",
+			"noResults": "No matching tags found",
+			"selected": "Showing items with any of the selected tags",
+			"clickToFilter": "Click tags to filter items"
+		},
+		"none": "None"
+	},
+	"type-group": {
+		"modes": "Modes",
+		"mcps": "MCP Servers"
+	},
+	"items": {
+		"empty": {
+			"noItems": "No marketplace items found",
+			"withFilters": "Try adjusting your filters",
+			"noSources": "Try adding a source in the Sources tab",
+			"adjustFilters": "Try adjusting your filters or search terms",
+			"clearAllFilters": "Clear all filters"
+		},
+		"count": "{{count}} items found",
+		"components": "{{count}} components",
+		"matched": "{{count}} matched",
+		"refresh": {
+			"button": "Refresh",
+			"refreshing": "Refreshing...",
+			"mayTakeMoment": "This may take a moment."
+		},
+		"card": {
+			"by": "by {{author}}",
+			"from": "from {{source}}",
+			"install": "Install",
+			"installProject": "Install",
+			"installGlobal": "Install (Global)",
+			"remove": "Remove",
+			"removeProject": "Remove",
+			"removeGlobal": "Remove (Global)",
+			"viewSource": "View",
+			"viewOnSource": "View on {{source}}",
+			"noWorkspaceTooltip": "Open a workspace to install marketplace items",
+			"installed": "Installed",
+			"removeProjectTooltip": "Remove from current project",
+			"removeGlobalTooltip": "Remove from global configuration",
+			"actionsMenuLabel": "More actions"
+		}
+	},
+	"install": {
+		"title": "Install {{name}}",
+		"titleMode": "Install {{name}} Mode",
+		"titleMcp": "Install {{name}} MCP",
+		"scope": "Installation Scope",
+		"project": "Project (current workspace)",
+		"global": "Global (all workspaces)",
+		"method": "Installation Method",
+		"prerequisites": "Prerequisites",
+		"configuration": "Configuration",
+		"configurationDescription": "Configure the parameters required for this MCP server",
+		"button": "Install",
+		"successTitle": "{{name}} Installed",
+		"successDescription": "Installation completed successfully",
+		"installed": "Successfully installed!",
+		"whatNextMcp": "You can now configure and use this MCP server. Click the MCP icon in the sidebar to switch tabs.",
+		"whatNextMode": "You can now use this mode. Click the Modes icon in the sidebar to switch tabs.",
+		"done": "Done",
+		"goToMcp": "Go to MCP Tab",
+		"goToModes": "Go to Modes Tab",
+		"moreInfoMcp": "View {{name}} MCP documentation",
+		"validationRequired": "Please provide a value for {{paramName}}"
+	},
+	"sources": {
+		"title": "Configure Marketplace Sources",
+		"description": "Add Git repositories that contain marketplace items. These repositories will be fetched when browsing the marketplace.",
+		"add": {
+			"title": "Add New Source",
+			"urlPlaceholder": "Git repository URL (e.g., https://github.com/username/repo)",
+			"urlFormats": "Supported formats: HTTPS (https://github.com/username/repo), SSH (git@github.com:username/repo.git), or Git protocol (git://github.com/username/repo.git)",
+			"namePlaceholder": "Display name (max 20 chars)",
+			"button": "Add Source"
+		},
+		"current": {
+			"title": "Current Sources",
+			"empty": "No sources configured. Add a source to get started.",
+			"refresh": "Refresh this source",
+			"remove": "Remove source"
+		},
+		"errors": {
+			"emptyUrl": "URL cannot be empty",
+			"invalidUrl": "Invalid URL format",
+			"nonVisibleChars": "URL contains non-visible characters other than spaces",
+			"invalidGitUrl": "URL must be a valid Git repository URL (e.g., https://github.com/username/repo)",
+			"duplicateUrl": "This URL is already in the list (case and whitespace insensitive match)",
+			"nameTooLong": "Name must be 20 characters or less",
+			"nonVisibleCharsName": "Name contains non-visible characters other than spaces",
+			"duplicateName": "This name is already in use (case and whitespace insensitive match)",
+			"emojiName": "Emoji characters may cause display issues",
+			"maxSources": "Maximum of {{max}} sources allowed"
+		}
+	}
+}
--- a/webview-ui/src/i18n/locales/en/settings.json
+++ b/webview-ui/src/i18n/locales/en/settings.json
@ -493,6 +493,10 @@
 			"name": "Use experimental multi block diff tool",
 			"description": "When enabled, Roo will use multi block diff tool. This will try to update multiple code blocks in the file in one request."
 		},
+		"MARKETPLACE": {
+			"name": "Enable Marketplace",
+			"description": "When enabled, you can install MCPs and custom modes from the Marketplace."
+		},
 		"DISABLE_COMPLETION_COMMAND": {
 			"name": "Disable command execution in attempt_completion",
 			"description": "When enabled, the attempt_completion tool will not execute commands. This is an experimental feature to prepare for deprecating command execution in task completion."
--- a/webview-ui/src/i18n/locales/es/common.json
+++ b/webview-ui/src/i18n/locales/es/common.json
@ -1,4 +1,11 @@
 {
+	"answers": {
+		"yes": "Sí",
+		"no": "No",
+		"cancel": "Cancelar",
+		"remove": "Eliminar",
+		"keep": "Mantener"
+	},
 	"number_format": {
 		"thousand_suffix": "k",
 		"million_suffix": "m",
--- a/webview-ui/src/i18n/locales/es/marketplace.json
+++ b/webview-ui/src/i18n/locales/es/marketplace.json
@ -0,0 +1,128 @@
+{
+	"title": "Marketplace",
+	"tabs": {
+		"installed": "Instalado",
+		"settings": "Configuración",
+		"browse": "Explorar"
+	},
+	"done": "Hecho",
+	"refresh": "Actualizar",
+	"filters": {
+		"search": {
+			"placeholder": "Buscar elementos del marketplace...",
+			"placeholderMcp": "Buscar MCPs...",
+			"placeholderMode": "Buscar modos..."
+		},
+		"type": {
+			"label": "Filtrar por tipo:",
+			"all": "Todos los tipos",
+			"mode": "Modo",
+			"mcpServer": "Servidor MCP"
+		},
+		"sort": {
+			"label": "Ordenar por:",
+			"name": "Nombre",
+			"author": "Autor",
+			"lastUpdated": "Última actualización"
+		},
+		"tags": {
+			"label": "Filtrar por etiquetas:",
+			"clear": "Limpiar etiquetas",
+			"placeholder": "Escribe para buscar y seleccionar etiquetas...",
+			"noResults": "No se encontraron etiquetas coincidentes",
+			"selected": "Mostrando elementos con cualquiera de las etiquetas seleccionadas",
+			"clickToFilter": "Haz clic en las etiquetas para filtrar elementos"
+		},
+		"none": "Ninguno"
+	},
+	"type-group": {
+		"modes": "Modos",
+		"mcps": "Servidores MCP"
+	},
+	"items": {
+		"empty": {
+			"noItems": "No se encontraron elementos del marketplace",
+			"withFilters": "Intenta ajustar tus filtros",
+			"noSources": "Intenta agregar una fuente en la pestaña Fuentes",
+			"adjustFilters": "Intenta ajustar tus filtros o términos de búsqueda",
+			"clearAllFilters": "Limpiar todos los filtros"
+		},
+		"count": "{{count}} elementos encontrados",
+		"components": "{{count}} componentes",
+		"matched": "{{count}} coincidentes",
+		"refresh": {
+			"button": "Actualizar",
+			"refreshing": "Actualizando...",
+			"mayTakeMoment": "Esto puede tomar un momento."
+		},
+		"card": {
+			"by": "por {{author}}",
+			"from": "de {{source}}",
+			"install": "Instalar",
+			"installProject": "Instalar",
+			"installGlobal": "Instalar (Global)",
+			"remove": "Eliminar",
+			"removeProject": "Eliminar",
+			"removeGlobal": "Eliminar (Global)",
+			"viewSource": "Ver",
+			"viewOnSource": "Ver en {{source}}",
+			"noWorkspaceTooltip": "Abre un espacio de trabajo para instalar elementos del marketplace",
+			"installed": "Instalado",
+			"removeProjectTooltip": "Eliminar del proyecto actual",
+			"removeGlobalTooltip": "Eliminar de la configuración global",
+			"actionsMenuLabel": "Más acciones"
+		}
+	},
+	"install": {
+		"title": "Instalar {{name}}",
+		"titleMode": "Instalar modo {{name}}",
+		"titleMcp": "Instalar MCP {{name}}",
+		"scope": "Ámbito de instalación",
+		"project": "Proyecto (espacio de trabajo actual)",
+		"global": "Global (todos los espacios de trabajo)",
+		"method": "Método de instalación",
+		"configuration": "Configuración",
+		"configurationDescription": "Configura los parámetros requeridos para este servidor MCP",
+		"button": "Instalar",
+		"successTitle": "{{name}} instalado",
+		"successDescription": "Instalación completada exitosamente",
+		"installed": "¡Instalado exitosamente!",
+		"whatNextMcp": "Ahora puedes configurar y usar este servidor MCP. Haz clic en el icono MCP en la barra lateral para cambiar de pestaña.",
+		"whatNextMode": "Ahora puedes usar este modo. Haz clic en el icono Modos en la barra lateral para cambiar de pestaña.",
+		"done": "Hecho",
+		"goToMcp": "Ir a la pestaña MCP",
+		"goToModes": "Ir a la pestaña Modos",
+		"moreInfoMcp": "Ver documentación MCP de {{name}}",
+		"validationRequired": "Por favor proporciona un valor para {{paramName}}",
+		"prerequisites": "Requisitos previos"
+	},
+	"sources": {
+		"title": "Configurar fuentes del marketplace",
+		"description": "Agrega repositorios Git que contengan elementos del marketplace. Estos repositorios se obtendrán al navegar por el marketplace.",
+		"add": {
+			"title": "Agregar nueva fuente",
+			"urlPlaceholder": "URL del repositorio Git (ej., https://github.com/username/repo)",
+			"urlFormats": "Formatos soportados: HTTPS (https://github.com/username/repo), SSH (git@github.com:username/repo.git), o protocolo Git (git://github.com/username/repo.git)",
+			"namePlaceholder": "Nombre para mostrar (máx. 20 caracteres)",
+			"button": "Agregar fuente"
+		},
+		"current": {
+			"title": "Fuentes actuales",
+			"empty": "No hay fuentes configuradas. Agrega una fuente para comenzar.",
+			"refresh": "Actualizar esta fuente",
+			"remove": "Eliminar fuente"
+		},
+		"errors": {
+			"emptyUrl": "La URL no puede estar vacía",
+			"invalidUrl": "Formato de URL inválido",
+			"nonVisibleChars": "La URL contiene caracteres no visibles además de espacios",
+			"invalidGitUrl": "La URL debe ser una URL de repositorio Git válida (ej., https://github.com/username/repo)",
+			"duplicateUrl": "Esta URL ya está en la lista (coincidencia insensible a mayúsculas y espacios)",
+			"nameTooLong": "El nombre debe tener 20 caracteres o menos",
+			"nonVisibleCharsName": "El nombre contiene caracteres no visibles además de espacios",
+			"duplicateName": "Este nombre ya está en uso (coincidencia insensible a mayúsculas y espacios)",
+			"emojiName": "Los caracteres emoji pueden causar problemas de visualización",
+			"maxSources": "Máximo de {{max}} fuentes permitidas"
+		}
+	}
+}
--- a/webview-ui/src/i18n/locales/es/settings.json
+++ b/webview-ui/src/i18n/locales/es/settings.json
@ -493,6 +493,10 @@
 			"name": "Habilitar lectura concurrente de archivos",
 			"description": "Cuando está habilitado, Roo puede leer múltiples archivos en una sola solicitud. Cuando está deshabilitado, Roo debe leer archivos uno a la vez. Deshabilitarlo puede ayudar cuando se trabaja con modelos menos capaces o cuando deseas más control sobre el acceso a archivos."
 		},
+		"MARKETPLACE": {
+			"name": "Habilitar Marketplace",
+			"description": "Cuando está habilitado, puedes instalar MCP y modos personalizados del Marketplace."
+		},
 		"DISABLE_COMPLETION_COMMAND": {
 			"name": "Desactivar la ejecución de comandos en attempt_completion",
 			"description": "Cuando está activado, la herramienta attempt_completion no ejecutará comandos. Esta es una función experimental para preparar la futura eliminación de la ejecución de comandos en la finalización de tareas."
--- a/webview-ui/src/i18n/locales/fr/common.json
+++ b/webview-ui/src/i18n/locales/fr/common.json
@ -1,4 +1,11 @@
 {
+	"answers": {
+		"yes": "Oui",
+		"no": "Non",
+		"cancel": "Annuler",
+		"remove": "Supprimer",
+		"keep": "Conserver"
+	},
 	"number_format": {
 		"thousand_suffix": "k",
 		"million_suffix": "m",
--- a/webview-ui/src/i18n/locales/fr/marketplace.json
+++ b/webview-ui/src/i18n/locales/fr/marketplace.json
@ -0,0 +1,128 @@
+{
+	"title": "Marketplace",
+	"tabs": {
+		"installed": "Installé",
+		"settings": "Paramètres",
+		"browse": "Parcourir"
+	},
+	"done": "Terminé",
+	"refresh": "Actualiser",
+	"filters": {
+		"search": {
+			"placeholder": "Rechercher des éléments du marketplace...",
+			"placeholderMcp": "Rechercher des MCPs...",
+			"placeholderMode": "Rechercher des modes..."
+		},
+		"type": {
+			"label": "Filtrer par type :",
+			"all": "Tous les types",
+			"mode": "Mode",
+			"mcpServer": "Serveur MCP"
+		},
+		"sort": {
+			"label": "Trier par :",
+			"name": "Nom",
+			"author": "Auteur",
+			"lastUpdated": "Dernière mise à jour"
+		},
+		"tags": {
+			"label": "Filtrer par étiquettes :",
+			"clear": "Effacer les étiquettes",
+			"placeholder": "Tapez pour rechercher et sélectionner des étiquettes...",
+			"noResults": "Aucune étiquette correspondante trouvée",
+			"selected": "Affichage des éléments avec l'une des étiquettes sélectionnées",
+			"clickToFilter": "Cliquez sur les étiquettes pour filtrer les éléments"
+		},
+		"none": "Aucun"
+	},
+	"type-group": {
+		"modes": "Modes",
+		"mcps": "Serveurs MCP"
+	},
+	"items": {
+		"empty": {
+			"noItems": "Aucun élément du marketplace trouvé",
+			"withFilters": "Essayez d'ajuster vos filtres",
+			"noSources": "Essayez d'ajouter une source dans l'onglet Sources",
+			"adjustFilters": "Essayez d'ajuster vos filtres ou termes de recherche",
+			"clearAllFilters": "Effacer tous les filtres"
+		},
+		"count": "{{count}} éléments trouvés",
+		"components": "{{count}} composants",
+		"matched": "{{count}} correspondants",
+		"refresh": {
+			"button": "Actualiser",
+			"refreshing": "Actualisation...",
+			"mayTakeMoment": "Cela peut prendre un moment."
+		},
+		"card": {
+			"by": "par {{author}}",
+			"from": "de {{source}}",
+			"install": "Installer",
+			"installProject": "Installer",
+			"installGlobal": "Installer (Global)",
+			"remove": "Supprimer",
+			"removeProject": "Supprimer",
+			"removeGlobal": "Supprimer (Global)",
+			"viewSource": "Voir",
+			"viewOnSource": "Voir sur {{source}}",
+			"noWorkspaceTooltip": "Ouvrez un espace de travail pour installer des éléments du marketplace",
+			"installed": "Installé",
+			"removeProjectTooltip": "Supprimer du projet actuel",
+			"removeGlobalTooltip": "Supprimer de la configuration globale",
+			"actionsMenuLabel": "Plus d'actions"
+		}
+	},
+	"install": {
+		"title": "Installer {{name}}",
+		"titleMode": "Installer le mode {{name}}",
+		"titleMcp": "Installer le MCP {{name}}",
+		"scope": "Portée d'installation",
+		"project": "Projet (espace de travail actuel)",
+		"global": "Global (tous les espaces de travail)",
+		"method": "Méthode d'installation",
+		"configuration": "Configuration",
+		"configurationDescription": "Configurez les paramètres requis pour ce serveur MCP",
+		"button": "Installer",
+		"successTitle": "{{name}} installé",
+		"successDescription": "Installation terminée avec succès",
+		"installed": "Installé avec succès !",
+		"whatNextMcp": "Vous pouvez maintenant configurer et utiliser ce serveur MCP. Cliquez sur l'icône MCP dans la barre latérale pour changer d'onglet.",
+		"whatNextMode": "Vous pouvez maintenant utiliser ce mode. Cliquez sur l'icône Modes dans la barre latérale pour changer d'onglet.",
+		"done": "Terminé",
+		"goToMcp": "Aller à l'onglet MCP",
+		"goToModes": "Aller à l'onglet Modes",
+		"moreInfoMcp": "Voir la documentation MCP de {{name}}",
+		"validationRequired": "Veuillez fournir une valeur pour {{paramName}}",
+		"prerequisites": "Prérequis"
+	},
+	"sources": {
+		"title": "Configurer les sources du marketplace",
+		"description": "Ajoutez des dépôts Git qui contiennent des éléments du marketplace. Ces dépôts seront récupérés lors de la navigation dans le marketplace.",
+		"add": {
+			"title": "Ajouter une nouvelle source",
+			"urlPlaceholder": "URL du dépôt Git (ex., https://github.com/username/repo)",
+			"urlFormats": "Formats pris en charge : HTTPS (https://github.com/username/repo), SSH (git@github.com:username/repo.git), ou protocole Git (git://github.com/username/repo.git)",
+			"namePlaceholder": "Nom d'affichage (max. 20 caractères)",
+			"button": "Ajouter une source"
+		},
+		"current": {
+			"title": "Sources actuelles",
+			"empty": "Aucune source configurée. Ajoutez une source pour commencer.",
+			"refresh": "Actualiser cette source",
+			"remove": "Supprimer la source"
+		},
+		"errors": {
+			"emptyUrl": "L'URL ne peut pas être vide",
+			"invalidUrl": "Format d'URL invalide",
+			"nonVisibleChars": "L'URL contient des caractères non visibles autres que des espaces",
+			"invalidGitUrl": "L'URL doit être une URL de dépôt Git valide (ex., https://github.com/username/repo)",
+			"duplicateUrl": "Cette URL est déjà dans la liste (correspondance insensible à la casse et aux espaces)",
+			"nameTooLong": "Le nom doit faire 20 caractères ou moins",
+			"nonVisibleCharsName": "Le nom contient des caractères non visibles autres que des espaces",
+			"duplicateName": "Ce nom est déjà utilisé (correspondance insensible à la casse et aux espaces)",
+			"emojiName": "Les caractères emoji peuvent causer des problèmes d'affichage",
+			"maxSources": "Maximum de {{max}} sources autorisées"
+		}
+	}
+}
--- a/webview-ui/src/i18n/locales/fr/settings.json
+++ b/webview-ui/src/i18n/locales/fr/settings.json
@ -493,6 +493,10 @@
 			"name": "Activer la lecture simultanée de fichiers",
 			"description": "Lorsqu'activé, Roo peut lire plusieurs fichiers dans une seule requête. Lorsque désactivé, Roo doit lire les fichiers un par un. La désactivation peut aider lors du travail avec des modèles moins performants ou lorsque tu souhaites plus de contrôle sur l'accès aux fichiers."
 		},
+		"MARKETPLACE": {
+			"name": "Activer le Marketplace",
+			"description": "Lorsque cette option est activée, tu peux installer des MCP et des modes personnalisés depuis le Marketplace."
+		},
 		"DISABLE_COMPLETION_COMMAND": {
 			"name": "Désactiver l'exécution des commandes dans attempt_completion",
 			"description": "Lorsque cette option est activée, l'outil attempt_completion n'exécutera pas de commandes. Il s'agit d'une fonctionnalité expérimentale visant à préparer la dépréciation de l'exécution des commandes lors de la finalisation des tâches."
--- a/webview-ui/src/i18n/locales/hi/common.json
+++ b/webview-ui/src/i18n/locales/hi/common.json
@ -1,4 +1,11 @@
 {
+	"answers": {
+		"yes": "हाँ",
+		"no": "नहीं",
+		"cancel": "रद्द करें",
+		"remove": "हटाएं",
+		"keep": "रखें"
+	},
 	"number_format": {
 		"thousand_suffix": "k",
 		"million_suffix": "m",
--- a/Show more
+++ b/Show more