Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.
Python agent-orchestrationai-agentai-coding-assistantclaude-codecoding-agentcomputer-usedesktop-applocal-firstmcppersonal-jarvisvoice-assistantvoice-coding
fix(plugins): open compact catalog directly and complete Slack scopes
rubenluetke10-beep441e30618e5a
diff --git a/docs/marketplace/plugin-auth-audit.md b/docs/marketplace/plugin-auth-audit.mdindex 7981e54e21..e0e69c9f95 100644--- a/docs/marketplace/plugin-auth-audit.md+++ b/docs/marketplace/plugin-auth-audit.md@@ -6,7 +6,7 @@ This inventory supersedes earlier claims that mocked DCR checks proved working l## Evidence boundaries-Every catalog plugin has an observed Connect or Reconnect entry. A stage-level `ui: PASS` means the UI attempt was observed, not that Add, installation or connection completed. A stage-level `browser: PASS` means an official provider page was reached, not that authorization succeeded. No plugin has verified successful callback, new connected state, real functional smoke test, complete disconnect/reconnect, or post-restart persistence in this audit.+Every catalog plugin has an observed Connect or Reconnect entry. A stage-level `ui: PASS` means the UI attempt was observed, not that Add, installation or connection completed. A stage-level `browser: PASS` means an official provider page was reached, not that authorization succeeded. Google Drive now has a verified real read-only smoke action using its existing grant. No plugin has a verified complete clean-state callback, new connected state, disconnect/reconnect and post-restart lifecycle in this audit.Eleven existing connections were preserved: github, gmail, google_drive, google_calendar, youtube_music, youtube_studio, x, telegram, notion, cloudflare and linear. Their Reconnect controls were exercised without revoking working credentials. They were **not** tested from a clean, unconnected state. Existing credentials and existing Connected labels do not prove the new flow. The remaining rows describe connection attempts, not certified fresh installations.@@ -22,14 +22,14 @@ The real runtime was exercised on Windows. Linux/macOS behavior and clean instal| `vercel` (Vercel) | Connect entry observed; completion blocked | Provider page reached; authorization incomplete | Not verified | Not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Provider account sign-in has not been completed. **Owner:** Provider account holder. **Next:** Complete official sign-in and consent, then verify all seven stages with a real read-only plugin action. Observation: Connect opened official vercel.com/oauth/authorize; provider sign-in required. No user token or client setup. || `supabase` (Supabase) | Connect entry observed; completion blocked | Provider page reached; authorization incomplete | Not verified | Not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Provider account sign-in has not been completed. **Owner:** Provider account holder. **Next:** Complete official sign-in and consent, then verify all seven stages with a real read-only plugin action. Observation: Connect opened supabase.com/dashboard/sign-in via provider DCR. Account sign-in required. || `notion` (Notion) | Reconnect entry only; existing connection retained | Provider page reached; authorization incomplete | Not verified | Existing state only; new grant not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Official provider consent page reached; a new resource access grant awaits explicit account-holder approval. **Owner:** Provider account holder. **Next:** Approve the intended workspace or cloud resource grant, then verify callback, action, reconnect and restart. Observation: Existing connection retained; Reconnect reached real Notion workspace consent. New grant awaits explicit user approval for workspace access. |-| `slack` (Slack) | Connect entry observed; completion blocked | Not reached | Not verified | Not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Publisher OAuth client is missing; the real UI displays publisher setup pending. **Owner:** Project publisher. **Next:** Provision the official shared OAuth registration and any required review, then repeat the full clean browser journey. Observation: Connect Slack Browser sign-in is not available yet. Browser sign-in is pending publisher setup. No developer account or client registration is required from you. Use your own OAuth client (advanced) Cancel Continue |+| `slack` (Slack) | Connect entry observed; completion blocked | Not reached | Not verified | Not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Publisher OAuth client is missing; the real UI displays publisher setup pending. **Owner:** Project publisher. **Next:** Provision the official shared OAuth registration and any required review, then repeat the full clean browser journey. Observation: Connect Slack Browser sign-in is not available yet. Browser sign-in is pending publisher setup. No developer account or client registration is required from you. Use your own OAuth client (advanced) Cancel Continue Recheck: live plugin.json includes channels:read, groups:read, im:read, mpim:read, canvases:read and canvases:write; Connect remains publisher-pending. || `linear` (Linear) | Reconnect entry only; existing connection retained | Provider page reached; authorization incomplete | Not verified | Existing state only; new grant not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Official provider consent page reached; a new resource access grant awaits explicit account-holder approval. **Owner:** Provider account holder. **Next:** Approve the intended workspace or cloud resource grant, then verify callback, action, reconnect and restart. Observation: Existing connection retained; Reconnect reached official mcp.linear.app authorization page for Personal Jarvis. || `stripe` (Stripe) | Connect entry observed; completion blocked | Provider page reached; authorization incomplete | Not verified | Not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Provider account sign-in has not been completed. **Owner:** Provider account holder. **Next:** Complete official sign-in and consent, then verify all seven stages with a real read-only plugin action. Observation: Connect opened official dashboard.stripe.com/login. Provider account sign-in required; no manual token or client setup. || `cloudflare` (Cloudflare) | Reconnect entry only; existing connection retained | Provider page reached; authorization incomplete | Not verified | Existing state only; new grant not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Official provider consent page reached; a new resource access grant awaits explicit account-holder approval. **Owner:** Provider account holder. **Next:** Approve the intended workspace or cloud resource grant, then verify callback, action, reconnect and restart. Observation: Existing connection retained; Reconnect reached official workers-observability approval page for Personal Jarvis; private cloud resource access requires approval. || `discord` (Discord) | Connect entry observed; completion blocked | Not reached | Not verified | Not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Local channel bot credential is required; no replacement credential was supplied. **Owner:** Provider account holder. **Next:** Provide an authorized test credential through onboarding, verify a real action and lifecycle, and retain the documented browser-standard exception. Observation: Connect Discord Access token · Access Token 1 Generate a token at Discord 1. Open https://discord.com/developers/applications and click 'New Application'. 2. Go to the 'Bot' page, click 'Reset Token', and copy it (shown once). 3. Under 'Privileged Gateway Intents', enable 'Message Content Intent'... || `telegram` (Telegram) | Reconnect entry only; existing connection retained | Not reached | Not verified | Existing state only; new grant not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Local channel bot credential is required; no replacement credential was supplied. **Owner:** Provider account holder. **Next:** Provide an authorized test credential through onboarding, verify a real action and lifecycle, and retain the documented browser-standard exception. Observation: Existing bot connection; Reconnect opened token onboarding. Official Bot API requires bot token; no replacement bot credential supplied, existing connection preserved. || `asana` (Asana) | Connect entry observed; completion blocked | Not reached | Not verified | Not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Publisher OAuth client is missing; the real UI displays publisher setup pending. **Owner:** Project publisher. **Next:** Provision the official shared OAuth registration and any required review, then repeat the full clean browser journey. Observation: Connect Asana Browser sign-in is not available yet. Browser sign-in is pending publisher setup. No developer account or client registration is required from you. Use your own OAuth client (advanced) Cancel Continue |-| `google_drive` (Google Drive) | Reconnect entry only; existing connection retained | Not reached | Not verified | Existing state only; new grant not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Working credential retained; only Reconnect entry was inspected, without a clean disconnect or completed new grant. **Owner:** Provider account holder. **Next:** Complete an approved reconnect and separately verify a clean installation, real action and restart persistence. Observation: Existing connection; Reconnect entry: Connect Google Drive You'll sign in with your Google account in the browser. Use your own OAuth client (advanced) Cancel Continue |+| `google_drive` (Google Drive) | Reconnect entry only; existing connection retained | Not reached | Not verified | Existing state only; new grant not verified | PASS: real list_files, one result; existing grant | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | **Owner:** Project publisher and provider account holder. **Next:** Complete clean-state authorization, disconnect/reconnect, restart persistence and fresh-install validation. Observation: Jarvis Chat called google_drive/list_files with max_results=1; persisted tool_result is_error=false, duration 571 ms, one returned file. No file names or contents are included in this audit. || `gmail` (Gmail) | Reconnect entry only; existing connection retained | Not reached | Not verified | Existing state only; new grant not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Working credential retained; only Reconnect entry was inspected, without a clean disconnect or completed new grant. **Owner:** Provider account holder. **Next:** Complete an approved reconnect and separately verify a clean installation, real action and restart persistence. Observation: Existing connection; Reconnect entry: Connect Gmail You'll sign in with your Google account in the browser. Use your own OAuth client (advanced) Cancel Continue || `google_calendar` (Google Calendar) | Reconnect entry only; existing connection retained | Not reached | Not verified | Existing state only; new grant not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Working credential retained; only Reconnect entry was inspected, without a clean disconnect or completed new grant. **Owner:** Provider account holder. **Next:** Complete an approved reconnect and separately verify a clean installation, real action and restart persistence. Observation: Existing connection; Reconnect entry: Connect Google Calendar You'll sign in with your Google account in the browser. Use your own OAuth client (advanced) Cancel Continue || `todoist` (Todoist) | Connect entry observed; completion blocked | Provider page reached; authorization incomplete | Not verified | Not verified | Not run | Not completed | Windows UI only; other OSes not exercised | **BLOCKED** | Provider account sign-in has not been completed. **Owner:** Provider account holder. **Next:** Complete official sign-in and consent, then verify all seven stages with a real read-only plugin action. Observation: Official app.todoist.com/auth/login reached from Connect; account sign-in required. |@@ -82,3 +82,9 @@ Run `python scripts/ci/check_plugin_auth_contract.py` for configuration, matrixA new built-in plugin must carry a complete real journey PASS before release. Record a genuine functional action for smoke evidence; discovery or listing available tools is insufficient. An auth/execution configuration change invalidates the fingerprint and requires renewed relevant observations. Never refresh a fingerprint to disguise stale successful evidence.For closure, complete all independently achievable repairs and replace each remaining external BLOCKED row only with new observed evidence or a precisely maintained external dependency. The ticket's acceptance criteria remain unsatisfied while clean-state, functional and lifecycle verification is missing. The audit itself must never be presented as completion of those checks.++## Continued functional and navigation work++The compact catalog is being made the direct navigation destination, defaulting to Plugins with Plugins, MCPs, Skills ordering. This UI work does not reduce the plugin acceptance scope. Google Drive has one genuine successful safe action through Jarvis Chat; all full-plugin results remain BLOCKED until their complete required journeys are proven.++Slack channel enumeration and Canvas permissions now match the advertised feature set. Only exact old default catalog configurations migrate; custom scopes, clients, redirects, servers and existing grants are preserved. Source: [official Slack MCP scope guide](https://docs.slack.dev/ai/slack-mcp-server/).diff --git a/docs/marketplace/plugin-e2e-audit.json b/docs/marketplace/plugin-e2e-audit.jsonindex b855c70394..a86b5a9c3b 100644--- a/docs/marketplace/plugin-e2e-audit.json+++ b/docs/marketplace/plugin-e2e-audit.json@@ -203,12 +203,12 @@{"plugin_id": "slack","result": "BLOCKED",- "config_fingerprint": "08473808291e74433e704897132081f86e058dae9bfeb339bab1bc097435ccc7",+ "config_fingerprint": "b63622e53686a82209b37ee568201a59eab8feb3334371c770a17939d4e622ff","initial_state": "connect_attempt","evidence": {"ui": {"status": "PASS",- "detail": "Connect Slack\n\nBrowser sign-in is not available yet.\n\nBrowser sign-in is pending publisher setup. No developer account or client registration is required from you.\n\nUse your own OAuth client (advanced)\nCancel\nContinue",+ "detail": "Repeated live Plugins UI inspection showed the four channel enumeration scopes and two Canvas scopes in plugin.json; Connect still displays publisher setup pending.","reference": "docs/marketplace/plugin-auth-audit.md#audit-matrix"},"browser": {@@ -578,9 +578,10 @@"reference": "docs/marketplace/plugin-auth-audit.md#audit-matrix"},"smoke": {- "status": "BLOCKED",- "detail": "Smoke completion was not verified in this audit. Working credential retained; only Reconnect entry was inspected, without a clean disconnect or completed new grant.",- "reference": "docs/marketplace/plugin-auth-audit.md#audit-matrix"+ "status": "PASS",+ "detail": "2026-09-12: a read-only request submitted in Jarvis Chat executed google_drive action=list_files, max_results=1. The persisted tool_result reports is_error=false, duration_ms=571 and one returned file. This used the existing grant, not a newly verified authorization.",+ "reference": "docs/marketplace/plugin-auth-audit.md#audit-matrix",+ "real_action": true},"reconnect": {"status": "BLOCKED",@@ -594,7 +595,7 @@}},"blocker": {- "reason": "Working credential retained; only Reconnect entry was inspected, without a clean disconnect or completed new grant.",+ "reason": "Full clean-state authorization, disconnect/reconnect, restart persistence and fresh-install validation remain unverified. A real read-only action succeeded with the existing grant.","owner": "Provider account holder","next_action": "Complete an approved reconnect and separately verify a clean installation, real action and restart persistence.","evidence": "Existing connection; Reconnect entry: Connect Google Drive\n\nYou'll sign in with your Google account in the browser.\n\nUse your own OAuth client (advanced)\nCancel\nContinue"diff --git a/jarvis/marketplace/catalog_data.py b/jarvis/marketplace/catalog_data.pyindex ff9c4ed254..1c8d9f96b1 100644--- a/jarvis/marketplace/catalog_data.py+++ b/jarvis/marketplace/catalog_data.py@@ -147,6 +147,22 @@ _LEGACY_PAT_AUTH_DIGESTS = {"stripe": "e19610b1b59a59ffe1e231e8d5adda082437eebb59cec1c2df215470c742dde4",}+# Full shipped Slack auth block before channel listing and Canvas permissions.+# Never widen a user's custom scopes, client, redirect, or server configuration.+_LEGACY_SLACK_AUTH_DIGEST = "7222ece276d51c75bcdf6f8f0dc28412674950ef21301975b7870a73340c1de2"+++def _has_obsolete_slack_scopes(plugin: dict, seed_plugin: dict) -> bool:+ auth = plugin.get("auth")+ if plugin.get("id") != "slack" or not isinstance(auth, dict):+ return False+ digest = hashlib.sha256(+ json.dumps(auth, sort_keys=True, separators=(",", ":")).encode("utf-8")+ ).hexdigest()+ return digest == _LEGACY_SLACK_AUTH_DIGEST and plugin.get("mcp_server") == seed_plugin.get(+ "mcp_server"+ )+def _has_obsolete_builtin_auth(plugin: dict, seed_plugin: dict) -> bool:auth = plugin.get("auth")@@ -209,7 +225,10 @@ def _merge_with_seed(override: object, seed: object) -> object:merged_plugins.append(plugin) # a purely local entrycontinuereconciled = dict(seed_plugin)- if not _has_obsolete_builtin_auth(plugin, seed_plugin):+ if not (+ _has_obsolete_builtin_auth(plugin, seed_plugin)+ or _has_obsolete_slack_scopes(plugin, seed_plugin)+ ):for field in _OVERRIDE_OWNED_FIELDS:if field in plugin:reconciled[field] = plugin[field]diff --git a/jarvis/marketplace/seed_catalog.json b/jarvis/marketplace/seed_catalog.jsonindex da1b919c69..03ba7db4b1 100644--- a/jarvis/marketplace/seed_catalog.json+++ b/jarvis/marketplace/seed_catalog.json@@ -160,7 +160,13 @@"channels:history","groups:history","im:history",- "mpim:history"+ "mpim:history",+ "channels:read",+ "groups:read",+ "im:read",+ "mpim:read",+ "canvases:read",+ "canvases:write"],"user_scopes_only": true,"refresh_supported": true,diff --git a/jarvis/ui/web/frontend/src/components/layout/DockRail.test.tsx b/jarvis/ui/web/frontend/src/components/layout/DockRail.test.tsxindex 725b07e63b..14aa19b856 100644--- a/jarvis/ui/web/frontend/src/components/layout/DockRail.test.tsx+++ b/jarvis/ui/web/frontend/src/components/layout/DockRail.test.tsx@@ -165,23 +165,36 @@ describe("DockRail", () => {);});- test("a plugin that needs a reconnect lights Skills amber and sends the click to Plugins", () => {+ test("a plugin that needs a reconnect marks the catalog amber and opens Plugins", () => {pluginAttentionMock.needsReconnect = true;renderRail();- const pip = screen.getByTestId("nav-warn-skills");+ const pip = screen.getByTestId("nav-warn-plugins");expect(pip.getAttribute("aria-label")).toContain("Cloudflare");act(() => {- fireEvent.click(screen.getByTestId("nav-row-skills"));+ fireEvent.click(screen.getByTestId("nav-row-plugins"));});expect(useEventStore.getState().activeSection).toBe("plugins");});- test("no amber pip when every plugin is healthy, and Skills lands on Skills", () => {+ test.each(["hover", "focus"] as const)("shows the plugin reconnect hint on %s", (interaction) => {+ pluginAttentionMock.needsReconnect = true;renderRail();- expect(screen.queryByTestId("nav-warn-skills")).toBeNull();+ if (interaction === "hover") {+ moveTo(screen.getByTestId("dock-rail"), centreOf(ITEMS.findIndex((item) => item.id === "plugins")));+ } else {+ fireEvent.focus(screen.getByTestId("nav-row-plugins"));+ }+ const label = screen.getByTestId("dock-label");+ expect(label.textContent).toContain("Cloudflare");+ expect(label.textContent).toContain("reconnect");+ });++ test("healthy catalog has no amber pip and defaults to Plugins", () => {+ renderRail();+ expect(screen.queryByTestId("nav-warn-plugins")).toBeNull();act(() => {- fireEvent.click(screen.getByTestId("nav-row-skills"));+ fireEvent.click(screen.getByTestId("nav-row-plugins"));});- expect(useEventStore.getState().activeSection).toBe("skills");+ expect(useEventStore.getState().activeSection).toBe("plugins");});});diff --git a/jarvis/ui/web/frontend/src/components/layout/DockRail.tsx b/jarvis/ui/web/frontend/src/components/layout/DockRail.tsxindex 877f841e9a..dbc0e68c70 100644--- a/jarvis/ui/web/frontend/src/components/layout/DockRail.tsx+++ b/jarvis/ui/web/frontend/src/components/layout/DockRail.tsx@@ -32,7 +32,7 @@ import { useT } from "@/i18n";* icons back to a plain list. The list is the sidebar's own `NAV_GROUPS` — one* source, so a section added there appears here without anyone remembering to* add it twice (AP-4). The attention signals are shared too: a provider error- * lights API Keys red, a plugin that needs a reconnect lights Skills amber, and+ * lights API Keys red, a plugin that needs a reconnect lights Plugins amber, and* clicking Skills while a plugin needs attention lands on the Plugins tab, the* same shortcut the expanded sidebar takes.*@@ -222,7 +222,7 @@ export function DockRail({ className }: { className?: string }) {const hoveredHint =hoveredItem?.id === "apikeys" && apikeysError? t("sidebar.apikeys_alert")- : hoveredItem?.id === "skills" && pluginsNeedReconnect+ : hoveredItem?.id === "plugins" && pluginsNeedReconnect? pluginWarnHint: null;@@ -252,15 +252,12 @@ export function DockRail({ className }: { className?: string }) {live={item.id === "chats" && conversations.length > 0}alert={item.id === "apikeys" && apikeysError}alertTitle={t("sidebar.apikeys_alert")}- warn={item.id === "skills" && pluginsNeedReconnect}+ warn={item.id === "plugins" && pluginsNeedReconnect}warnTitle={pluginWarnHint}groupBreak={groupBreaks.has(i)}- // A plugin problem sends the Skills icon straight into the- // Plugins tab (where the banner + jump button are), so one click- // lands on the fix instead of the default Skills tab.onSelect={() =>setActiveSection(- item.id === "skills" && pluginsNeedReconnect ? "plugins" : item.id,+ item.id,)}onFocus={() => setHoveredSlot(i)}diff --git a/jarvis/ui/web/frontend/src/components/layout/MainView.plugins.test.tsx b/jarvis/ui/web/frontend/src/components/layout/MainView.plugins.test.tsxindex cf922695b6..6fb27a5a9c 100644--- a/jarvis/ui/web/frontend/src/components/layout/MainView.plugins.test.tsx+++ b/jarvis/ui/web/frontend/src/components/layout/MainView.plugins.test.tsx@@ -29,21 +29,30 @@ it("opens a bounded dialog while preserving the current draft and restores thatexpect((screen.getByLabelText("Unsent message") as HTMLInputElement).value).toBe("Keep this draft");});-it("does not replace Skills behind the dialog when the shared navigation state changes", async () => {- useEventStore.setState({ activeSection: "skills" });+it("routes Skills and MCPs into the same dialog and keeps the original background", async () => {render(<MainView />);- const search = await screen.findByLabelText("Skill search");- fireEvent.change(search, { target: { value: "remembered search" } });- act(() => useEventStore.getState().setActiveSection("plugins"));- await screen.findByRole("dialog");- expect(screen.getByLabelText("Skill search")).toBe(search);+ const draft = screen.getByLabelText("Unsent message");+ draft.focus();+ act(() => useEventStore.getState().setActiveSection("skills"));+ await screen.findByLabelText("Skill search");+ const dialog = screen.getByRole("dialog");+ expect(screen.getByRole("tab", { name: "Skills" }).getAttribute("aria-selected")).toBe("true");+ act(() => useEventStore.getState().setActiveSection("mcps"));+ await screen.findByText("MCP content");+ expect(screen.getByRole("dialog")).toBe(dialog);+ expect(screen.getByRole("tab", { name: "MCPs" }).getAttribute("aria-selected")).toBe("true");+ expect(screen.getAllByRole("tab").map((tab) => tab.textContent)).toEqual(["Plugins", "MCPs", "Skills"]);+ fireEvent.mouseDown(screen.getByRole("tab", { name: "Plugins" }), { button: 0, ctrlKey: false });+ await screen.findByText("Catalog true");+ expect(useEventStore.getState().activeSection).toBe("plugins");+ expect(screen.getByLabelText("Unsent message")).toBe(draft);fireEvent.keyDown(document, { key: "Escape" });- await waitFor(() => expect(useEventStore.getState().activeSection).toBe("skills"));- expect((screen.getByLabelText("Skill search") as HTMLInputElement).value).toBe("remembered search");+ await waitFor(() => expect(useEventStore.getState().activeSection).toBe("chats"));+ await waitFor(() => expect(document.activeElement).toBe(draft));});-it("provides a home background and a working close action for direct plugin navigation", async () => {- useEventStore.setState({ activeSection: "plugins" });+it.each(["plugins", "mcps", "skills"] as const)("provides a home background and close action for direct %s navigation", async (activeSection) => {+ useEventStore.setState({ activeSection });render(<MainView />);await screen.findByRole("dialog");fireEvent.click(screen.getByRole("button", { name: "Close" }));diff --git a/jarvis/ui/web/frontend/src/components/layout/MainView.tsx b/jarvis/ui/web/frontend/src/components/layout/MainView.tsxindex d15254de1c..5a3c84ee1a 100644--- a/jarvis/ui/web/frontend/src/components/layout/MainView.tsx+++ b/jarvis/ui/web/frontend/src/components/layout/MainView.tsx@@ -100,10 +100,11 @@ const ApiKeysView = lazyView(() =>const LocalModelsView = lazyView(() =>import("@/views/LocalModelsView").then((m) => ({ default: m.LocalModelsView })),);-const ExtensionsView = lazyPropView<{ area?: "skills" | "plugins" | "mcps" }>(() =>- import("@/views/ExtensionsView").then((m) => ({ default: m.ExtensionsView })),-);-const PluginsDialog = lazyPropView<{ onClose: () => void }>(() =>+type PluginArea = "plugins" | "mcps" | "skills";+const isPluginArea = (section: string): section is PluginArea =>+ section === "plugins" || section === "mcps" || section === "skills";++const PluginsDialog = lazyPropView<{ onClose: () => void; area: PluginArea; onAreaChange: (area: PluginArea) => void }>(() =>import("@/views/PluginsDialog").then((m) => ({ default: m.PluginsDialog })),);// The prop type is named rather than inferred: inferring it from the loader's@@ -414,10 +415,10 @@ export function MainView() {const solo = useEventStore((s) => s.solo);const detachedViews = useEventStore((s) => s.detachedViews);const [backgroundSection, setBackgroundSection] = useState(- active === "plugins" ? "chats" : active,+ isPluginArea(active) ? "chats" : active,);- if (active !== "plugins" && backgroundSection !== active) setBackgroundSection(active);- const displayed = active === "plugins" ? backgroundSection : active;+ if (!isPluginArea(active) && backgroundSection !== active) setBackgroundSection(active);+ const displayed = isPluginArea(active) ? backgroundSection : active;useIdleViewPrefetch();@@ -445,7 +446,7 @@ export function MainView() {if (codingDetached) setStickyMounted(false);}, [codingDetached]);- if (codingDetached && (CODING_SECTION_IDS as readonly string[]).includes(displayed) && active !== "plugins") {+ if (codingDetached && (CODING_SECTION_IDS as readonly string[]).includes(displayed) && !isPluginArea(active)) {return <DetachedViewPlaceholder view={displayed} />;}@@ -493,10 +494,10 @@ export function MainView() {</Suspense></ViewErrorBoundary>)}- {active === "plugins" && (+ {isPluginArea(active) && (<ViewErrorBoundary viewName="plugins" resetKey="plugins" onRecover={() => setActive(backgroundSection)}><Suspense fallback={null}>- <PluginsDialog onClose={() => setActive(backgroundSection)} />+ <PluginsDialog area={active} onAreaChange={setActive} onClose={() => setActive(backgroundSection)} /></Suspense></ViewErrorBoundary>)}@@ -510,12 +511,6 @@ function SwitchOnActiveSection({ active }: { active: string }) {return <ChatsSurface />;case "agents":return <SocietyView />;- // Skills + Plugins + MCPs are merged behind the "Skills & Tools" entry with- // an in-view tab switcher; the active id doubles as the tab state.- case "skills":- case "plugins":- case "mcps":- return <ExtensionsView area={active} />;// CLIs list + CLI Test Hub are merged behind the "CLIs" entry.case "clis":case "cli-test-hub":diff --git a/jarvis/ui/web/frontend/src/components/layout/Sidebar.test.tsx b/jarvis/ui/web/frontend/src/components/layout/Sidebar.test.tsxindex 273ed4f588..d2e06c3600 100644--- a/jarvis/ui/web/frontend/src/components/layout/Sidebar.test.tsx+++ b/jarvis/ui/web/frontend/src/components/layout/Sidebar.test.tsx@@ -451,15 +451,15 @@ describe("Sidebar plugin reconnect indicator", () => {pluginAttentionMock.needsReconnect = false;});- test("shows an amber dot on Skills & Tools when a plugin needs reconnect", () => {+ test("shows an amber dot on Plugins, MCPs & Skills when a plugin needs reconnect", () => {// A revoked / expired plugin must be visible app-wide, not only on the// Plugins page — the sidebar carries an amber dot on the row that fronts- // Plugins ("Skills & Tools", id "skills").+ // Plugins ("Plugins, MCPs & Skills", id "plugins").pluginAttentionMock.needsReconnect = true;renderSidebar();- expect(screen.getByTestId("nav-warn-skills")).toBeTruthy();+ expect(screen.getByTestId("nav-warn-plugins")).toBeTruthy();});test("no amber dot when every plugin is healthy", () => {@@ -467,7 +467,7 @@ describe("Sidebar plugin reconnect indicator", () => {renderSidebar();- expect(screen.queryByTestId("nav-warn-skills")).toBeNull();+ expect(screen.queryByTestId("nav-warn-plugins")).toBeNull();});});diff --git a/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx b/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsxindex eb281f1315..ff75caa1f9 100644--- a/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx+++ b/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx@@ -721,7 +721,7 @@ export function Sidebar({alert={item.id === "apikeys" ? apikeysHasError : false}alertTitle={t("sidebar.apikeys_alert")}warn={- item.id === "skills"+ item.id === "plugins"? pluginsNeedReconnect: item.id === "local-models"? localModelsNeedAttention@@ -732,13 +732,10 @@ export function Sidebar({? localModelsHealth?.detail || localModelsHealth?.reason || undefined: pluginWarnTitle}- // A plugin problem sends the "Skills & Tools" row straight into- // the Plugins tab (where the banner + jump button are), so one- // click lands on the fix instead of the default Skills tab.onClick={() => {setSectionsShown(false);setActive(- item.id === "skills" && pluginsNeedReconnect ? "plugins" : item.id,+ item.id,);}}>diff --git a/jarvis/ui/web/frontend/src/components/layout/navGroups.ts b/jarvis/ui/web/frontend/src/components/layout/navGroups.tsindex badc9c7300..9e9d6f7bc1 100644--- a/jarvis/ui/web/frontend/src/components/layout/navGroups.ts+++ b/jarvis/ui/web/frontend/src/components/layout/navGroups.ts@@ -125,11 +125,10 @@ export const NAV_GROUPS: NavItem[][] = [// 1) Workspace — what the user builds with and reads back.[{ id: "agents", labelKey: "nav.agents", icon: Users },- // Skills & Plugins — Skills + Plugins + MCPs behind one tab switch. The id- // "skills" is the default landing (Skills tab); matchIds keeps the row- // highlighted for any of the fronted sections.+ // The compact catalog opens on Plugins; direct section navigation selects+ // its corresponding tab and keeps this shared row highlighted.{- id: "skills",+ id: "plugins",labelKey: "nav.extensions",icon: Boxes,matchIds: ["skills", "plugins", "mcps"],diff --git a/jarvis/ui/web/frontend/src/i18n/locales/de.json b/jarvis/ui/web/frontend/src/i18n/locales/de.jsonindex 1f286a4e9c..e014d39e4c 100644--- a/jarvis/ui/web/frontend/src/i18n/locales/de.json+++ b/jarvis/ui/web/frontend/src/i18n/locales/de.json@@ -75,7 +75,7 @@"chat_workspace": "Chat","chats": "Chats","agents": "Agenten",- "extensions": "Skills, Plugins & MCPs",+ "extensions": "Plugins, MCPs & Skills","skills": "Skills","plugins": "Plugins","docs": "Docs",@@ -502,7 +502,7 @@"realtime_label": "Realtime","realtime_tooltip": "Realtime-Provider wechseln","apikeys_alert": "Ein Anbieter ist eingerichtet, funktioniert aber nicht — zum Beheben API Keys öffnen",- "plugins_reconnect_alert": "Eine Plugin-Verbindung ist abgelaufen — zum Neuverbinden Skills & Tools öffnen",+ "plugins_reconnect_alert": "Eine Plugin-Verbindung ist abgelaufen — zum Neuverbinden Plugins, MCPs & Skills öffnen","realtime_start": "Realtime-Sprache starten","realtime_stop": "Realtime-Sprache beenden","realtime_retry": "Realtime-Sprache erneut versuchen",@@ -1051,7 +1051,7 @@"custom": "Eigene","plugins_label": "Plugins","plugins_loading": "Lade Plugins…",- "plugins_empty": "Keine verbundenen Plugins. Verbinde zuerst welche unter Skills, Plugins & MCPs.",+ "plugins_empty": "Keine verbundenen Plugins. Verbinde zuerst welche unter Plugins, MCPs & Skills.","scope_read": "Lesen","scope_write": "Schreiben","scope_full": "Vollzugriff",diff --git a/jarvis/ui/web/frontend/src/i18n/locales/en.json b/jarvis/ui/web/frontend/src/i18n/locales/en.jsonindex f923c59c8e..8bd85248a8 100644--- a/jarvis/ui/web/frontend/src/i18n/locales/en.json+++ b/jarvis/ui/web/frontend/src/i18n/locales/en.json@@ -75,7 +75,7 @@"chat_workspace": "Chat","chats": "Chats","agents": "Agents",- "extensions": "Skills, Plugins & MCPs",+ "extensions": "Plugins, MCPs & Skills","skills": "Skills","plugins": "Plugins","docs": "Docs",@@ -502,7 +502,7 @@"realtime_label": "Realtime","realtime_tooltip": "Switch Realtime provider","apikeys_alert": "A provider is set up but not working — open API Keys to fix it",- "plugins_reconnect_alert": "A plugin connection expired — open Skills & Tools to reconnect it",+ "plugins_reconnect_alert": "A plugin connection expired — open Plugins, MCPs & Skills to reconnect it","realtime_start": "Start Realtime Voice","realtime_stop": "Stop Realtime Voice","realtime_retry": "Retry Realtime Voice",@@ -1051,7 +1051,7 @@"custom": "Custom","plugins_label": "Plugins","plugins_loading": "Loading plugins…",- "plugins_empty": "No connected plugins. Connect some under Skills, Plugins & MCPs first.",+ "plugins_empty": "No connected plugins. Connect some under Plugins, MCPs & Skills first.","scope_read": "Read","scope_write": "Write","scope_full": "Full",diff --git a/jarvis/ui/web/frontend/src/i18n/locales/es.json b/jarvis/ui/web/frontend/src/i18n/locales/es.jsonindex a29b71cb73..77e06dbdef 100644--- a/jarvis/ui/web/frontend/src/i18n/locales/es.json+++ b/jarvis/ui/web/frontend/src/i18n/locales/es.json@@ -75,7 +75,7 @@"chat_workspace": "Chat","chats": "Chats","agents": "Agentes",- "extensions": "Skills, Plugins & MCPs",+ "extensions": "Plugins, MCPs & Skills","skills": "Habilidades","plugins": "Plugins","docs": "Documentos",@@ -502,7 +502,7 @@"realtime_label": "Tiempo real","realtime_tooltip": "Cambiar proveedor de tiempo real","apikeys_alert": "Un proveedor está configurado pero no funciona — abre API Keys para solucionarlo",- "plugins_reconnect_alert": "Una conexión de plugin expiró — abre Skills & Tools para volver a conectarla",+ "plugins_reconnect_alert": "Una conexión de plugin expiró — abre Plugins, MCPs & Skills para volver a conectarla","realtime_start": "Iniciar Voz en Tiempo Real","realtime_stop": "Detener Voz en Tiempo Real","realtime_retry": "Reintentar Voz en Tiempo Real",@@ -1051,7 +1051,7 @@"custom": "Personalizada","plugins_label": "Plugins","plugins_loading": "Cargando plugins…",- "plugins_empty": "No hay plugins conectados. Conecta alguno en Skills, Plugins & MCPs primero.",+ "plugins_empty": "No hay plugins conectados. Conecta alguno en Plugins, MCPs & Skills primero.","scope_read": "Lectura","scope_write": "Escritura","scope_full": "Total",diff --git a/jarvis/ui/web/frontend/src/views/PluginsDialog.tsx b/jarvis/ui/web/frontend/src/views/PluginsDialog.tsxindex 796228f3a3..5ecbac95d9 100644--- a/jarvis/ui/web/frontend/src/views/PluginsDialog.tsx+++ b/jarvis/ui/web/frontend/src/views/PluginsDialog.tsx@@ -8,9 +8,16 @@ import { McpsView } from "@/views/McpsView";import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";/** The catalog floats over the user's current work; nested setup stays inside. */-export function PluginsDialog({ onClose }: { onClose: () => void }) {+export type PluginArea = "plugins" | "mcps" | "skills";++export function PluginsDialog({ onClose, area = "plugins", onAreaChange }: {+ onClose: () => void;+ area?: PluginArea;+ onAreaChange?: (area: PluginArea) => void;+}) {const t = useT();const content = useRef<HTMLDivElement>(null);+ const opener = useRef(document.activeElement);return (<Dialog.Root open onOpenChange={(open) => { if (!open) onClose(); }}><Dialog.Portal>@@ -19,6 +26,20 @@ export function PluginsDialog({ onClose }: { onClose: () => void }) {data-testid="plugin-catalog-dialog"ref={content}aria-describedby={undefined}+ onCloseAutoFocus={(event) => {+ const previous = opener.current;+ const target = previous instanceof HTMLElement && previous.isConnected && previous !== document.body+ ? previous+ : document.querySelector<HTMLElement>('[data-testid="nav-row-plugins"]')+ ?? document.querySelector<HTMLElement>("main");+ if (!target) return;+ // This route-driven dialog has no Radix Trigger to restore focus to.+ event.preventDefault();+ const needsTabIndex = target.tagName === "MAIN" && !target.hasAttribute("tabindex");+ if (needsTabIndex) target.setAttribute("tabindex", "-1");+ target.focus({ preventScroll: true });+ if (needsTabIndex) target.removeAttribute("tabindex");+ }}onInteractOutside={(event) => {if (content.current?.querySelector('[aria-modal="true"]')) event.preventDefault();}}@@ -34,11 +55,11 @@ export function PluginsDialog({ onClose }: { onClose: () => void }) {<X className="h-4 w-4" aria-hidden /></button></Dialog.Close>- <Tabs defaultValue="plugins" className="flex min-h-0 flex-1 flex-col">+ <Tabs defaultValue={area} value={onAreaChange ? area : undefined} onValueChange={(value) => onAreaChange?.(value as PluginArea)} className="flex min-h-0 flex-1 flex-col"><TabsList aria-label={t("nav.extensions")} className="mx-6 mb-2 mt-4 w-fit shrink-0 self-start">- <TabsTrigger value="skills">{t("nav.skills")}</TabsTrigger><TabsTrigger value="plugins">{t("nav.plugins")}</TabsTrigger><TabsTrigger value="mcps">{t("nav.mcps")}</TabsTrigger>+ <TabsTrigger value="skills">{t("nav.skills")}</TabsTrigger></TabsList><TabsContent value="skills" className="mt-0 min-h-0 flex-1 overflow-hidden"><SkillsView /></TabsContent><TabsContent value="plugins" className="mt-0 min-h-0 flex-1 overflow-hidden"><PluginsView inDialog /></TabsContent>diff --git a/tests/unit/marketplace/test_catalog_seed.py b/tests/unit/marketplace/test_catalog_seed.pyindex a5a826a2da..a9a3f5abef 100644--- a/tests/unit/marketplace/test_catalog_seed.py+++ b/tests/unit/marketplace/test_catalog_seed.py@@ -99,6 +99,77 @@ def test_override_keeps_connection_details_but_not_presentation(monkeypatch, tmpclear_cache()+def test_slack_scopes_cover_channel_listing_and_canvas_drafts() -> None:+ slack = _seed().by_id("slack")+ assert slack is not None+ assert {+ "channels:read",+ "groups:read",+ "im:read",+ "mpim:read",+ "canvases:read",+ "canvases:write",+ } <= set(slack.auth.scopes)++[email protected]("custom", [None, "scopes", "client", "redirect", "server"])+def test_slack_scope_upgrade_preserves_custom_auth_and_disk(monkeypatch, tmp_path, custom) -> None:+ clear_cache()+ seed = json.loads(catalog_data._PACKAGE_SEED_PATH.read_text(encoding="utf-8"))+ plugin = next(item for item in seed["plugins"] if item["id"] == "slack")+ plugin["auth"] = {+ "mode": "oauth_pkce_loopback",+ "authorization_url": "https://slack.com/oauth/v2/authorize",+ "token_url": "https://slack.com/api/oauth.v2.access",+ "revocation_url": "https://slack.com/api/auth.revoke",+ "client_id": "REPLACE_WITH_JARVIS_SLACK_APP_CLIENT_ID",+ "callback_port": 3118,+ "scopes": [+ "chat:write",+ "users:read",+ "users:read.email",+ "search:read.public",+ "search:read.private",+ "search:read.im",+ "search:read.mpim",+ "channels:history",+ "groups:history",+ "im:history",+ "mpim:history",+ ],+ "user_scopes_only": True,+ "refresh_supported": True,+ "refresh_token_ttl_days": 30,+ }+ if custom == "scopes":+ plugin["auth"]["scopes"] = ["chat:write"]+ elif custom == "client":+ plugin["auth"]["client_id"] = "custom-client"+ elif custom == "redirect":+ plugin["auth"]["callback_port"] = 3999+ elif custom == "server":+ plugin["mcp_server"]["url"] = "https://custom.example.test/mcp"+ override = tmp_path / "plugin_catalog.json"+ content = json.dumps({"version": 1, "schema_version": "old", "plugins": [plugin]})+ override.write_text(content, encoding="utf-8")+ monkeypatch.setattr(catalog_data, "_DEFAULT_CATALOG_PATH", override)++ slack = load_catalog().by_id("slack")++ assert slack is not None+ if custom:+ from jarvis.marketplace.catalog import PluginCatalog++ expected = PluginCatalog.model_validate(json.loads(content)).by_id("slack")+ assert slack.auth == expected.auth+ assert slack.mcp_server == expected.mcp_server+ else:+ assert "canvases:write" in slack.auth.scopes+ assert "channels:read" in slack.auth.scopes+ assert override.read_text(encoding="utf-8") == content+ clear_cache()++def test_stale_override_still_receives_plugins_added_to_the_seed(monkeypatch, tmp_path) -> None:"""A new seed connector must reach installs that already have a data/ override.