Skip to content

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.

feat(computers): move Computers back into Settings, first under System

rubenluetke10-beep2f2c81154119
diff --git a/jarvis/ui/web/frontend/src/components/layout/MainView.tsx b/jarvis/ui/web/frontend/src/components/layout/MainView.tsx
index 29ce92fb8d..495f2f0d7c 100644
--- a/jarvis/ui/web/frontend/src/components/layout/MainView.tsx
+++ b/jarvis/ui/web/frontend/src/components/layout/MainView.tsx
@@ -85,10 +85,6 @@ function lazyPropView<P>(
// statically owns only its shell; every tab stays its own lazy chunk (see
// SettingsHubView), so this one import replaces the eleven per-view imports
// below without merging their chunks back together.
-// Computers: its own section (servers, VPS, local VMs), not a Settings tab.
-const ComputersView = lazyView(() =>
- import("@/views/ComputersView").then((m) => ({ default: m.ComputersView })),
-);
const SettingsHubView = lazyView(() =>
import("@/views/SettingsHubView").then((m) => ({ default: m.SettingsHubView })),
);
@@ -514,6 +510,7 @@ function SwitchOnActiveSection({ active }: { active: string }) {
case "telephony":
case "telephony-setup":
case "local-models":
+ case "computers":
case "wallpaper":
case "costs":
case "feedback":
@@ -537,8 +534,6 @@ function SwitchOnActiveSection({ active }: { active: string }) {
// place, installable without leaving the app.
case "marketplace":
return <MarketplaceView />;
- case "computers":
- return <ComputersView />;
// Deliberately nothing: the coding workspace is rendered by the STICKY
// branch in `MainView` above, which keeps it mounted across section
// changes. This switch is not rendered at all while one of those ids is
diff --git a/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx b/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx
index 127c5d3060..bd26df5883 100644
--- a/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx
+++ b/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx
@@ -342,7 +342,7 @@ export function Sidebar({
// retired "Jarvis Tools" folder used to be — it was the only entry hiding
// behind "Show more" that users reached for daily, while the tools folder
// duplicated exactly what "Show more" already lists.
- const primaryIds = ["chats", "agents", "dictation", "visualization", "agentic-ide", "computers", "plugins", "marketplace"];
+ const primaryIds = ["chats", "agents", "dictation", "visualization", "agentic-ide", "plugins", "marketplace"];
// The Settings hub owns its entries — they live in the hub's left
// navigation now, so "Show more" must not list them a second time. The set
// itself is named once in `navGroups` (`SETTINGS_HUB_IDS`).
@@ -526,7 +526,6 @@ export function Sidebar({
<ul className="space-y-1">
{renderRow(findItem("visualization"))}
{renderRow(findItem("agentic-ide"))}
- {renderRow(findItem("computers"))}
{renderRow({ ...findItem("plugins"), labelKey: "sidebar.extensions_label" })}
</ul>
<button type="button" onClick={() => { setMoreOpen(!moreOpen); }} aria-expanded={moreOpen}
diff --git a/jarvis/ui/web/frontend/src/components/layout/navGroups.ts b/jarvis/ui/web/frontend/src/components/layout/navGroups.ts
index f821d76627..7d859a7719 100644
--- a/jarvis/ui/web/frontend/src/components/layout/navGroups.ts
+++ b/jarvis/ui/web/frontend/src/components/layout/navGroups.ts
@@ -126,16 +126,6 @@ export const NAV_GROUPS: NavItem[][] = [
// 1) Workspace — what the user builds with and reads back.
[
{ id: "agents", labelKey: "nav.agents", icon: Users },
- // Computers: the servers and virtual machines the assistant and its agents
- // can work on besides this one — a rented VPS, a hosting-account import,
- // a local Multipass VM. Its own section, not a Settings tab: IDE sessions
- // and agents are placed ON these machines.
- {
- id: "computers",
- labelKey: "nav.computers",
- icon: Server,
- fallbackLabel: "Computers",
- },
// The compact catalog opens on Plugins; direct section navigation selects
// its corresponding tab and keeps this shared row highlighted.
{
@@ -210,6 +200,15 @@ export const NAV_GROUPS: NavItem[][] = [
// Telefonie" voice command lands on the "telephony" id. Settings likewise
// fronts the former "Taskbar" + "Languages" sections.
[
+ // Computers: the servers and virtual machines the assistant and its agents
+ // can work on besides this one (a rented VPS, a hosting-account import, a
+ // local VM). A Settings-hub entry, first under System.
+ {
+ id: "computers",
+ labelKey: "nav.computers",
+ icon: Server,
+ fallbackLabel: "Computers",
+ },
{
id: "apikeys",
labelKey: "nav.apikeys",
@@ -288,6 +287,7 @@ export const SETTINGS_HUB_IDS: readonly SectionId[] = [
"telephony",
"telephony-setup",
"local-models",
+ "computers",
"wallpaper",
"costs",
"feedback",
diff --git a/jarvis/ui/web/frontend/src/views/SettingsHubView.tsx b/jarvis/ui/web/frontend/src/views/SettingsHubView.tsx
index 0a39fc3339..558b442d2a 100644
--- a/jarvis/ui/web/frontend/src/views/SettingsHubView.tsx
+++ b/jarvis/ui/web/frontend/src/views/SettingsHubView.tsx
@@ -19,7 +19,7 @@ import { cn } from "@/lib/utils";
* section on the right:
*
* General: Settings, Profile, {name}.md, Contacts, Socials
- * System: API Keys, Local models, Wallpaper
+ * System: Computers, API Keys, Local models, Wallpaper
* Activity: Spend, Feedback
*
* Same merged-section pattern as VoiceHubView / ClisHubView: the active
@@ -71,6 +71,9 @@ const LocalModelsTab = lazy(() =>
default: m.LocalModelsView,
})),
);
+const ComputersTab = lazy(() =>
+ import("@/views/ComputersView").then((m) => ({ default: m.ComputersView })),
+);
const WallpaperTab = lazy(() =>
import("@/views/WallpaperView").then((m) => ({ default: m.WallpaperView })),
);
@@ -83,7 +86,7 @@ const FeedbackTab = lazy(() =>
})),
);
-/** The ten entries of the left navigation, in display order. */
+/** The eleven entries of the left navigation, in display order. */
type HubNavId =
| "settings"
| "profile"
@@ -92,6 +95,7 @@ type HubNavId =
| "socials"
| "apikeys"
| "local-models"
+ | "computers"
| "wallpaper"
| "costs"
| "feedback";
@@ -103,7 +107,7 @@ const HUB_NAV_GROUPS: readonly { labelKey: string; ids: readonly HubNavId[] }[]
},
{
labelKey: "settings_hub.group_system",
- ids: ["apikeys", "local-models", "wallpaper"],
+ ids: ["computers", "apikeys", "local-models", "wallpaper"],
},
{
labelKey: "settings_hub.group_activity",
@@ -120,6 +124,7 @@ const TAB_CONTENT: Record<HubNavId | "telephony-setup", LazyExoticComponent<Comp
apikeys: ApiKeysTab,
"telephony-setup": TelephonySetupTab,
"local-models": LocalModelsTab,
+ computers: ComputersTab,
wallpaper: WallpaperTab,
costs: CostsTab,
feedback: FeedbackTab,
@@ -147,6 +152,8 @@ function resolveHubTab(active: string): { content: HubNavId | "telephony-setup";
return { content: "telephony-setup", highlight: "apikeys" };
case "local-models":
return { content: "local-models", highlight: "local-models" };
+ case "computers":
+ return { content: "computers", highlight: "computers" };
case "wallpaper":
return { content: "wallpaper", highlight: "wallpaper" };
case "costs":
@@ -201,7 +208,7 @@ export function SettingsHubView() {
const matches = (item: NavItem) =>
needle === "" || resolveNavLabel(t, item).toLowerCase().includes(needle);
- // Ten entries — filtered inline; no memo needed at this size.
+ // Eleven entries — filtered inline; no memo needed at this size.
const visibleGroups = HUB_NAV_GROUPS.map((group) => ({
...group,
items: group.ids.map(findNavItem).filter(matches),