Skip to content

armgit / mso

Public Imported from GitHub
0

Browser-based graphical shell and control plane for a Linux server you own — real terminal, file manager, live metrics and BYOK AI in one mobile-first workspace. Next.js 16 · React 19 · node-pty · Tailwind v4 · shadcn/ui. Public alpha, self-hosted.

refactor: enforce one-way shell dependencies

Rahman7ae9773d7bb0
diff --git a/app/layout-graph.test.ts b/app/layout-graph.test.ts
index 10c44987..d2be7a06 100644
--- a/app/layout-graph.test.ts
+++ b/app/layout-graph.test.ts
@@ -3,7 +3,7 @@ import { dirname, join, resolve } from "node:path";
import { describe, expect, it } from "vitest";
// The root layout is inherited by EVERY route, including public pages that render
-// nothing but text. `@/features/os-shell` re-exports the whole appshell barrel —
+// nothing but text. `@/features/appshell` is the full generic shell barrel —
// window manager, 5 shells, 10 shell features — so a single static import of it
// anywhere in the root layout's graph puts the entire OS into the initial load of
// every page. That is exactly what `register-sw.tsx` did: /install shipped 330 KB
diff --git a/app/os-root.tsx b/app/os-root.tsx
index ad7729e7..99d29fad 100644
--- a/app/os-root.tsx
+++ b/app/os-root.tsx
@@ -1,16 +1,14 @@
"use client";
import { useMemo } from "react";
+import { AppShell, type AppDescriptor, type ShellManifest } from "@/features/appshell";
import {
- AppShell,
A11yCommands,
TOPSIDE_BRAND,
TOPSIDE_FEATURES,
TOPSIDE_PERSIST_KEY,
BUILTIN_APPS,
topsideCapabilities,
- type AppDescriptor,
- type ShellManifest,
} from "@/features/os-shell";
import { AppearanceProvider } from "@/lib/appearance";
import { QuicklinksProvider } from "@/lib/quicklinks";
diff --git a/app/register-sw.tsx b/app/register-sw.tsx
index d5864cbe..0e4176cd 100644
--- a/app/register-sw.tsx
+++ b/app/register-sw.tsx
@@ -50,7 +50,7 @@ async function recover() {
// caches and activates the waiting SW (SKIP_WAITING → controllerchange).
//
// `toast` is imported HERE, not at module scope. RegisterSW sits in the ROOT
-// layout, and `@/features/os-shell` re-exports the whole appshell barrel — so a
+// layout, and `@/features/appshell` re-exports the whole appshell barrel — so a
// top-level import put the entire OS shell (window manager, 5 shells, 10 shell
// features) into the static graph of every route, including public pages that
// render nothing but text. Deferring it to the moment an update actually exists
@@ -60,7 +60,7 @@ async function promptUpdate(reg: ServiceWorkerRegistration) {
const waiting = reg.waiting;
if (!waiting || !navigator.serviceWorker.controller) return;
let reloading = false;
- const { toast } = await import("@/features/os-shell");
+ const { toast } = await import("@/features/appshell");
toast("Versi baru tersedia.", {
action: {
label: "Reload",
diff --git a/architecture.boundaries.json b/architecture.boundaries.json
index d827fb6a..6b89d1d2 100644
--- a/architecture.boundaries.json
+++ b/architecture.boundaries.json
@@ -1,12 +1,12 @@
{
"schemaVersion": 1,
"ratchets": {
- "structuralCycles": 46,
- "crossDomainCycles": 21,
+ "structuralCycles": 0,
+ "crossDomainCycles": 0,
"filesOver220": 55,
"filesOver500": 2,
"serverFrontendImports": 6,
- "appshellSelfBarrelImports": 23,
+ "appshellSelfBarrelImports": 0,
"nonMcpMcpImports": 0,
"crossProtocolCycles": 0
},
diff --git a/frontend/slices/app-store/app.tsx b/frontend/slices/app-store/app.tsx
index 50d6602b..ebb8ee28 100644
--- a/frontend/slices/app-store/app.tsx
+++ b/frontend/slices/app-store/app.tsx
@@ -4,8 +4,8 @@ import { useMemo, useState } from "react";
import { Search, Sparkles, Store } from "lucide-react";
import { ScrollArea } from "@/components/ui/scroll-area";
import { Input } from "@/components/ui/input";
-import { AppFrame, useContainer, useActiveShell, useContextZone, openWindow } from "@/features/os-shell";
-import type { MenuItem } from "@/features/os-shell";
+import { AppFrame, useContainer, useActiveShell, useContextZone, openWindow } from "@/features/appshell";
+import type { MenuItem } from "@/features/appshell";
import { UninstallConfirm } from "./components/uninstall-confirm";
import { usePublishInspector } from "./lib/host";
import {
diff --git a/frontend/slices/app-store/components/app-console.tsx b/frontend/slices/app-store/components/app-console.tsx
index c4175405..c156d5bf 100644
--- a/frontend/slices/app-store/components/app-console.tsx
+++ b/frontend/slices/app-store/components/app-console.tsx
@@ -5,7 +5,7 @@ import { Loader2, Play, Trash2 } from "lucide-react";
import { useOsApi } from "../lib/host";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
-import type { AppManifest } from "./runtime-app";
+import type { AppManifest } from "./runtime-app-types";
type OutLine = { kind: "out" | "err" | "exit" | "sys"; text: string };
diff --git a/frontend/slices/app-store/components/runtime-app-types.ts b/frontend/slices/app-store/components/runtime-app-types.ts
new file mode 100644
index 00000000..35f9c29c
--- /dev/null
+++ b/frontend/slices/app-store/components/runtime-app-types.ts
@@ -0,0 +1,8 @@
+// Data contract shared by the runtime host and its console. Keeping it separate
+// prevents the two rendering components from importing each other for a type.
+export type AppManifest = {
+ title: string;
+ runtime: string;
+ entry: string;
+ source: string;
+};
diff --git a/frontend/slices/app-store/components/runtime-app.tsx b/frontend/slices/app-store/components/runtime-app.tsx
index 33d514ec..98f322b1 100644
--- a/frontend/slices/app-store/components/runtime-app.tsx
+++ b/frontend/slices/app-store/components/runtime-app.tsx
@@ -3,15 +3,9 @@
import { Boxes, ExternalLink } from "lucide-react";
import type { AppProps } from "../lib/host";
import { AppConsole } from "./app-console";
+import type { AppManifest } from "./runtime-app-types";
-// Manifest of a dynamic (created/installed) app — baked into the descriptor by
-// useInstalledApps, or passed via window payload.
-export type AppManifest = {
- title: string;
- runtime: string;
- entry: string;
- source: string;
-};
+export type { AppManifest } from "./runtime-app-types";
const isUrl = (s: string) => /^https?:\/\//i.test(s);
diff --git a/frontend/slices/app-store/components/store-app-card.tsx b/frontend/slices/app-store/components/store-app-card.tsx
index f48a1da1..38f2cbeb 100644
--- a/frontend/slices/app-store/components/store-app-card.tsx
+++ b/frontend/slices/app-store/components/store-app-card.tsx
@@ -8,8 +8,8 @@ import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import { glyphIcon } from "../lib/glyph";
import type { CatalogApp } from "../lib/store-catalog";
-import { useContextZone, openWindow } from "@/features/os-shell";
-import type { MenuItem } from "@/features/os-shell";
+import { useContextZone, openWindow } from "@/features/appshell";
+import type { MenuItem } from "@/features/appshell";
// One app row in the store grid. Icon comes from the shared glyph map so it
// matches the dock/launchpad icon once installed. The Get button flips the
diff --git a/frontend/slices/app-store/components/store-sidebar.tsx b/frontend/slices/app-store/components/store-sidebar.tsx
index bb3010d0..23556d80 100644
--- a/frontend/slices/app-store/components/store-sidebar.tsx
+++ b/frontend/slices/app-store/components/store-sidebar.tsx
@@ -2,7 +2,7 @@
import { Compass, LayoutGrid, SlidersHorizontal, type LucideIcon } from "lucide-react";
import { Button } from "@/components/ui/button";
-import { TouchList } from "@/features/os-shell";
+import { TouchList } from "@/features/appshell";
import { cn } from "@/lib/utils";
import { glyphIcon } from "../lib/glyph";
import { CATEGORIES, type StoreCategory } from "../lib/store-catalog";
diff --git a/frontend/slices/app-store/components/uninstall-confirm.tsx b/frontend/slices/app-store/components/uninstall-confirm.tsx
index 33299fe4..7b29c55f 100644
--- a/frontend/slices/app-store/components/uninstall-confirm.tsx
+++ b/frontend/slices/app-store/components/uninstall-confirm.tsx
@@ -2,7 +2,7 @@
import { Trash2 } from "lucide-react";
import { Button } from "@/components/ui/button";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
// Shared destructive confirm for both the curated app catalog and the built-in
// "Apps"/"Features" sections. Touch users get no hover affordance, so tapping
diff --git a/frontend/slices/app-store/index.ts b/frontend/slices/app-store/index.ts
index 13a84976..18b5fb73 100644
--- a/frontend/slices/app-store/index.ts
+++ b/frontend/slices/app-store/index.ts
@@ -1,5 +1,5 @@
import { Store } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: the only thing the app layer imports. Exposes the app descriptor;
// the component itself is lazy-loaded via `load` so its bundle is deferred.
diff --git a/frontend/slices/app-store/lib/host.ts b/frontend/slices/app-store/lib/host.ts
index 220428a6..42a49b53 100644
--- a/frontend/slices/app-store/lib/host.ts
+++ b/frontend/slices/app-store/lib/host.ts
@@ -5,6 +5,6 @@
// copy replaces this file with a self-contained version (demo exec +
// no-op inspector) and bundles the Create-App flow in-slice.
-export type { AppProps, AppDescriptor } from "@/features/os-shell";
-export { usePublishInspector } from "@/features/os-shell";
-export { useOsApi } from "@/features/os-shell";
+export type { AppProps, AppDescriptor } from "@/features/appshell";
+export { usePublishInspector } from "@/features/appshell";
+export { useOsApi } from "@/features/appshell";
diff --git a/frontend/slices/appshell/features/clipboard/components/clipboard-overlay.tsx b/frontend/slices/appshell/features/clipboard/components/clipboard-overlay.tsx
index 927287ea..15395b3e 100644
--- a/frontend/slices/appshell/features/clipboard/components/clipboard-overlay.tsx
+++ b/frontend/slices/appshell/features/clipboard/components/clipboard-overlay.tsx
@@ -7,7 +7,6 @@ import { Button } from "@/components/ui/button";
import {
clearClips,
copyClip,
- inEditable,
removeClip,
setClipboardOpen,
startClipboardCapture,
@@ -15,7 +14,8 @@ import {
togglePinClip,
useClipboardOpen,
useClips,
-} from "@/features/appshell";
+} from "../../../lib/clipboard";
+import { inEditable } from "../../../lib/use-focused-hotkey";
// ⌘⇧V clipboard history — pinned entries stick, click copies back to the
// system clipboard. Capture (document copy/cut) starts with this feature.
diff --git a/frontend/slices/appshell/features/clipboard/index.ts b/frontend/slices/appshell/features/clipboard/index.ts
index ab4ce6c9..e429937f 100644
--- a/frontend/slices/appshell/features/clipboard/index.ts
+++ b/frontend/slices/appshell/features/clipboard/index.ts
@@ -1,4 +1,4 @@
-import { defineFeature } from "@/features/appshell";
+import { defineFeature } from "../../registry/types";
import { ClipboardOverlay } from "./components/clipboard-overlay";
// Clipboard manager — ⌘⇧V history overlay over lib/clipboard (capture starts
diff --git a/frontend/slices/appshell/features/control-center/components/control-center-tiles.tsx b/frontend/slices/appshell/features/control-center/components/control-center-tiles.tsx
index 2cfce942..ecbb8bad 100644
--- a/frontend/slices/appshell/features/control-center/components/control-center-tiles.tsx
+++ b/frontend/slices/appshell/features/control-center/components/control-center-tiles.tsx
@@ -3,16 +3,10 @@
import { type LucideIcon, Bell, Moon, MoonStar, Sun, Server, Cloud, Sparkles, Layers, Search } from "lucide-react";
import { Button } from "@/components/ui/button";
import { cn } from "@/lib/utils";
-import {
- useWindowOrder,
- closeAll,
- toggleInspector,
- toggleSpotlight,
- toggleFocusMode,
- useFocusMode,
- useShellAppearance,
- useServerToggle,
-} from "@/features/appshell";
+import { useWindowOrder } from "../../../hooks/use-shell";
+import { closeAll, toggleInspector, toggleSpotlight } from "../../../lib/store";
+import { toggleFocusMode, useFocusMode } from "../../../lib/focus-mode";
+import { useShellAppearance, useServerToggle } from "../../../registry/capabilities";
// The six REAL toggles shared by the mobile pull-down Sheet CC and the desktop
// menu-bar popover CC — one source of truth. Only real state: appearance, the
diff --git a/frontend/slices/appshell/features/control-center/components/control-center.tsx b/frontend/slices/appshell/features/control-center/components/control-center.tsx
index 7edae125..eca5312e 100644
--- a/frontend/slices/appshell/features/control-center/components/control-center.tsx
+++ b/frontend/slices/appshell/features/control-center/components/control-center.tsx
@@ -2,7 +2,8 @@
import { Sheet, SheetContent, SheetTitle, SheetDescription } from "@/components/ui/sheet";
import { cn } from "@/lib/utils";
-import { useShellDesign, useShellUI } from "@/features/appshell";
+import { useShellDesign } from "../../../design";
+import { useShellUI } from "../../../registry/shell-ui";
import { ControlCenterTiles } from "./control-center-tiles";
// One quick-settings behavior model, shell-native presentation. iOS uses a glass
diff --git a/frontend/slices/appshell/features/control-center/index.ts b/frontend/slices/appshell/features/control-center/index.ts
index 46a25049..fc19b273 100644
--- a/frontend/slices/appshell/features/control-center/index.ts
+++ b/frontend/slices/appshell/features/control-center/index.ts
@@ -1,4 +1,4 @@
-import { defineFeature } from "@/features/appshell";
+import { defineFeature } from "../../registry/types";
import { ControlCenter } from "./components/control-center";
import { ControlCenterDesktop } from "./components/control-center-desktop";
diff --git a/frontend/slices/appshell/features/force-quit/force-quit.tsx b/frontend/slices/appshell/features/force-quit/force-quit.tsx
index 24ab08c7..8341977b 100644
--- a/frontend/slices/appshell/features/force-quit/force-quit.tsx
+++ b/frontend/slices/appshell/features/force-quit/force-quit.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState, useSyncExternalStore } from "react";
import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { cn } from "@/lib/utils";
-import { registerCommands } from "@/features/appshell";
+import { registerCommands } from "../../lib/commands";
import { useWindow, useWindowOrder } from "../../hooks/use-shell";
import { useApps } from "../../lib/registry";
import { closeWindow } from "../../lib/store";
diff --git a/frontend/slices/appshell/features/inspector/components/inspector.tsx b/frontend/slices/appshell/features/inspector/components/inspector.tsx
index 5f518baa..5122703b 100644
--- a/frontend/slices/appshell/features/inspector/components/inspector.tsx
+++ b/frontend/slices/appshell/features/inspector/components/inspector.tsx
@@ -5,13 +5,10 @@ import { PanelRightClose, Sparkles, SlidersHorizontal } from "lucide-react";
import { ScrollArea } from "@/components/ui/scroll-area";
import { Button } from "@/components/ui/button";
import { cn } from "@/lib/utils";
-import {
- useFocusedApp,
- useInspectorOpen,
- setInspectorOpen,
- useInspectorInfo,
- useApp,
-} from "@/features/appshell";
+import { useFocusedApp, useInspectorOpen } from "../../../hooks/use-shell";
+import { setInspectorOpen } from "../../../lib/store";
+import { useInspectorInfo } from "../../../lib/inspector";
+import { useApp } from "../../../lib/registry";
import { AlfaThread } from "../../../components/alfa-thread";
type Tab = "props" | "ai";
diff --git a/frontend/slices/appshell/features/inspector/index.ts b/frontend/slices/appshell/features/inspector/index.ts
index 22a18bb8..0d183b80 100644
--- a/frontend/slices/appshell/features/inspector/index.ts
+++ b/frontend/slices/appshell/features/inspector/index.ts
@@ -1,4 +1,4 @@
-import { defineFeature } from "@/features/appshell";
+import { defineFeature } from "../../registry/types";
import { Inspector } from "./components/inspector";
import { AlfaSheet } from "./components/alfa-sheet";
diff --git a/frontend/slices/appshell/features/lock-screen/components/lock-screen.tsx b/frontend/slices/appshell/features/lock-screen/components/lock-screen.tsx
index 385fb198..1863fa99 100644
--- a/frontend/slices/appshell/features/lock-screen/components/lock-screen.tsx
+++ b/frontend/slices/appshell/features/lock-screen/components/lock-screen.tsx
@@ -2,7 +2,7 @@
import { useEffect, useState } from "react";
import { Lock } from "lucide-react";
-import { autoLockMinutes, lock, requestUnlock, useLocked } from "@/features/appshell";
+import { autoLockMinutes, lock, requestUnlock, useLocked } from "../../../lib/lock";
// Fullscreen privacy curtain: blurred backdrop, big clock, click/key unlocks
// (through the consumer guard when one is injected). Owns the idle timer.
diff --git a/frontend/slices/appshell/features/lock-screen/index.ts b/frontend/slices/appshell/features/lock-screen/index.ts
index 40c5b5f5..93a03381 100644
--- a/frontend/slices/appshell/features/lock-screen/index.ts
+++ b/frontend/slices/appshell/features/lock-screen/index.ts
@@ -1,4 +1,4 @@
-import { defineFeature } from "@/features/appshell";
+import { defineFeature } from "../../registry/types";
import { LockScreen } from "./components/lock-screen";
// Lock screen — privacy curtain overlay + idle auto-lock (lib/lock).
diff --git a/frontend/slices/appshell/features/notifications/components/dynamic-island.tsx b/frontend/slices/appshell/features/notifications/components/dynamic-island.tsx
index 736a2b71..4b0d0d6c 100644
--- a/frontend/slices/appshell/features/notifications/components/dynamic-island.tsx
+++ b/frontend/slices/appshell/features/notifications/components/dynamic-island.tsx
@@ -2,7 +2,8 @@
import { Check, X, Loader2 } from "lucide-react";
import { Button } from "@/components/ui/button";
-import { useActivities, useShellUI } from "@/features/appshell";
+import { useActivities } from "../../../lib/activity";
+import { useShellUI } from "../../../registry/shell-ui";
// iPhone Dynamic Island: a top-center pill that appears ONLY while something is
// happening (render, copy, …). Reads the live-activity store; tapping it focuses
diff --git a/frontend/slices/appshell/features/notifications/components/toast-host.tsx b/frontend/slices/appshell/features/notifications/components/toast-host.tsx
index a5770c5c..b4d31dd3 100644
--- a/frontend/slices/appshell/features/notifications/components/toast-host.tsx
+++ b/frontend/slices/appshell/features/notifications/components/toast-host.tsx
@@ -3,7 +3,7 @@
import { CheckCircle2, AlertCircle, X } from "lucide-react";
import { Button } from "@/components/ui/button";
import { cn } from "@/lib/utils";
-import { useToasts, dismissToast, type ToastTone } from "@/features/appshell";
+import { useToasts, dismissToast, type ToastTone } from "../../../lib/toast";
// Top-right glass toast stack. Mounted by DesktopChrome + MobileShell.
// Mirrors the mock-os toast cluster: glass cards, fade/slide in, stacking.
diff --git a/frontend/slices/appshell/features/notifications/index.ts b/frontend/slices/appshell/features/notifications/index.ts
index 300d2142..d02993bf 100644
--- a/frontend/slices/appshell/features/notifications/index.ts
+++ b/frontend/slices/appshell/features/notifications/index.ts
@@ -1,4 +1,4 @@
-import { defineFeature } from "@/features/appshell";
+import { defineFeature } from "../../registry/types";
import { ToastHost } from "./components/toast-host";
import { DynamicIsland } from "./components/dynamic-island";
diff --git a/frontend/slices/appshell/features/search/components/spotlight.tsx b/frontend/slices/appshell/features/search/components/spotlight.tsx
index ba6b9ca6..a54cb1e8 100644
--- a/frontend/slices/appshell/features/search/components/spotlight.tsx
+++ b/frontend/slices/appshell/features/search/components/spotlight.tsx
@@ -3,21 +3,13 @@
import { useEffect, useMemo, useRef, useState } from "react";
import { Search } from "lucide-react";
import { cn } from "@/lib/utils";
-import {
- useApps,
- useActiveShell,
- useCommands,
- useSpotlightOpen,
- useShellAppearance,
- useShellSearch,
- openWindow,
- setSpotlightOpen,
- setLauncherOpen,
- minimizeAll,
- closeAll,
- toast,
- type SearchHit,
-} from "@/features/appshell";
+import { useSpotlightOpen } from "../../../hooks/use-shell";
+import { useApps } from "../../../lib/registry";
+import { useCommands } from "../../../lib/commands";
+import { openWindow, setSpotlightOpen, setLauncherOpen, minimizeAll, closeAll } from "../../../lib/store";
+import { toast } from "../../../lib/toast";
+import { useActiveShell } from "../../../registry/shells";
+import { useShellAppearance, useShellSearch, type SearchHit } from "../../../registry/capabilities";
import { matches, type Command } from "../lib";
import { loadRecents, pushRecent } from "../history";
diff --git a/frontend/slices/appshell/features/search/index.ts b/frontend/slices/appshell/features/search/index.ts
index 8b3f1cee..e4f47f45 100644
--- a/frontend/slices/appshell/features/search/index.ts
+++ b/frontend/slices/appshell/features/search/index.ts
@@ -1,4 +1,4 @@
-import { defineFeature } from "@/features/appshell";
+import { defineFeature } from "../../registry/types";
import { Spotlight } from "./components/spotlight";
// Search — the ⌘K command palette, mounted into the shell's full-screen overlay.
diff --git a/frontend/slices/appshell/features/search/lib.ts b/frontend/slices/appshell/features/search/lib.ts
index 3914e01b..e18fd44b 100644
--- a/frontend/slices/appshell/features/search/lib.ts
+++ b/frontend/slices/appshell/features/search/lib.ts
@@ -1,4 +1,4 @@
-import type { AppDescriptor } from "@/features/appshell";
+import type { AppDescriptor } from "../../lib/types";
export type Command = {
id: string;
diff --git a/frontend/slices/appshell/features/shortcut-help/components/shortcut-help-overlay.tsx b/frontend/slices/appshell/features/shortcut-help/components/shortcut-help-overlay.tsx
index 83039b6c..95dd2b8b 100644
--- a/frontend/slices/appshell/features/shortcut-help/components/shortcut-help-overlay.tsx
+++ b/frontend/slices/appshell/features/shortcut-help/components/shortcut-help-overlay.tsx
@@ -8,7 +8,7 @@ import {
useShortcutHelpOpen,
useShortcuts,
type ShortcutHint,
-} from "@/features/appshell";
+} from "../../../lib/shortcuts";
// ⌘/ cheat sheet — every registered shortcut hint, grouped.
export function ShortcutHelpOverlay() {
diff --git a/frontend/slices/appshell/features/shortcut-help/index.ts b/frontend/slices/appshell/features/shortcut-help/index.ts
index 3f0a52a7..b0557c94 100644
--- a/frontend/slices/appshell/features/shortcut-help/index.ts
+++ b/frontend/slices/appshell/features/shortcut-help/index.ts
@@ -1,4 +1,4 @@
-import { defineFeature } from "@/features/appshell";
+import { defineFeature } from "../../registry/types";
import { ShortcutHelpOverlay } from "./components/shortcut-help-overlay";
// Keyboard-shortcut cheat sheet — ⌘/ overlay over lib/shortcuts.
diff --git a/frontend/slices/appshell/features/widgets/components/desktop-widgets.tsx b/frontend/slices/appshell/features/widgets/components/desktop-widgets.tsx
index a036b909..a41dfa98 100644
--- a/frontend/slices/appshell/features/widgets/components/desktop-widgets.tsx
+++ b/frontend/slices/appshell/features/widgets/components/desktop-widgets.tsx
@@ -2,7 +2,10 @@
import { createElement, useEffect, useRef, useState, type CSSProperties } from "react";
import { Check, LayoutGrid, Trash2 } from "lucide-react";
-import { ContextMenu, registerCommands, registerContextMenu, toast, useContextMenu, type MenuItem } from "@/features/appshell";
+import { ContextMenu, useContextMenu } from "../../../components/shells/context-menu";
+import { registerCommands } from "../../../lib/commands";
+import { registerContextMenu, type MenuItem } from "../../../lib/context-menu";
+import { toast } from "../../../lib/toast";
import { cn } from "@/lib/utils";
import {
getWidgetState,
diff --git a/frontend/slices/appshell/features/widgets/components/mobile-widgets.tsx b/frontend/slices/appshell/features/widgets/components/mobile-widgets.tsx
index 20dec01c..dd4189eb 100644
--- a/frontend/slices/appshell/features/widgets/components/mobile-widgets.tsx
+++ b/frontend/slices/appshell/features/widgets/components/mobile-widgets.tsx
@@ -3,7 +3,11 @@
import { createElement } from "react";
import { Plus } from "lucide-react";
import { Button } from "@/components/ui/button";
-import { useApps, useShellUI, useActiveShell, AppIcon, type AppDescriptor } from "@/features/appshell";
+import { AppIcon } from "../../../components/app-icon";
+import { useApps } from "../../../lib/registry";
+import type { AppDescriptor } from "../../../lib/types";
+import { useActiveShell } from "../../../registry/shells";
+import { useShellUI } from "../../../registry/shell-ui";
import { Card } from "./widget-cards";
import { useWidgetState, setPickerOpen } from "../widget-registry";
import { WIDGET_RENDER } from "./widgets-defs";
diff --git a/frontend/slices/appshell/features/widgets/components/widgets-defs-vps.tsx b/frontend/slices/appshell/features/widgets/components/widgets-defs-vps.tsx
index 02678217..3a565ded 100644
--- a/frontend/slices/appshell/features/widgets/components/widgets-defs-vps.tsx
+++ b/frontend/slices/appshell/features/widgets/components/widgets-defs-vps.tsx
@@ -2,7 +2,8 @@
import { useEffect, useState } from "react";
import { Code2, FileText, Globe, Moon, Palette, Sun, Timer as TimerIcon } from "lucide-react";
-import { setShell, shellsForSurface, useActiveShell, useShellAppearance, useShellPrefs } from "@/features/appshell";
+import { setShell, shellsForSurface, useActiveShell, useShellPrefs } from "../../../registry/shells";
+import { useShellAppearance } from "../../../registry/capabilities";
import { cn } from "@/lib/utils";
import { Card } from "./widget-cards";
import { mdToHtml } from "./md";
diff --git a/frontend/slices/appshell/features/widgets/components/widgets-defs.tsx b/frontend/slices/appshell/features/widgets/components/widgets-defs.tsx
index dc65d5f9..54bea5b1 100644
--- a/frontend/slices/appshell/features/widgets/components/widgets-defs.tsx
+++ b/frontend/slices/appshell/features/widgets/components/widgets-defs.tsx
@@ -2,7 +2,8 @@
import { useEffect, useState } from "react";
import { Clock as ClockIcon, Cpu, HardDrive, Link2, MemoryStick, Network, StickyNote, Timer } from "lucide-react";
-import { QuicklinkIcon, useQuickLinks, useSystemStats } from "@/features/appshell";
+import { QuicklinkIcon } from "../../../components/quicklink-icon";
+import { useQuickLinks, useSystemStats } from "../../../registry/capabilities";
import { Bar, Card, Row, Sparkline, gb } from "./widget-cards";
import { CalendarWidget, TasksWidget } from "./widgets-defs-apps";
import { VPS_WIDGETS } from "./widgets-defs-vps";
diff --git a/frontend/slices/appshell/features/widgets/index.ts b/frontend/slices/appshell/features/widgets/index.ts
index 57424745..f18dfeec 100644
--- a/frontend/slices/appshell/features/widgets/index.ts
+++ b/frontend/slices/appshell/features/widgets/index.ts
@@ -1,4 +1,4 @@
-import { defineFeature } from "@/features/appshell";
+import { defineFeature } from "../../registry/types";
import { MobileWidgets } from "./components/mobile-widgets";
import { DesktopWidgets } from "./components/desktop-widgets";
diff --git a/frontend/slices/assistant/app.tsx b/frontend/slices/assistant/app.tsx
index 7b22c66e..ebfbc254 100644
--- a/frontend/slices/assistant/app.tsx
+++ b/frontend/slices/assistant/app.tsx
@@ -2,7 +2,7 @@
import { useCallback, useRef, useState } from "react";
import { History } from "lucide-react";
-import { AppFrame } from "@/features/os-shell";
+import { AppFrame } from "@/features/appshell";
import { Button } from "@/components/ui/button";
import { Tabs, TabsList, TabsTrigger } from "./components/tabs";
import { usePublishInspector } from "./lib/host";
diff --git a/frontend/slices/assistant/components/chat-panel.tsx b/frontend/slices/assistant/components/chat-panel.tsx
index a45fddce..946f41e3 100644
--- a/frontend/slices/assistant/components/chat-panel.tsx
+++ b/frontend/slices/assistant/components/chat-panel.tsx
@@ -24,15 +24,15 @@ import {
sendToAlfa,
ChatComposer,
type AlfaMessage,
-} from "@/features/os-shell";
+} from "@/features/appshell";
import { runToolAgent, useOsApi, type AgentMsg } from "../lib/host";
import { toolById } from "../lib/tools";
import type { Agent, Automation } from "../lib/types";
import { activeAgent } from "../lib/store";
import { composeSystem } from "../lib/agent-request";
import { useHostCommands, type HostToolUi } from "../host-tools/use-host-commands";
-import { MessageBubble, type ChatMessage, type ToolCard } from "@/features/os-shell";
-import { ApprovalCard } from "@/features/os-shell";
+import { MessageBubble, type ChatMessage, type ToolCard } from "@/features/appshell";
+import { ApprovalCard } from "@/features/appshell";
import { EmptyState } from "./empty-state";
import { useThreadPersistence } from "./use-thread-persistence";
diff --git a/frontend/slices/assistant/components/thread-list.tsx b/frontend/slices/assistant/components/thread-list.tsx
index 9d29de6d..a2daae9a 100644
--- a/frontend/slices/assistant/components/thread-list.tsx
+++ b/frontend/slices/assistant/components/thread-list.tsx
@@ -2,7 +2,7 @@
import { useCallback, useEffect, useState } from "react";
import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@/components/ui/sheet";
-import { useShellDesign } from "@/features/os-shell";
+import { useShellDesign } from "@/features/appshell";
import { cn } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { Trash2, Plus } from "lucide-react";
diff --git a/frontend/slices/assistant/components/use-alfa-runner.ts b/frontend/slices/assistant/components/use-alfa-runner.ts
index b0c367be..8262ce83 100644
--- a/frontend/slices/assistant/components/use-alfa-runner.ts
+++ b/frontend/slices/assistant/components/use-alfa-runner.ts
@@ -1,7 +1,7 @@
"use client";
import { useEffect, useRef } from "react";
-import { registerAlfaRunner, registerAlfaStop, unregisterAlfaRunner } from "@/features/os-shell";
+import { registerAlfaRunner, registerAlfaStop, unregisterAlfaRunner } from "@/features/appshell";
/**
* Publish this panel as THE Alfa engine while it is mounted, so the per-app Alfa
diff --git a/frontend/slices/assistant/components/use-thread-persistence.ts b/frontend/slices/assistant/components/use-thread-persistence.ts
index 955aa0e2..4c01bf36 100644
--- a/frontend/slices/assistant/components/use-thread-persistence.ts
+++ b/frontend/slices/assistant/components/use-thread-persistence.ts
@@ -2,7 +2,7 @@
import { useCallback, useRef, type Dispatch, type SetStateAction } from "react";
import type { AgentMsg } from "../lib/host";
-import type { ChatMessage } from "@/features/os-shell";
+import type { ChatMessage } from "@/features/appshell";
type LoadArg = { id: string; createdAt: number; messages: unknown[]; history: unknown[] };
diff --git a/frontend/slices/assistant/host-tools/catalog.ts b/frontend/slices/assistant/host-tools/catalog.ts
index 56caf710..d3a90752 100644
--- a/frontend/slices/assistant/host-tools/catalog.ts
+++ b/frontend/slices/assistant/host-tools/catalog.ts
@@ -155,11 +155,11 @@ const READ_TOOLS: HostTool[] = [
"app!": str("App id or slug, e.g. files, browser, terminal, monitor"),
path: str("Optional payload for apps that accept one, e.g. a directory for files"),
}),
- run: async (_api, args) => {
+ run: async (_api, args, runtime) => {
const app = String(args.app ?? "").trim().toLowerCase();
if (!app) throw new Error("app is required");
const path = typeof args.path === "string" && args.path ? args.path : undefined;
- const { openWindow, BUILTIN_APPS } = await import("@/features/os-shell");
+ const { openWindow } = await import("@/features/appshell");
// Resolve by slug OR id. The description advertises slugs (files, browser,
// code…) but openWindow keys the registry by ID, and shell.manifest.ts gives
@@ -168,7 +168,7 @@ const READ_TOOLS: HostTool[] = [
// returned "opened files", telling the model and the user it had worked.
// Same predicate as runtime/use-url-sync.tsx, so a URL and a tool call
// resolve identically.
- const target = BUILTIN_APPS.find((a) => (a.slug ?? a.id) === app || a.id === app);
+ const target = runtime.apps.find((a) => (a.slug ?? a.id) === app || a.id === app);
if (!target) throw new Error(`unknown app "${app}"`);
if (SHELL_APPS.has(target.id)) throw new Error(`"${app}" starts a shell on the host — open it yourself`);
diff --git a/frontend/slices/assistant/host-tools/types.ts b/frontend/slices/assistant/host-tools/types.ts
index ecc3031f..4030abeb 100644
--- a/frontend/slices/assistant/host-tools/types.ts
+++ b/frontend/slices/assistant/host-tools/types.ts
@@ -1,4 +1,4 @@
-import type { OsApi } from "../lib/host";
+import type { AppDescriptor, OsApi } from "../lib/host";
import type { ToolGroup } from "../lib/types";
// A JSON Schema object (Anthropic tool `input_schema` shape) — flat primitive/
@@ -18,6 +18,8 @@ export type HostEffect = "read" | "mutate";
// One AI-callable host operation. `run` receives the live OsApi port + the
// model's args and returns a short, serialisable result the model sees as the
// tool_result. Throw on bad input; the binding catches it into a failed outcome.
+export type HostToolRuntime = { apps: AppDescriptor[] };
+
export type HostTool = {
/** Dotted name, e.g. "fs.write". Unique across the catalog. */
name: string;
@@ -28,5 +30,5 @@ export type HostTool = {
description: string;
parameters: JsonSchema;
effect: HostEffect;
- run: (api: OsApi, args: Record<string, unknown>) => string | Promise<string>;
+ run: (api: OsApi, args: Record<string, unknown>, runtime: HostToolRuntime) => string | Promise<string>;
};
diff --git a/frontend/slices/assistant/host-tools/use-host-commands.ts b/frontend/slices/assistant/host-tools/use-host-commands.ts
index aa9b5ba5..b7282456 100644
--- a/frontend/slices/assistant/host-tools/use-host-commands.ts
+++ b/frontend/slices/assistant/host-tools/use-host-commands.ts
@@ -3,7 +3,7 @@
import { useMemo, useRef } from "react";
import { matchDestructive, useOsApi } from "../lib/host";
import type { AiTool, ToolInvocation, ToolOutcome } from "../lib/host";
-import type { ToolCard } from "@/features/os-shell";
+import { useApps, type ToolCard } from "@/features/appshell";
import { findHostTool, HOST_AI_TOOLS } from "./registry";
// The chat panel supplies these so the binding can render each call as a card and
@@ -36,6 +36,7 @@ export function useHostCommands(ui: HostToolUi): {
invoke: (call: ToolInvocation) => Promise<ToolOutcome>;
} {
const api = useOsApi();
+ const apps = useApps();
const denied = useRef<Set<string>>(new Set());
const allowed = useRef<Set<string>>(new Set());
const seq = useRef(0);
@@ -54,7 +55,7 @@ export function useHostCommands(ui: HostToolUi): {
const execute = async (): Promise<ToolOutcome> => {
ui.updateCard(id, { status: "running" });
try {
- const result = await tool.run(api, args);
+ const result = await tool.run(api, args, { apps });
ui.updateCard(id, { status: "ok", result });
return { ok: true, result };
} catch (e) {
@@ -88,6 +89,6 @@ export function useHostCommands(ui: HostToolUi): {
return execute();
},
}),
- [api, ui],
+ [api, apps, ui],
);
}
diff --git a/frontend/slices/assistant/index.ts b/frontend/slices/assistant/index.ts
index c09da5d8..a7ffbafd 100644
--- a/frontend/slices/assistant/index.ts
+++ b/frontend/slices/assistant/index.ts
@@ -1,5 +1,5 @@
import { Sparkles } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: the only thing the app layer imports. Exposes the app descriptor;
// the component itself is lazy-loaded via `load` so its bundle is deferred.
diff --git a/frontend/slices/assistant/lib/alfa-sources.ts b/frontend/slices/assistant/lib/alfa-sources.ts
index c89dbd3b..12a2b900 100644
--- a/frontend/slices/assistant/lib/alfa-sources.ts
+++ b/frontend/slices/assistant/lib/alfa-sources.ts
@@ -1,6 +1,6 @@
"use client";
-import { notifyAlfaSources, registerAlfaSources, type MentionItem } from "@/features/os-shell";
+import { notifyAlfaSources, registerAlfaSources, type MentionItem } from "@/features/appshell";
import { HOST_TOOLS } from "../host-tools/catalog";
import { activeAgent, agentList, setActiveAgentId } from "./store";
diff --git a/frontend/slices/assistant/lib/host.ts b/frontend/slices/assistant/lib/host.ts
index c440c14b..6cd1964d 100644
--- a/frontend/slices/assistant/lib/host.ts
+++ b/frontend/slices/assistant/lib/host.ts
@@ -6,14 +6,14 @@
// (configureAssistantStream + typing demo stream + no-op inspector) —
// every other file is line-identical.
-export type { AppDescriptor } from "@/features/os-shell";
-export { usePublishInspector } from "@/features/os-shell";
+export type { AppDescriptor } from "@/features/appshell";
+export { usePublishInspector } from "@/features/appshell";
// Host-tool execution seam: the OsApi port (fs/exec/sys/apps), the generic
// tool-agent loop, and the isomorphic destructive-command matcher (for the
// approval card's advisory badge). Confined here so the slice never reaches into
// @/lib or @/features directly — matching the image-editor pattern.
-export { useOsApi, type OsApi } from "@/features/os-shell";
+export { useOsApi, type OsApi } from "@/features/appshell";
export {
runToolAgent,
type AgentMsg,
diff --git a/frontend/slices/auth/components/devices-panel.tsx b/frontend/slices/auth/components/devices-panel.tsx
index 08edcd08..c79b5e4f 100644
--- a/frontend/slices/auth/components/devices-panel.tsx
+++ b/frontend/slices/auth/components/devices-panel.tsx
@@ -4,7 +4,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
import { Check, ShieldCheck, Trash2, Clock } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Badge } from "@/components/ui/badge";
-import { CopyButton, FormDrawer, toast } from "@/features/os-shell";
+import { CopyButton, FormDrawer, toast } from "@/features/appshell";
import { getOrCreateDeviceId } from "../lib/device";
import { DEVICE_ROLES, roleLabel, type DeviceRole } from "@/lib/auth/roles";
diff --git a/frontend/slices/camoufox-browser/index.ts b/frontend/slices/camoufox-browser/index.ts
index 8488fa35..c0d973dd 100644
--- a/frontend/slices/camoufox-browser/index.ts
+++ b/frontend/slices/camoufox-browser/index.ts
@@ -1,5 +1,5 @@
import { ScanEye } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
export const camoufoxBrowserApp: AppDescriptor = {
id: "camoufox-browser",
diff --git a/frontend/slices/code-editor/components/close-guard-dialog.tsx b/frontend/slices/code-editor/components/close-guard-dialog.tsx
index ce52abf1..96b920d5 100644
--- a/frontend/slices/code-editor/components/close-guard-dialog.tsx
+++ b/frontend/slices/code-editor/components/close-guard-dialog.tsx
@@ -1,7 +1,7 @@
"use client";
import { Button } from "@/components/ui/button";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
// Unsaved-changes prompt shown when a dirty window is closed: Save (writes then
// closes) / Don't Save (discards + closes) / Cancel (keeps the window open).
diff --git a/frontend/slices/code-editor/components/host-drawer.tsx b/frontend/slices/code-editor/components/host-drawer.tsx
index 31540646..d0484e3f 100644
--- a/frontend/slices/code-editor/components/host-drawer.tsx
+++ b/frontend/slices/code-editor/components/host-drawer.tsx
@@ -1,4 +1,4 @@
"use client";
// mso seam: the shell's FormDrawer. rr ships a slice-local copy instead.
-export { FormDrawer } from "@/features/os-shell";
+export { FormDrawer } from "@/features/appshell";
diff --git a/frontend/slices/code-editor/components/host-sidebar.tsx b/frontend/slices/code-editor/components/host-sidebar.tsx
index 28edc451..547c1688 100644
--- a/frontend/slices/code-editor/components/host-sidebar.tsx
+++ b/frontend/slices/code-editor/components/host-sidebar.tsx
@@ -1,4 +1,4 @@
"use client";
// mso seam: the shell's AppSidebar. rr ships a slice-local copy instead.
-export { AppSidebar } from "@/features/os-shell";
+export { AppSidebar } from "@/features/appshell";
diff --git a/frontend/slices/code-editor/index.ts b/frontend/slices/code-editor/index.ts
index ad09048a..532277ec 100644
--- a/frontend/slices/code-editor/index.ts
+++ b/frontend/slices/code-editor/index.ts
@@ -1,5 +1,5 @@
import { Code2 } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: the only thing the app layer imports. Exposes the app descriptor;
// the component itself is lazy-loaded via `load` so its bundle is deferred.
diff --git a/frontend/slices/code-editor/lib/host.ts b/frontend/slices/code-editor/lib/host.ts
index 2350d4f8..1c257195 100644
--- a/frontend/slices/code-editor/lib/host.ts
+++ b/frontend/slices/code-editor/lib/host.ts
@@ -5,6 +5,6 @@
// copy replaces this file with a self-contained version (injectable
// CodeFsAdapter + no-op inspector) — every other file is line-identical.
-export type { AppProps, AppDescriptor } from "@/features/os-shell";
-export { usePublishInspector, setCloseGuard, closeWindow } from "@/features/os-shell";
-export { useOsApi, type FsEntry } from "@/features/os-shell";
+export type { AppProps, AppDescriptor } from "@/features/appshell";
+export { usePublishInspector, setCloseGuard, closeWindow } from "@/features/appshell";
+export { useOsApi, type FsEntry } from "@/features/appshell";
diff --git a/frontend/slices/create-app/app.tsx b/frontend/slices/create-app/app.tsx
index 859e5037..4b337d8d 100644
--- a/frontend/slices/create-app/app.tsx
+++ b/frontend/slices/create-app/app.tsx
@@ -9,7 +9,7 @@ import { Separator } from "@/components/ui/separator";
import { Badge } from "@/components/ui/badge";
import { ScrollArea } from "@/components/ui/scroll-area";
import { GLYPH_KEYS, createApp } from "@/features/app-store";
-import { AppFrame, usePublishInspector } from "@/features/os-shell";
+import { AppFrame, usePublishInspector } from "@/features/appshell";
import { cn } from "@/lib/utils";
import { IconPreview } from "./components/icon-preview";
import { GlyphPicker } from "./components/glyph-picker";
diff --git a/frontend/slices/create-app/index.ts b/frontend/slices/create-app/index.ts
index 8fd7ea7b..ca4ffe2e 100644
--- a/frontend/slices/create-app/index.ts
+++ b/frontend/slices/create-app/index.ts
@@ -1,5 +1,5 @@
import { Wand2 } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: the only thing the app layer imports. Exposes the app descriptor;
// the component itself is lazy-loaded via `load` so its bundle is deferred.
diff --git a/frontend/slices/docs/app.tsx b/frontend/slices/docs/app.tsx
index 17224da0..f057ddc4 100644
--- a/frontend/slices/docs/app.tsx
+++ b/frontend/slices/docs/app.tsx
@@ -1,7 +1,7 @@
"use client";
import { ArrowUpRight, BookOpen, GitFork, LogIn, Rocket } from "lucide-react";
-import { AppFrame, openWindow } from "@/features/os-shell";
+import { AppFrame, openWindow } from "@/features/appshell";
import { useSession } from "@/features/auth";
import { Button } from "@/components/ui/button";
import { DEEPER, INSTALL_GUIDE, REPO, START_HERE, type DocLink } from "./links";
diff --git a/frontend/slices/docs/docs.test.ts b/frontend/slices/docs/docs.test.ts
index bbede783..642d7fb8 100644
--- a/frontend/slices/docs/docs.test.ts
+++ b/frontend/slices/docs/docs.test.ts
@@ -2,7 +2,7 @@ import { readFileSync } from "node:fs";
import { describe, expect, it } from "vitest";
import { DEEPER, INSTALL_GUIDE, REPO, START_HERE } from "./links";
-// Read the sources rather than importing the barrels: `@/features/os-shell` pulls
+// Read the sources rather than importing the barrels: `@/features/appshell` pulls
// the whole React shell, which a node-env unit test has no business booting.
const read = (rel: string) => readFileSync(new URL(rel, import.meta.url), "utf8");
diff --git a/frontend/slices/docs/index.ts b/frontend/slices/docs/index.ts
index f11b9c0e..286ed4f4 100644
--- a/frontend/slices/docs/index.ts
+++ b/frontend/slices/docs/index.ts
@@ -1,5 +1,5 @@
import { BookOpen } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: the app layer imports only this. The window is lazy-loaded via `load`
// so the docs bundle is deferred until the window opens.
diff --git a/frontend/slices/files-manager/app.tsx b/frontend/slices/files-manager/app.tsx
index 0c12093d..6bc95902 100644
--- a/frontend/slices/files-manager/app.tsx
+++ b/frontend/slices/files-manager/app.tsx
@@ -2,7 +2,7 @@
import { useMemo, useRef, useState } from "react";
import { Loader2 } from "lucide-react";
-import { AppFrame, AppSidebar, useActiveShell, useResponsive, type AppProps } from "@/features/os-shell";
+import { AppFrame, AppSidebar, useActiveShell, useResponsive, type AppProps } from "@/features/appshell";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import { DropOverlay } from "./components/drop-overlay";
diff --git a/frontend/slices/files-manager/components/file-details.tsx b/frontend/slices/files-manager/components/file-details.tsx
index 24cc3a0f..651461c9 100644
--- a/frontend/slices/files-manager/components/file-details.tsx
+++ b/frontend/slices/files-manager/components/file-details.tsx
@@ -3,7 +3,7 @@
import { createElement } from "react";
import { Copy } from "lucide-react";
import type { FsEntry } from "../lib/host";
-import { toast } from "@/features/os-shell";
+import { toast } from "@/features/appshell";
import { iconFor, colorFor } from "../lib/icons";
import { fmtSize, joinPath } from "../lib/format";
import { cn } from "@/lib/utils";
diff --git a/frontend/slices/files-manager/components/file-view.tsx b/frontend/slices/files-manager/components/file-view.tsx
index ec325c23..95d8ec2c 100644
--- a/frontend/slices/files-manager/components/file-view.tsx
+++ b/frontend/slices/files-manager/components/file-view.tsx
@@ -6,7 +6,7 @@ import { FileItem } from "./file-item";
import { joinPath } from "../lib/format";
import type { ViewMode } from "../lib/types";
import type { UseDnd } from "../hooks/use-dnd";
-import { useViewportWindow } from "@/features/os-shell";
+import { useViewportWindow } from "@/features/appshell";
// Past this length the list view DOM-virtualizes (only the visible window +
// overscan mount). Audit AUDIT-2026-06-11 §5: list is the one view that needs
diff --git a/frontend/slices/files-manager/components/upload-bar.tsx b/frontend/slices/files-manager/components/upload-bar.tsx
index 28effc03..b3e6d6b0 100644
--- a/frontend/slices/files-manager/components/upload-bar.tsx
+++ b/frontend/slices/files-manager/components/upload-bar.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useActivities } from "@/features/os-shell";
+import { useActivities } from "@/features/appshell";
import { UPLOAD_ACTIVITY_ID } from "../hooks/use-file-ops";
// Thin determinate upload bar under the toolbar. Desktop shells don't mount the
diff --git a/frontend/slices/files-manager/components/zip-dialog.tsx b/frontend/slices/files-manager/components/zip-dialog.tsx
index 4c7845ce..cbd3a004 100644
--- a/frontend/slices/files-manager/components/zip-dialog.tsx
+++ b/frontend/slices/files-manager/components/zip-dialog.tsx
@@ -2,7 +2,7 @@
import { useState } from "react";
import { Button } from "@/components/ui/button";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
// Dep / build / VCS dirs that bloat an archive but are regenerable — offered as
// excludes and checked (skipped) by default. Excluding one the folder doesn't
diff --git a/frontend/slices/files-manager/hooks/use-file-commands.ts b/frontend/slices/files-manager/hooks/use-file-commands.ts
index 94e03c3b..ce09c09f 100644
--- a/frontend/slices/files-manager/hooks/use-file-commands.ts
+++ b/frontend/slices/files-manager/hooks/use-file-commands.ts
@@ -1,7 +1,7 @@
"use client";
import { useCallback, useState, type KeyboardEvent, type MouseEvent } from "react";
-import { openWindow, saveAs, toast } from "@/features/os-shell";
+import { openWindow, saveAs, toast } from "@/features/appshell";
import { rawUrl, zipUrl, type FsEntry } from "../lib/host";
import { appForFile, mediaKind } from "../lib/icons";
import { joinPath, parentPath } from "../lib/format";
diff --git a/frontend/slices/files-manager/hooks/use-file-ops.ts b/frontend/slices/files-manager/hooks/use-file-ops.ts
index 506bf9fd..098e850d 100644
--- a/frontend/slices/files-manager/hooks/use-file-ops.ts
+++ b/frontend/slices/files-manager/hooks/use-file-ops.ts
@@ -2,7 +2,7 @@
import { useCallback } from "react";
import type { OsApi, UploadFile } from "../lib/host";
-import { toast, setActivity, clearActivity } from "@/features/os-shell";
+import { toast, setActivity, clearActivity } from "@/features/appshell";
import { joinPath, uniqueName } from "../lib/format";
import type { Clipboard } from "../lib/types";
diff --git a/frontend/slices/files-manager/hooks/use-files-inspector.ts b/frontend/slices/files-manager/hooks/use-files-inspector.ts
index c320b758..a0045d05 100644
--- a/frontend/slices/files-manager/hooks/use-files-inspector.ts
+++ b/frontend/slices/files-manager/hooks/use-files-inspector.ts
@@ -1,6 +1,6 @@
"use client";
-import { usePublishInspector } from "@/features/os-shell";
+import { usePublishInspector } from "@/features/appshell";
import { fmtGiB } from "../lib/format";
import type { UseFiles } from "./use-files";
diff --git a/frontend/slices/files-manager/hooks/use-files.ts b/frontend/slices/files-manager/hooks/use-files.ts
index ce5c9dc4..2441f061 100644
--- a/frontend/slices/files-manager/hooks/use-files.ts
+++ b/frontend/slices/files-manager/hooks/use-files.ts
@@ -1,7 +1,7 @@
"use client";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { toast } from "@/features/os-shell";
+import { toast } from "@/features/appshell";
import { useOsApi, type FsEntry, type FsRoot, type FsUsage } from "../lib/host";
import type { Clipboard } from "../lib/types";
import { useFileOps } from "./use-file-ops";
diff --git a/frontend/slices/files-manager/index.ts b/frontend/slices/files-manager/index.ts
index 43b0d294..5b3d5b8c 100644
--- a/frontend/slices/files-manager/index.ts
+++ b/frontend/slices/files-manager/index.ts
@@ -1,5 +1,5 @@
import { FolderOpen } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: the only thing the app layer imports. The component is lazy-loaded
// via `load` so its bundle is deferred until the window opens.
diff --git a/frontend/slices/files-manager/lib/host.ts b/frontend/slices/files-manager/lib/host.ts
index d5bbd95c..5b9eeeb5 100644
--- a/frontend/slices/files-manager/lib/host.ts
+++ b/frontend/slices/files-manager/lib/host.ts
@@ -2,11 +2,12 @@
// the shell barrel (a legal alias) so no other file in the slice imports a
// project @/lib path directly. Lifting this slice to the rr catalog means
// swapping THIS file for an injected adapter; every other file is unchanged.
-export { useOsApi, rawUrl, zipUrl } from "@/features/os-shell";
+export { useOsApi } from "@/features/appshell";
+export { rawUrl, zipUrl } from "@/lib/os-api";
export type {
OsApi,
FsEntry,
FsRoot,
FsUsage,
UploadFile,
-} from "@/features/os-shell";
+} from "@/features/appshell";
diff --git a/frontend/slices/image-editor/components/confirm-remove-layer.tsx b/frontend/slices/image-editor/components/confirm-remove-layer.tsx
index 08aa4db1..e86e520e 100644
--- a/frontend/slices/image-editor/components/confirm-remove-layer.tsx
+++ b/frontend/slices/image-editor/components/confirm-remove-layer.tsx
@@ -3,7 +3,7 @@
import * as React from "react";
import { Trash2 } from "lucide-react";
import { Button } from "@/components/ui/button";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
import { useEditor } from "../lib/store";
import type { Layer } from "../lib/types";
diff --git a/frontend/slices/image-editor/image-editor.tsx b/frontend/slices/image-editor/image-editor.tsx
index b8b5be44..8637cfc2 100644
--- a/frontend/slices/image-editor/image-editor.tsx
+++ b/frontend/slices/image-editor/image-editor.tsx
@@ -10,6 +10,7 @@ import { ProjectLoader, ProjectLoadError } from "./components/project-loader";
import { ConfirmRemoveLayerProvider } from "./components/confirm-remove-layer";
import { Shell } from "./shell";
import type { Doc } from "./lib/types";
+import type { EditorApi } from "./lib/editor-api";
// The Konva stage touches `window`/`canvas` at import time, so it is loaded
// client-only (no SSR) — the rest of the chrome renders normally.
@@ -63,9 +64,7 @@ export type ImageEditorProps = {
className?: string;
}
-/** Imperative handle exposed via `onReady` — lets a consumer render the canvas
- * (e.g. to save on close) and clear the dirty flag after saving. */
-export type EditorApi = { exportPng: () => string | null; markSaved: () => void };
+export type { EditorApi } from "./lib/editor-api";
// Standalone, self-contained image editor. Drops into any height-bearing box.
export function ImageEditor({ initialImage, projectSrc, onSaveDoc, width, height, onSave, onSaveAs, onClose, onDirty, onReady, compact, className, winId }: ImageEditorProps) {
diff --git a/frontend/slices/image-editor/lib/editor-api.ts b/frontend/slices/image-editor/lib/editor-api.ts
new file mode 100644
index 00000000..5ea3dafb
--- /dev/null
+++ b/frontend/slices/image-editor/lib/editor-api.ts
@@ -0,0 +1,2 @@
+/** Imperative handle exposed by ImageEditor without coupling the shell back to its root component. */
+export type EditorApi = { exportPng: () => string | null; markSaved: () => void };
diff --git a/frontend/slices/image-editor/lib/export.ts b/frontend/slices/image-editor/lib/export.ts
index 03420763..3a706e1e 100644
--- a/frontend/slices/image-editor/lib/export.ts
+++ b/frontend/slices/image-editor/lib/export.ts
@@ -1,5 +1,5 @@
import type Konva from "konva";
-import { saveAs } from "@/features/os-shell";
+import { saveAs } from "@/features/appshell";
export type ExportFormat = "png" | "jpeg" | "webp";
diff --git a/frontend/slices/image-editor/lib/project.ts b/frontend/slices/image-editor/lib/project.ts
index 92674b51..1cc20050 100644
--- a/frontend/slices/image-editor/lib/project.ts
+++ b/frontend/slices/image-editor/lib/project.ts
@@ -1,5 +1,5 @@
import { useCallback } from "react";
-import { saveAs } from "@/features/os-shell";
+import { saveAs } from "@/features/appshell";
import type Konva from "konva";
import type { Doc } from "./types";
import {
diff --git a/frontend/slices/image-editor/shell.tsx b/frontend/slices/image-editor/shell.tsx
index cb98773d..b85748b9 100644
--- a/frontend/slices/image-editor/shell.tsx
+++ b/frontend/slices/image-editor/shell.tsx
@@ -13,7 +13,7 @@ import { MobileShell } from "./components/mobile-shell";
import { useKeyboard } from "./hooks/use-keyboard";
import { useIsMobile } from "@/features/appshell";
import type { Doc } from "./lib/types";
-import type { EditorApi } from "./image-editor";
+import type { EditorApi } from "./lib/editor-api";
// Desktop layout: left tool rail · canvas · right dock (adjust top, layers bottom).
function DesktopShell({ stage, onSave, onSaveAs, onClose }: { stage: React.ReactNode; onSave?: (d: string) => void; onSaveAs?: (d: string) => void; onClose?: () => void }) {
diff --git a/frontend/slices/image-picker/components/image-picker-dialog.tsx b/frontend/slices/image-picker/components/image-picker-dialog.tsx
index fef669dc..d7c04a24 100644
--- a/frontend/slices/image-picker/components/image-picker-dialog.tsx
+++ b/frontend/slices/image-picker/components/image-picker-dialog.tsx
@@ -8,7 +8,7 @@
* open state. */
import * as React from "react";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
import { cn } from "@/lib/utils";
import type { ImageValue, ImageSourceProps } from "../types";
import { GalleryTab } from "./image-picker/gallery-tab";
diff --git a/frontend/slices/infrastructure/index.tsx b/frontend/slices/infrastructure/index.tsx
index db3dd5fb..218484ef 100644
--- a/frontend/slices/infrastructure/index.tsx
+++ b/frontend/slices/infrastructure/index.tsx
@@ -1,5 +1,5 @@
import { Cloud, ServerCog } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
export type InfrastructureFeatureId = "dokploy" | "cloudflare";
diff --git a/frontend/slices/managed-apps/confirm-dialog.tsx b/frontend/slices/managed-apps/confirm-dialog.tsx
index cc5889c6..e1707685 100644
--- a/frontend/slices/managed-apps/confirm-dialog.tsx
+++ b/frontend/slices/managed-apps/confirm-dialog.tsx
@@ -2,7 +2,7 @@
import type { ReactNode } from "react";
import { Button } from "@/components/ui/button";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
// One confirm for update / restore / uninstall, so the three destructive flows
// read identically and none of them can ship a bare `window.confirm`. Dialog on
diff --git a/frontend/slices/managed-apps/index.ts b/frontend/slices/managed-apps/index.ts
index 96f6db00..d63120e6 100644
--- a/frontend/slices/managed-apps/index.ts
+++ b/frontend/slices/managed-apps/index.ts
@@ -1,6 +1,6 @@
import { Bot, Workflow, type LucideIcon } from "lucide-react";
import { createElement } from "react";
-import type { AppDescriptor, AppIconComponent } from "@/features/os-shell";
+import type { AppDescriptor, AppIconComponent } from "@/features/appshell";
const NineRouterIcon: AppIconComponent = ({ className }) =>
// Exact upstream 9Router artwork, copied from the managed Docker image. This file is
diff --git a/frontend/slices/managed-apps/install-panel.tsx b/frontend/slices/managed-apps/install-panel.tsx
index d48460a7..17900310 100644
--- a/frontend/slices/managed-apps/install-panel.tsx
+++ b/frontend/slices/managed-apps/install-panel.tsx
@@ -5,7 +5,7 @@ import { ChevronDown, Download, SquareTerminal } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
-import { CopyButton, copyClip, openWindow, toast } from "@/features/os-shell";
+import { CopyButton, copyClip, openWindow, toast } from "@/features/appshell";
import { providersFor } from "@/lib/managed-apps/providers";
import type { ManagedAppId } from "@/lib/managed-apps/types";
import { supportFor } from "./app-support";
diff --git a/frontend/slices/managed-apps/uninstall-panel.tsx b/frontend/slices/managed-apps/uninstall-panel.tsx
index a88d8242..6cee2407 100644
--- a/frontend/slices/managed-apps/uninstall-panel.tsx
+++ b/frontend/slices/managed-apps/uninstall-panel.tsx
@@ -5,7 +5,7 @@ import { Copy, Eye, Trash2, TriangleAlert } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
-import { CopyButton } from "@/features/os-shell";
+import { CopyButton } from "@/features/appshell";
import type { ManagedAppId } from "@/lib/managed-apps/types";
import { supportFor } from "./app-support";
import { uninstallApp } from "./update-api";
diff --git a/frontend/slices/media-studio/app.tsx b/frontend/slices/media-studio/app.tsx
index f6ee84e1..7d269c98 100644
--- a/frontend/slices/media-studio/app.tsx
+++ b/frontend/slices/media-studio/app.tsx
@@ -3,8 +3,8 @@
import { useEffect, useRef, useState } from "react";
import { ImageEditor, type EditorApi } from "@/features/image-editor";
import { rawUrl } from "./lib/host";
-import { closeWindow, setCloseGuard, toast, useContainer, useIsMobile, FormDrawer } from "@/features/os-shell";
-import type { AppProps } from "@/features/os-shell";
+import { closeWindow, setCloseGuard, toast, useContainer, useIsMobile, FormDrawer } from "@/features/appshell";
+import type { AppProps } from "@/features/appshell";
import { Button } from "@/components/ui/button";
import { SaveImageDialog } from "./components/save-image-dialog";
import { autoName, loadSavePrefs, saveImageToHost } from "./lib/save-image";
diff --git a/frontend/slices/media-studio/components/save-image-dialog.tsx b/frontend/slices/media-studio/components/save-image-dialog.tsx
index b567086c..4b307e17 100644
--- a/frontend/slices/media-studio/components/save-image-dialog.tsx
+++ b/frontend/slices/media-studio/components/save-image-dialog.tsx
@@ -3,7 +3,7 @@
import { useState, type ReactNode } from "react";
import { HardDriveDownload, Loader2 } from "lucide-react";
import { Button } from "@/components/ui/button";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import {
@@ -14,7 +14,7 @@ import {
SelectValue,
} from "@/components/ui/select";
import { EditorSlider as Slider } from "@/features/image-editor";
-import { toast } from "@/features/os-shell";
+import { toast } from "@/features/appshell";
import { loadSavePrefs, saveImageToHost, saveSavePrefs, type SaveFormat } from "../lib/save-image";
function Field({ label, children }: { label: string; children: ReactNode }) {
diff --git a/frontend/slices/media-studio/index.ts b/frontend/slices/media-studio/index.ts
index 4568944b..b3e27d83 100644
--- a/frontend/slices/media-studio/index.ts
+++ b/frontend/slices/media-studio/index.ts
@@ -1,5 +1,5 @@
import { Image } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: the only thing the app layer imports. Exposes the app descriptor;
// the component itself is lazy-loaded via `load` so its bundle is deferred.
diff --git a/frontend/slices/media-studio/lib/host.ts b/frontend/slices/media-studio/lib/host.ts
index 7b3bdbf8..4a33fe48 100644
--- a/frontend/slices/media-studio/lib/host.ts
+++ b/frontend/slices/media-studio/lib/host.ts
@@ -1,4 +1,4 @@
// Single host seam — re-exports the mso raw-bytes URL helper via the shell
// barrel (a legal alias). Lifting the slice swaps this file for an injected one;
// no other file in the slice imports host I/O directly.
-export { rawUrl } from "@/features/os-shell";
+export { rawUrl } from "@/lib/os-api";
diff --git a/frontend/slices/media-viewer/app.tsx b/frontend/slices/media-viewer/app.tsx
index 75f9eb7d..d205a9b7 100644
--- a/frontend/slices/media-viewer/app.tsx
+++ b/frontend/slices/media-viewer/app.tsx
@@ -2,8 +2,8 @@
import { useCallback, useState } from "react";
import { TooltipProvider } from "@/components/ui/tooltip";
-import type { AppProps } from "@/features/os-shell";
-import { AppFrame, openWindow, saveAs, usePublishInspector } from "@/features/os-shell";
+import type { AppProps } from "@/features/appshell";
+import { AppFrame, openWindow, saveAs, usePublishInspector } from "@/features/appshell";
import { SAMPLES } from "./lib/samples";
import { editorFor } from "./lib/media";
import { ViewerToolbar } from "./components/viewer-toolbar";
diff --git a/frontend/slices/media-viewer/components/remote-view.tsx b/frontend/slices/media-viewer/components/remote-view.tsx
index 6279b732..440fbb1b 100644
--- a/frontend/slices/media-viewer/components/remote-view.tsx
+++ b/frontend/slices/media-viewer/components/remote-view.tsx
@@ -4,7 +4,7 @@ import { useCallback, useEffect, useState } from "react";
import { ChevronLeft, ChevronRight, Download, Music, Pencil } from "lucide-react";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
-import { AppFrame, openWindow, saveAs, usePublishInspector } from "@/features/os-shell";
+import { AppFrame, openWindow, saveAs, usePublishInspector } from "@/features/appshell";
import { rawUrl } from "../lib/host";
import { cn } from "@/lib/utils";
import { editorFor } from "../lib/media";
diff --git a/frontend/slices/media-viewer/components/text-view.tsx b/frontend/slices/media-viewer/components/text-view.tsx
index e21abbd4..96134d94 100644
--- a/frontend/slices/media-viewer/components/text-view.tsx
+++ b/frontend/slices/media-viewer/components/text-view.tsx
@@ -3,7 +3,7 @@
import { useEffect, useState } from "react";
import { Code2, Eye } from "lucide-react";
import { Button } from "@/components/ui/button";
-import { mdToHtml } from "@/features/os-shell";
+import { mdToHtml } from "@/features/appshell";
import { rawUrl } from "../lib/host";
import type { ViewKind } from "../lib/kinds";
diff --git a/frontend/slices/media-viewer/components/viewer-toolbar.tsx b/frontend/slices/media-viewer/components/viewer-toolbar.tsx
index 96f8403e..24096f55 100644
--- a/frontend/slices/media-viewer/components/viewer-toolbar.tsx
+++ b/frontend/slices/media-viewer/components/viewer-toolbar.tsx
@@ -16,7 +16,7 @@ import {
TooltipContent,
TooltipTrigger,
} from "@/components/ui/tooltip";
-import { openWindow } from "@/features/os-shell";
+import { openWindow } from "@/features/appshell";
import { cn } from "@/lib/utils";
import type { Sample } from "../lib/samples";
import { editorFor } from "../lib/media";
diff --git a/frontend/slices/media-viewer/index.ts b/frontend/slices/media-viewer/index.ts
index 853cb539..71cec01b 100644
--- a/frontend/slices/media-viewer/index.ts
+++ b/frontend/slices/media-viewer/index.ts
@@ -1,5 +1,5 @@
import { Eye } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: app layer imports only this descriptor. The component is lazy-loaded
// via `load`. noDock — opened from the launcher, not pinned to the dock.
diff --git a/frontend/slices/media-viewer/lib/host.ts b/frontend/slices/media-viewer/lib/host.ts
index abdc7c72..15654527 100644
--- a/frontend/slices/media-viewer/lib/host.ts
+++ b/frontend/slices/media-viewer/lib/host.ts
@@ -1,7 +1,8 @@
// Single host seam — re-exports the mso raw-bytes URL helper via the shell
// barrel (a legal alias). Lifting the slice swaps this file for an injected one;
// no other file in the slice imports host I/O directly.
-export { rawUrl, useOsApi } from "@/features/os-shell";
+export { useOsApi } from "@/features/appshell";
+export { rawUrl } from "@/lib/os-api";
// Pure string math, not host I/O — same category as `cn`, so it comes straight
// from lib rather than through the seam above (and keeps a plain helper module
// out of the shell barrel's module graph).
diff --git a/frontend/slices/os-settings/app.tsx b/frontend/slices/os-settings/app.tsx
index 7b98e406..f352e860 100644
--- a/frontend/slices/os-settings/app.tsx
+++ b/frontend/slices/os-settings/app.tsx
@@ -7,7 +7,7 @@ import {
useActiveShell,
usePublishInspector,
toast,
-} from "@/features/os-shell";
+} from "@/features/appshell";
import type { SectionId } from "./lib/sections";
import { SettingsShell } from "./components/settings-shell";
diff --git a/frontend/slices/os-settings/components/a2a-section.tsx b/frontend/slices/os-settings/components/a2a-section.tsx
index 2183b1b0..abf1ed57 100644
--- a/frontend/slices/os-settings/components/a2a-section.tsx
+++ b/frontend/slices/os-settings/components/a2a-section.tsx
@@ -3,7 +3,7 @@
import { useCallback, useEffect, useState } from "react";
import { Network } from "lucide-react";
import { SettingsBlock, SettingsSection } from "@/features/shell-settings";
-import { toast } from "@/features/os-shell";
+import { toast } from "@/features/appshell";
import { IS_DEMO } from "@/lib/demo";
import { A2AActivitySettings } from "./a2a-activity-settings";
import { A2AInboundSettings } from "./a2a-inbound-settings";
diff --git a/frontend/slices/os-settings/components/about-section.tsx b/frontend/slices/os-settings/components/about-section.tsx
index fa9d038c..1167ea39 100644
--- a/frontend/slices/os-settings/components/about-section.tsx
+++ b/frontend/slices/os-settings/components/about-section.tsx
@@ -3,8 +3,9 @@
import { useEffect, useState } from "react";
import { Info, RotateCcw } from "lucide-react";
import { Button } from "@/components/ui/button";
-import { FormDrawer } from "@/features/os-shell";
-import { useOsApi, fmtGiB, fmtUptime, type SysStats, type FsUsage } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
+import { useOsApi, type SysStats, type FsUsage } from "@/features/appshell";
+import { fmtGiB, fmtUptime } from "@/lib/os-api/format";
import { useAppearance, effectiveServerTarget } from "@/lib/appearance";
import { IS_DEMO } from "@/lib/demo";
import { SettingsSection, SettingsValueRow, SettingsActionRow } from "@/features/shell-settings";
diff --git a/frontend/slices/os-settings/components/ai-section.tsx b/frontend/slices/os-settings/components/ai-section.tsx
index 1d18b88f..05a21da8 100644
--- a/frontend/slices/os-settings/components/ai-section.tsx
+++ b/frontend/slices/os-settings/components/ai-section.tsx
@@ -2,7 +2,7 @@
import { useCallback, useEffect, useState } from "react";
import { Sparkles, Check } from "lucide-react";
-import { toast } from "@/features/os-shell";
+import { toast } from "@/features/appshell";
import { Input } from "@/components/ui/input";
import {
Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectTrigger, SelectValue,
diff --git a/frontend/slices/os-settings/components/appearance-section.tsx b/frontend/slices/os-settings/components/appearance-section.tsx
index 134817b2..6c8667fe 100644
--- a/frontend/slices/os-settings/components/appearance-section.tsx
+++ b/frontend/slices/os-settings/components/appearance-section.tsx
@@ -14,7 +14,7 @@ import {
type Wallpaper,
} from "@/lib/appearance";
import { ImagePickerButton, imageStyle, type ImageValue } from "@/features/image-picker";
-import { setShell, shellsForSurface, useShellPrefs, useActiveShell, useDockPrefs, setDockPrefs, type ShellId, type DockSize } from "@/features/os-shell";
+import { setShell, shellsForSurface, useShellPrefs, useActiveShell, useDockPrefs, setDockPrefs, type ShellId, type DockSize } from "@/features/appshell";
import { SettingsRow as Row, SettingsSection as Section, SettingsBlock } from "@/features/shell-settings";
import { LiveWallpaperRows } from "./live-wallpaper-rows";
import { PerShellWallpaper } from "./per-shell-wallpaper";
diff --git a/frontend/slices/os-settings/components/backup-section.tsx b/frontend/slices/os-settings/components/backup-section.tsx
index 30aaffd2..836f564e 100644
--- a/frontend/slices/os-settings/components/backup-section.tsx
+++ b/frontend/slices/os-settings/components/backup-section.tsx
@@ -3,7 +3,7 @@
import { useRef, useState } from "react";
import { AlertTriangle, Download, DatabaseBackup, Upload } from "lucide-react";
import { Button } from "@/components/ui/button";
-import { collectLocalState, FormDrawer, localStateFilename, parseLocalState, restoreLocalState, saveAs, type LocalStateBlob } from "@/features/os-shell";
+import { collectLocalState, FormDrawer, localStateFilename, parseLocalState, restoreLocalState, saveAs, type LocalStateBlob } from "@/features/appshell";
import { SettingsSection, SettingsActionRow, SettingsBlock } from "@/features/shell-settings";
import pkg from "../../../../package.json";
diff --git a/frontend/slices/os-settings/components/custom-provider-form.tsx b/frontend/slices/os-settings/components/custom-provider-form.tsx
index ed02e35c..4779d5bc 100644
--- a/frontend/slices/os-settings/components/custom-provider-form.tsx
+++ b/frontend/slices/os-settings/components/custom-provider-form.tsx
@@ -1,7 +1,7 @@
"use client";
import { useState } from "react";
-import { toast } from "@/features/os-shell";
+import { toast } from "@/features/appshell";
import { Input } from "@/components/ui/input";
import { Textarea } from "@/components/ui/textarea";
import { Button } from "@/components/ui/button";
diff --git a/frontend/slices/os-settings/components/live-wallpaper-rows.tsx b/frontend/slices/os-settings/components/live-wallpaper-rows.tsx
index e4d2a7dd..89856f9a 100644
--- a/frontend/slices/os-settings/components/live-wallpaper-rows.tsx
+++ b/frontend/slices/os-settings/components/live-wallpaper-rows.tsx
@@ -12,7 +12,7 @@ import { Switch } from "@/components/ui/switch";
import { Textarea } from "@/components/ui/textarea";
import { cn } from "@/lib/utils";
import { LIVE_WALLPAPER_HTML_MAX, useAppearance, type LiveWallpaper } from "@/lib/appearance";
-import { FormDrawer, useWallpapers } from "@/features/os-shell";
+import { FormDrawer, useWallpapers } from "@/features/appshell";
import { SettingsRow as Row } from "@/features/shell-settings";
function Chip({ active, label, onClick }: { active: boolean; label: string; onClick: () => void }) {
diff --git a/frontend/slices/os-settings/components/mcp-section.tsx b/frontend/slices/os-settings/components/mcp-section.tsx
index df7bc52e..79a4d30f 100644
--- a/frontend/slices/os-settings/components/mcp-section.tsx
+++ b/frontend/slices/os-settings/components/mcp-section.tsx
@@ -3,7 +3,7 @@
import { useCallback, useEffect, useState } from "react";
import { Plug } from "lucide-react";
import { SettingsBlock, SettingsSection } from "@/features/shell-settings";
-import { toast } from "@/features/os-shell";
+import { toast } from "@/features/appshell";
import { IS_DEMO } from "@/lib/demo";
import { McpAuditSection, type McpAuditRow } from "./mcp-audit-section";
import { McpConnectionSection } from "./mcp-connection-section";
diff --git a/frontend/slices/os-settings/components/memory-section.tsx b/frontend/slices/os-settings/components/memory-section.tsx
index 359eccb7..a4916089 100644
--- a/frontend/slices/os-settings/components/memory-section.tsx
+++ b/frontend/slices/os-settings/components/memory-section.tsx
@@ -2,7 +2,7 @@
import { useCallback, useEffect, useState } from "react";
import { Brain, Trash2 } from "lucide-react";
-import { toast } from "@/features/os-shell";
+import { toast } from "@/features/appshell";
import { Input } from "@/components/ui/input";
import { Button } from "@/components/ui/button";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
diff --git a/frontend/slices/os-settings/components/model-catalog.tsx b/frontend/slices/os-settings/components/model-catalog.tsx
index 4fcf6a3c..e3f0dee3 100644
--- a/frontend/slices/os-settings/components/model-catalog.tsx
+++ b/frontend/slices/os-settings/components/model-catalog.tsx
@@ -3,7 +3,7 @@
import { useEffect, useMemo, useState } from "react";
import { Input } from "@/components/ui/input";
import { Button } from "@/components/ui/button";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
import { filterAndSortModels, type CatModel, type ModelFilters, type ModelSort } from "./model-catalog-utils";
const fmtCtx = (n?: number) => (!n ? "—" : n >= 1e6 ? `${n / 1e6}M` : n >= 1e3 ? `${Math.round(n / 1e3)}K` : `${n}`);
diff --git a/frontend/slices/os-settings/components/oauth-connect.tsx b/frontend/slices/os-settings/components/oauth-connect.tsx
index ae22f108..954885dd 100644
--- a/frontend/slices/os-settings/components/oauth-connect.tsx
+++ b/frontend/slices/os-settings/components/oauth-connect.tsx
@@ -1,7 +1,7 @@
"use client";
import { useEffect, useRef, useState } from "react";
-import { CopyButton, toast } from "@/features/os-shell";
+import { CopyButton, toast } from "@/features/appshell";
import { Button } from "@/components/ui/button";
// "Sign in with OpenAI" (ChatGPT Codex, device-code). Starts the flow, shows the
diff --git a/frontend/slices/os-settings/components/per-shell-wallpaper.tsx b/frontend/slices/os-settings/components/per-shell-wallpaper.tsx
index 5fae28c9..c4ae0291 100644
--- a/frontend/slices/os-settings/components/per-shell-wallpaper.tsx
+++ b/frontend/slices/os-settings/components/per-shell-wallpaper.tsx
@@ -12,7 +12,7 @@ import {
setShellWallpaper,
useWallpapers,
type ShellId,
-} from "@/features/os-shell";
+} from "@/features/appshell";
import { SettingsRow as Row } from "@/features/shell-settings";
// The static `.wp-*` preset keys with nicer labels than the raw key. Every
diff --git a/frontend/slices/os-settings/components/provider-list.tsx b/frontend/slices/os-settings/components/provider-list.tsx
index 1052893c..991ead37 100644
--- a/frontend/slices/os-settings/components/provider-list.tsx
+++ b/frontend/slices/os-settings/components/provider-list.tsx
@@ -1,6 +1,6 @@
"use client";
-import { toast } from "@/features/os-shell";
+import { toast } from "@/features/appshell";
import { Button } from "@/components/ui/button";
import { Trash2 } from "lucide-react";
diff --git a/frontend/slices/os-settings/components/quicklinks-section.tsx b/frontend/slices/os-settings/components/quicklinks-section.tsx
index 561c3dda..6839cc18 100644
--- a/frontend/slices/os-settings/components/quicklinks-section.tsx
+++ b/frontend/slices/os-settings/components/quicklinks-section.tsx
@@ -4,7 +4,7 @@ import { useState } from "react";
import { ArrowDown, ArrowUp, Globe, Link2, Plus, Trash2 } from "lucide-react";
import { Input } from "@/components/ui/input";
import { Button } from "@/components/ui/button";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
import { useQuicklinks, faviconUrl, normalizeUrl } from "@/lib/quicklinks";
import { SettingsSection, SettingsBlock } from "@/features/shell-settings";
diff --git a/frontend/slices/os-settings/components/sections.tsx b/frontend/slices/os-settings/components/sections.tsx
index 847fb54a..52fbfe10 100644
--- a/frontend/slices/os-settings/components/sections.tsx
+++ b/frontend/slices/os-settings/components/sections.tsx
@@ -4,7 +4,7 @@ import { Lock, ShieldCheck } from "lucide-react";
import { ScrollArea } from "@/components/ui/scroll-area";
import { cn } from "@/lib/utils";
import { DevicesPanel, useSession } from "@/features/auth";
-import { useActiveShell } from "@/features/os-shell";
+import { useActiveShell } from "@/features/appshell";
import { SettingsSection } from "@/features/shell-settings";
import { SECTIONS, type SectionId } from "../lib/sections";
import { AutoLockRow } from "./auto-lock-row";
diff --git a/frontend/slices/os-settings/components/server-section.tsx b/frontend/slices/os-settings/components/server-section.tsx
index 2b861ec8..5ad499b9 100644
--- a/frontend/slices/os-settings/components/server-section.tsx
+++ b/frontend/slices/os-settings/components/server-section.tsx
@@ -13,7 +13,7 @@ import {
type ServerTarget,
type SshServerTarget,
} from "@/lib/appearance";
-import { useOsApi, ResponsiveDialog } from "@/features/os-shell";
+import { useOsApi, ResponsiveDialog } from "@/features/appshell";
import { useSession, LoginCard } from "@/features/auth";
import { IS_DEMO } from "@/lib/demo";
import {
diff --git a/frontend/slices/os-settings/components/settings-shell.tsx b/frontend/slices/os-settings/components/settings-shell.tsx
index 05c9536a..5a03c768 100644
--- a/frontend/slices/os-settings/components/settings-shell.tsx
+++ b/frontend/slices/os-settings/components/settings-shell.tsx
@@ -1,6 +1,6 @@
"use client";
-import { AppFrame, usePublishMobileNavigation, useShellDesign } from "@/features/os-shell";
+import { AppFrame, usePublishMobileNavigation, useShellDesign } from "@/features/appshell";
import type { SectionId } from "../lib/sections";
import { settingsSection } from "../lib/sections";
import { SettingsSidebar, SettingsTabs } from "./nav";
diff --git a/frontend/slices/os-settings/components/theme-mode-picker.tsx b/frontend/slices/os-settings/components/theme-mode-picker.tsx
index defd9d52..80b966a0 100644
--- a/frontend/slices/os-settings/components/theme-mode-picker.tsx
+++ b/frontend/slices/os-settings/components/theme-mode-picker.tsx
@@ -2,7 +2,7 @@
import { Check } from "lucide-react";
import { cn } from "@/lib/utils";
-import { useShellDesign } from "@/features/os-shell";
+import { useShellDesign } from "@/features/appshell";
import type { Theme } from "@/lib/appearance";
function PhonePreview({ mode, family }: { mode: Theme; family: "apple" | "material" }) {
diff --git a/frontend/slices/os-settings/components/theme-section.tsx b/frontend/slices/os-settings/components/theme-section.tsx
index 00ffeb95..1eeb25d8 100644
--- a/frontend/slices/os-settings/components/theme-section.tsx
+++ b/frontend/slices/os-settings/components/theme-section.tsx
@@ -22,7 +22,7 @@ import {
SettingsBlock,
} from "@/features/shell-settings";
import { cn } from "@/lib/utils";
-import { useShellDesign } from "@/features/os-shell";
+import { useShellDesign } from "@/features/appshell";
import { ThemeModePicker } from "./theme-mode-picker";
function PresetChip({ preset, active, onSelect }: { preset: PresetItem; active: boolean; onSelect: () => void }) {
diff --git a/frontend/slices/os-settings/components/update-notes.tsx b/frontend/slices/os-settings/components/update-notes.tsx
index 1d7322d6..d487b132 100644
--- a/frontend/slices/os-settings/components/update-notes.tsx
+++ b/frontend/slices/os-settings/components/update-notes.tsx
@@ -3,7 +3,7 @@
import { useEffect, useMemo, useState } from "react";
import { GitCommitHorizontal } from "lucide-react";
import { ScrollArea } from "@/components/ui/scroll-area";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
import type { UpdateCommit } from "@/lib/host/self-update";
import { parseChangelog } from "../lib/changelog";
import { ChangelogView } from "./changelog-view";
diff --git a/frontend/slices/os-settings/components/update-section.tsx b/frontend/slices/os-settings/components/update-section.tsx
index 0f455cc0..079920d4 100644
--- a/frontend/slices/os-settings/components/update-section.tsx
+++ b/frontend/slices/os-settings/components/update-section.tsx
@@ -4,7 +4,7 @@ import { useCallback, useEffect, useState } from "react";
import { ArrowDownToLine, BookOpen, CheckCircle2, RefreshCw, Search } from "lucide-react";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
import { SettingsSection, SettingsActionRow, SettingsBlock } from "@/features/shell-settings";
import { IS_DEMO } from "@/lib/demo";
import type { UpdateStatus } from "@/lib/host/self-update";
diff --git a/frontend/slices/os-settings/index.ts b/frontend/slices/os-settings/index.ts
index fb6c345a..f45b6fdb 100644
--- a/frontend/slices/os-settings/index.ts
+++ b/frontend/slices/os-settings/index.ts
@@ -1,5 +1,5 @@
import { Settings } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: the only thing the app layer imports. Exposes the app descriptor;
// the component itself is lazy-loaded via `load` so its bundle is deferred.
diff --git a/frontend/slices/os-shell/index.ts b/frontend/slices/os-shell/index.ts
index 14f0deb8..90baa06f 100644
--- a/frontend/slices/os-shell/index.ts
+++ b/frontend/slices/os-shell/index.ts
@@ -1,18 +1,6 @@
-// os-shell — the mso (MSO) consumer of the generic AppShell framework.
-//
-// The shell runtime, registries, responsive provider, chrome and primitives now
-// live in the brand-free `appshell` slice (lift-ready for rr). This barrel stays
-// the STABLE public surface every app slice imports from (`@/features/os-shell`),
-// re-exporting appshell verbatim so app slices need no edits. mso-specific
-// wiring (brand + apps + features) lives in `./shell.manifest.ts` (added in a
-// later phase) and is passed to <AppShell manifest=…>.
-export * from "@/features/appshell";
-// Bridge mso-specific host helpers (raw-bytes URL + byte/uptime formatters)
-// into the stable barrel so app slices reach them via @/features/os-shell (a
-// legal peer alias) rather than @/lib/os-api directly. The OsApi port + hook
-// already flow through the appshell re-export above.
-export { rawUrl, zipUrl } from "@/lib/os-api";
-export * from "@/lib/os-api/format";
+// MSO-specific composition surface. Generic shell/runtime APIs belong to
+// @/features/appshell; this module owns only the MSO brand, manifest additions
+// and capability adapters that compose that framework into the product.
export {
TOPSIDE_BRAND,
TOPSIDE_FEATURES,
@@ -21,10 +9,7 @@ export {
} from "./shell.manifest";
export { topsideCapabilities } from "./capabilities";
export { A11yCommands } from "./a11y-commands";
-// Dashboard shell now lives in the brand-free framework (appshell) and is
-// surfaced by the `export * from "@/features/appshell"` above (it self-registers
-// on import there). App slices that referenced DashboardShell via
-// @/features/os-shell keep working unchanged.
-// Built-in live wallpapers (Drift / Starfield) — register into the appshell
-// wallpaper registry on import; Settings lists them via useWallpapers().
+
+// Built-in live wallpapers are MSO registrations into the generic AppShell
+// registry. Importing the composition surface performs that registration once.
import "./live-wallpapers";
diff --git a/frontend/slices/os-terminal/claude-code.tsx b/frontend/slices/os-terminal/claude-code.tsx
index b407738c..3c1d4a0b 100644
--- a/frontend/slices/os-terminal/claude-code.tsx
+++ b/frontend/slices/os-terminal/claude-code.tsx
@@ -1,7 +1,7 @@
"use client";
import { Terminal } from "./app";
-import type { AppProps } from "@/features/os-shell";
+import type { AppProps } from "@/features/appshell";
const BASE = "claude --dangerously-skip-permissions";
diff --git a/frontend/slices/os-terminal/index.ts b/frontend/slices/os-terminal/index.ts
index 7a8efca5..d63e9006 100644
--- a/frontend/slices/os-terminal/index.ts
+++ b/frontend/slices/os-terminal/index.ts
@@ -1,6 +1,6 @@
import { lazy } from "react";
import { SquareTerminal, Bot } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// LAZY, not a plain re-export. shell.manifest.ts imports this barrel eagerly to read
// the two AppDescriptors below, so `export { Terminal } from "./app"` pulled ./app —
diff --git a/frontend/slices/os-terminal/lib/host.ts b/frontend/slices/os-terminal/lib/host.ts
index a59a27d6..532ad6e9 100644
--- a/frontend/slices/os-terminal/lib/host.ts
+++ b/frontend/slices/os-terminal/lib/host.ts
@@ -5,8 +5,8 @@
// copy replaces this file with a self-contained version (injectable
// TerminalOsApi + no-op inspector) — every other file is line-identical.
-export type { AppDescriptor } from "@/features/os-shell";
-export { usePublishInspector } from "@/features/os-shell";
-export { useOsApi, type FsEntry } from "@/features/os-shell";
-export type { OsApi as TerminalOsApi } from "@/features/os-shell";
-export { fmtGiBPair, fmtUptime } from "@/features/os-shell";
+export type { AppDescriptor } from "@/features/appshell";
+export { usePublishInspector } from "@/features/appshell";
+export { useOsApi, type FsEntry } from "@/features/appshell";
+export type { OsApi as TerminalOsApi } from "@/features/appshell";
+export { fmtGiBPair, fmtUptime } from "@/lib/os-api/format";
diff --git a/frontend/slices/quicklinks/app.tsx b/frontend/slices/quicklinks/app.tsx
index fca07f79..adc7053e 100644
--- a/frontend/slices/quicklinks/app.tsx
+++ b/frontend/slices/quicklinks/app.tsx
@@ -1,7 +1,7 @@
"use client";
import { Globe, Link2 } from "lucide-react";
-import { AppFrame } from "@/features/os-shell";
+import { AppFrame } from "@/features/appshell";
import { useQuicklinks, faviconUrl, openQuicklink } from "@/lib/quicklinks";
// Dedicated Quicklinks window: a grid of favicon tiles, click opens a new tab.
diff --git a/frontend/slices/quicklinks/index.ts b/frontend/slices/quicklinks/index.ts
index 5d941841..474629cb 100644
--- a/frontend/slices/quicklinks/index.ts
+++ b/frontend/slices/quicklinks/index.ts
@@ -1,5 +1,5 @@
import { Link2 } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: the app layer imports only this. The window component is lazy-loaded
// via `load` so its bundle is deferred until the Quicklinks window opens.
diff --git a/frontend/slices/reel-editor/components/file-browser.tsx b/frontend/slices/reel-editor/components/file-browser.tsx
index df105e06..2448985a 100644
--- a/frontend/slices/reel-editor/components/file-browser.tsx
+++ b/frontend/slices/reel-editor/components/file-browser.tsx
@@ -2,7 +2,7 @@
import { useCallback, useEffect, useState } from "react";
import { Folder, FileVideo, FileAudio, FileImage, CornerLeftUp, Loader2 } from "lucide-react";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
import { Button } from "@/components/ui/button";
import { cn } from "@/lib/utils";
import { useOsApi, type FsEntry, type FsList } from "../lib/host";
diff --git a/frontend/slices/reel-editor/components/settings-dialog.tsx b/frontend/slices/reel-editor/components/settings-dialog.tsx
index ca795a50..1ddd434e 100644
--- a/frontend/slices/reel-editor/components/settings-dialog.tsx
+++ b/frontend/slices/reel-editor/components/settings-dialog.tsx
@@ -1,7 +1,7 @@
"use client";
import { useState } from "react";
-import { FormDrawer } from "@/features/os-shell";
+import { FormDrawer } from "@/features/appshell";
import { Button } from "@/components/ui/button";
import { Slider } from "@/components/ui/slider";
import { cn } from "@/lib/utils";
diff --git a/frontend/slices/reel-editor/lib/host.ts b/frontend/slices/reel-editor/lib/host.ts
index 83214f90..6f3733a2 100644
--- a/frontend/slices/reel-editor/lib/host.ts
+++ b/frontend/slices/reel-editor/lib/host.ts
@@ -12,9 +12,10 @@ export {
clearActivity,
useContainer,
type AppDescriptor,
-} from "@/features/os-shell";
+} from "@/features/appshell";
-export { useOsApi, rawUrl, type FsEntry, type FsList } from "@/features/os-shell";
+export { useOsApi, type FsEntry, type FsList } from "@/features/appshell";
+export { rawUrl } from "@/lib/os-api";
export { useIsMobile } from "@/hooks/use-mobile";
diff --git a/frontend/slices/system-monitor/components/host-frame.tsx b/frontend/slices/system-monitor/components/host-frame.tsx
index 65e1cd23..b0f12d99 100644
--- a/frontend/slices/system-monitor/components/host-frame.tsx
+++ b/frontend/slices/system-monitor/components/host-frame.tsx
@@ -1,4 +1,4 @@
"use client";
// mso seam: the shell's AppFrame + TouchList. rr ships slice-local shims.
-export { AppFrame, TouchList } from "@/features/os-shell";
+export { AppFrame, TouchList } from "@/features/appshell";
diff --git a/frontend/slices/system-monitor/components/services-panel.tsx b/frontend/slices/system-monitor/components/services-panel.tsx
index eecbb6d4..74f45a17 100644
--- a/frontend/slices/system-monitor/components/services-panel.tsx
+++ b/frontend/slices/system-monitor/components/services-panel.tsx
@@ -5,7 +5,7 @@ import { AlertCircle, FileText, Loader2, Play, RotateCw, Search, Square } from "
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Badge } from "@/components/ui/badge";
-import { FormDrawer, toast } from "@/features/os-shell";
+import { FormDrawer, toast } from "@/features/appshell";
import { GlassPanel } from "./glass-panel";
import { useOsApi, type ServiceAction, type ServiceInventory, type ServiceLogs, type SystemService } from "../lib/host";
diff --git a/frontend/slices/system-monitor/index.ts b/frontend/slices/system-monitor/index.ts
index e2d6595b..e3c06ecb 100644
--- a/frontend/slices/system-monitor/index.ts
+++ b/frontend/slices/system-monitor/index.ts
@@ -1,5 +1,5 @@
import { Activity } from "lucide-react";
-import type { AppDescriptor } from "@/features/os-shell";
+import type { AppDescriptor } from "@/features/appshell";
// Barrel: the only thing the app layer imports. Exposes the app descriptor;
// the component itself is lazy-loaded via `load` so its bundle is deferred.
diff --git a/frontend/slices/system-monitor/lib/format.ts b/frontend/slices/system-monitor/lib/format.ts
index 6f858d87..d83227ab 100644
--- a/frontend/slices/system-monitor/lib/format.ts
+++ b/frontend/slices/system-monitor/lib/format.ts
@@ -9,4 +9,4 @@ export {
fmtMBs,
clampPct,
fmtUptime,
-} from "@/features/os-shell";
+} from "@/lib/os-api/format";
diff --git a/frontend/slices/system-monitor/lib/host.ts b/frontend/slices/system-monitor/lib/host.ts
index 5f7a1d99..c8a7b381 100644
--- a/frontend/slices/system-monitor/lib/host.ts
+++ b/frontend/slices/system-monitor/lib/host.ts
@@ -5,8 +5,8 @@
// copy replaces this file with a self-contained version (injectable
// SysMonAdapter + no-op inspector) — every other file is line-identical.
-export type { AppDescriptor } from "@/features/os-shell";
-export { usePublishInspector } from "@/features/os-shell";
+export type { AppDescriptor } from "@/features/appshell";
+export { usePublishInspector } from "@/features/appshell";
export {
useOsApi,
type SysStats,
@@ -18,7 +18,7 @@ export {
type ServiceInventory,
type ServiceLogs,
type PackageUpdateSummary,
-} from "@/features/os-shell";
-export { useResponsive, ResponsiveToolbar } from "@/features/os-shell";
-export type { ToolbarItem } from "@/features/os-shell";
-export { useActiveShell } from "@/features/os-shell";
+} from "@/features/appshell";
+export { useResponsive, ResponsiveToolbar } from "@/features/appshell";
+export type { ToolbarItem } from "@/features/appshell";
+export { useActiveShell } from "@/features/appshell";
diff --git a/lib/host/index.ts b/lib/host/index.ts
index 03b80cfe..981a3846 100644
--- a/lib/host/index.ts
+++ b/lib/host/index.ts
@@ -16,8 +16,10 @@ export { projectGitSnapshot, projectGitEdits, projectGitDiff, readProjectKnowled
export { projectCapabilities, runProjectFunction, readProjectMcpServers, publicProjectMcpServers, listProjectMcpTools, callProjectMcpTool } from "./project-capabilities";
export { listProjectConvexTools, callProjectConvexTool, PROJECT_CONVEX_READ_TOOLS, PROJECT_CONVEX_WRITE_TOOLS } from "./project-convex";
export type { ProjectCapabilities, PublicProjectFunction } from "./project-capabilities";
-export { listProjects, listProjectDirs, projectRoots, PROJECT_LIMITS } from "./project-roots";
-export type { ProjectRow, ListProjectsResult } from "./project-roots";
+export { listProjectDirs, projectRoots, PROJECT_LIMITS } from "./project-roots";
+export type { ProjectRow } from "./project-roots";
+export { listProjects } from "./project-list";
+export type { ListProjectsResult } from "./project-list";
export { normalizeProjectKey, projectAliasesFor, projectAliasTarget } from "./project-aliases";
export type { ProjectResolution } from "./projects";
export { openPty, attachPty, writePty, resizePty, closePty, hasPty } from "./pty";
diff --git a/lib/host/project-containment.test.ts b/lib/host/project-containment.test.ts
index 51328791..b9af3811 100644
--- a/lib/host/project-containment.test.ts
+++ b/lib/host/project-containment.test.ts
@@ -10,8 +10,9 @@ const base = await fs.mkdtemp(path.join(os.tmpdir(), "mso-contain-"));
const previous = process.env.OS_FS_READ_ROOTS;
const {
- authorizedRoots, listProjectDirs, listProjects, projectContainers, projectRoots, PROJECT_LIMITS,
+ authorizedRoots, listProjectDirs, projectContainers, projectRoots, PROJECT_LIMITS,
} = await import("./project-roots");
+const { listProjects } = await import("./project-list");
const setRoots = (...roots: string[]) => { process.env.OS_FS_READ_ROOTS = roots.join(":"); };
diff --git a/lib/host/project-continuation.test.ts b/lib/host/project-continuation.test.ts
index c4974883..eb0f0692 100644
--- a/lib/host/project-continuation.test.ts
+++ b/lib/host/project-continuation.test.ts
@@ -8,7 +8,8 @@ import path from "path";
// on the second call while insisting there was more.
const base = await fs.mkdtemp(path.join(os.tmpdir(), "mso-cont-"));
const previous = process.env.OS_FS_READ_ROOTS;
-const { listProjects, PROJECT_LIMITS } = await import("./project-roots");
+const { listProjects } = await import("./project-list");
+const { PROJECT_LIMITS } = await import("./project-roots");
const setRoots = (...roots: string[]) => { process.env.OS_FS_READ_ROOTS = roots.join(":"); };
afterAll(async () => {
diff --git a/lib/host/project-roots.ts b/lib/host/project-roots.ts
index 60578453..f5ec6607 100644
--- a/lib/host/project-roots.ts
+++ b/lib/host/project-roots.ts
@@ -182,6 +182,3 @@ export async function listProjectDirs(cursor?: ScanCursor): Promise<ProjectDirs>
const startIndex = cursor?.rootIndex ?? 0;
return listProjectDirsIn(await projectContainers(startIndex), { cursor, startIndex });
}
-
-export { listProjects } from "./project-list";
-export type { ListProjectsResult } from "./project-list";