@fungi.computer/tourtois 0.12.2 → 0.12.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -24,6 +24,8 @@ export type AppWorkbenchProps = Readonly<{
24
24
  initialFocusId?: string;
25
25
  onLayoutChange?: ((tiled: boolean) => void) | undefined;
26
26
  extraLaunchers?: readonly AppBarItem[];
27
+ /** The Settings sections the host backs; absent means every section. */
28
+ settingsSections?: readonly string[] | undefined;
27
29
  settingsLaunchers?: readonly Readonly<{
28
30
  id: string;
29
31
  label: string;
@@ -41,4 +43,4 @@ export type AppWorkbenchProps = Readonly<{
41
43
  desktopMethods: DesktopMethods;
42
44
  gills: DesktopGillTransport;
43
45
  }>;
44
- export declare function AppWorkbench({ paneLayerRef, phone, teamId, teamName, initialComputerId, computers, computersUnavailable, extraPanes, initialFocusId, onLayoutChange, extraLaunchers, settingsLaunchers, systemMenuItems, directoryReader, takeAppOpenRequest, platform, desktopStorage, desktopMethods, gills, }: AppWorkbenchProps): import("react/jsx-runtime").JSX.Element;
46
+ export declare function AppWorkbench({ paneLayerRef, phone, teamId, teamName, initialComputerId, computers, computersUnavailable, extraPanes, initialFocusId, onLayoutChange, extraLaunchers, settingsLaunchers, settingsSections, systemMenuItems, directoryReader, takeAppOpenRequest, platform, desktopStorage, desktopMethods, gills, }: AppWorkbenchProps): import("react/jsx-runtime").JSX.Element;
@@ -35,9 +35,7 @@ const emptyAppBarLabel = (loading, failed) => {
35
35
  return "Apps will appear here when available.";
36
36
  };
37
37
  /** "Edit avatar…" exists only where the host backs avatar Settings. */
38
- const avatarMenuAction = (platform, open) => platform.sections === undefined || platform.sections.includes("avatar")
39
- ? open
40
- : undefined;
38
+ const avatarMenuAction = (sections, open) => sections === undefined || sections.includes("avatar") ? open : undefined;
41
39
  /** Choosing Floating with nothing open would otherwise show no change. */
42
40
  function announceFloating(tiled, projection) {
43
41
  if (!tiled && !hasVisibleAppWindows(projection))
@@ -79,7 +77,7 @@ function phoneShowDesktop(phone, covered, host, onFailure) {
79
77
  });
80
78
  };
81
79
  }
82
- export function AppWorkbench({ paneLayerRef, phone, teamId, teamName, initialComputerId, computers, computersUnavailable, extraPanes, initialFocusId, onLayoutChange, extraLaunchers = [], settingsLaunchers = [], systemMenuItems, directoryReader, takeAppOpenRequest, platform, desktopStorage, desktopMethods, gills, }) {
80
+ export function AppWorkbench({ paneLayerRef, phone, teamId, teamName, initialComputerId, computers, computersUnavailable, extraPanes, initialFocusId, onLayoutChange, extraLaunchers = [], settingsLaunchers = [], settingsSections, systemMenuItems, directoryReader, takeAppOpenRequest, platform, desktopStorage, desktopMethods, gills, }) {
83
81
  const setSettingsLocation = platform.openSettings;
84
82
  const [appDialOpen, setAppDialOpen] = useState(false);
85
83
  // The Layout menu's "Arrange desktop" command and the desktop's own
@@ -144,7 +142,7 @@ export function AppWorkbench({ paneLayerRef, phone, teamId, teamName, initialCom
144
142
  else
145
143
  toast(message, notice);
146
144
  }, [appStatus]);
147
- const editAvatar = avatarMenuAction(platform, () => {
145
+ const editAvatar = avatarMenuAction(settingsSections, () => {
148
146
  menuAction(() => {
149
147
  setSettingsLocation({ category: "avatar" });
150
148
  });
@@ -14,6 +14,8 @@ export type TeamTourtoisProps = Readonly<{
14
14
  children?: ReactNode;
15
15
  teamName?: string;
16
16
  extraLaunchers?: readonly AppBarItem[];
17
+ /** The Settings sections the host backs; absent means every section. */
18
+ settingsSections?: readonly string[] | undefined;
17
19
  settingsLaunchers?: readonly Readonly<{
18
20
  id: string;
19
21
  label: string;
@@ -33,4 +35,4 @@ export type TeamTourtoisProps = Readonly<{
33
35
  desktopMethods: DesktopMethods;
34
36
  gills: DesktopGillTransport;
35
37
  }>;
36
- export declare function TeamTourtois({ children, teamId, teamName, extraLaunchers, settingsLaunchers, systemMenuItems, computersReader, directoryReader, takeAppOpenRequest, platform, desktopStorage, desktopMethods, gills, }: TeamTourtoisProps): import("react/jsx-runtime").JSX.Element;
38
+ export declare function TeamTourtois({ children, teamId, teamName, extraLaunchers, settingsLaunchers, settingsSections, systemMenuItems, computersReader, directoryReader, takeAppOpenRequest, platform, desktopStorage, desktopMethods, gills, }: TeamTourtoisProps): import("react/jsx-runtime").JSX.Element;
@@ -26,7 +26,7 @@ function useWorkbenchBounds() {
26
26
  }, []);
27
27
  return { bounds, ref };
28
28
  }
29
- export function TeamTourtois({ children, teamId, teamName, extraLaunchers, settingsLaunchers, systemMenuItems, computersReader, directoryReader, takeAppOpenRequest, platform, desktopStorage, desktopMethods, gills, }) {
29
+ export function TeamTourtois({ children, teamId, teamName, extraLaunchers, settingsLaunchers, settingsSections, systemMenuItems, computersReader, directoryReader, takeAppOpenRequest, platform, desktopStorage, desktopMethods, gills, }) {
30
30
  const { bounds, ref: paneLayerRef } = useWorkbenchBounds();
31
31
  const phone = bounds.width <= 540;
32
32
  const [tiled, setTiled] = useState(true);
@@ -36,5 +36,5 @@ export function TeamTourtois({ children, teamId, teamName, extraLaunchers, setti
36
36
  });
37
37
  return (_jsx("main", { className: "tourtois-shell", "data-tourtois-shell": true, children: _jsxs(TourtoisLayers, { children: [_jsx("div", { className: "tourtois-workbench", children: _jsx(MaosaicoRoot, { bounds: bounds, containerRef: paneLayerRef, tiling: tiled || phone
38
38
  ? { mainSize: Math.max(0, Math.min(640, bounds.width)), gap: 8 }
39
- : undefined, children: _jsx(WelcomeProvider, { teamId: teamId, storage: desktopStorage, children: _jsx(AppWorkbench, { paneLayerRef: paneLayerRef, phone: phone, teamId: teamId, teamName: teamName ?? teamId, initialComputerId: data?.[0]?.computerId ?? null, computers: data ?? [], computersUnavailable: isLoading || isError, onLayoutChange: phone ? undefined : setTiled, platform: platform, desktopStorage: desktopStorage, desktopMethods: desktopMethods, gills: gills, ...(extraLaunchers ? { extraLaunchers } : {}), ...(settingsLaunchers ? { settingsLaunchers } : {}), ...(systemMenuItems ? { systemMenuItems } : {}), directoryReader: directoryReader, ...(takeAppOpenRequest ? { takeAppOpenRequest } : {}) }) }) }) }), children] }) }));
39
+ : undefined, children: _jsx(WelcomeProvider, { teamId: teamId, storage: desktopStorage, children: _jsx(AppWorkbench, { paneLayerRef: paneLayerRef, phone: phone, teamId: teamId, teamName: teamName ?? teamId, initialComputerId: data?.[0]?.computerId ?? null, computers: data ?? [], computersUnavailable: isLoading || isError, onLayoutChange: phone ? undefined : setTiled, platform: platform, desktopStorage: desktopStorage, desktopMethods: desktopMethods, gills: gills, ...(extraLaunchers ? { extraLaunchers } : {}), ...(settingsLaunchers ? { settingsLaunchers } : {}), settingsSections: settingsSections, ...(systemMenuItems ? { systemMenuItems } : {}), directoryReader: directoryReader, ...(takeAppOpenRequest ? { takeAppOpenRequest } : {}) }) }) }) }), children] }) }));
40
40
  }
@@ -11,6 +11,7 @@ import { SetupNotice } from "@fungi.computer/caps/blocks/setup-notice";
11
11
  import { FailureLine } from "@fungi.computer/caps/components/failure-line";
12
12
  import { Badge } from "@fungi.computer/caps/components/badge";
13
13
  import { Loader } from "@fungi.computer/caps/components/loader";
14
+ import { starterItem } from "./starter-item.js";
14
15
  import { GillFrame } from "./gill-frame.js";
15
16
  import { FirstRunWelcome, useWelcome } from "./welcome.js";
16
17
  import { LoadingState } from "@fungi.computer/caps/blocks/loading-state";
@@ -29,9 +30,12 @@ export function LauncherGill({ items, size = "M", onAllApps, loading = false, un
29
30
  ...shown.filter((item) => stateFor(item.id) === "Pinned"),
30
31
  ...shown.filter((item) => stateFor(item.id) !== "Pinned"),
31
32
  ];
32
- const needsRuntime = new Set(installing
33
- .filter((entry) => entry.state === "needs-runtime")
34
- .map((entry) => `app:${entry.installationId}`));
33
+ const needsRuntime = new Set(installing.flatMap((entry) => {
34
+ const found = entry.state === "needs-runtime"
35
+ ? starterItem(items, entry.installationId)
36
+ : undefined;
37
+ return found ? [found.id] : [];
38
+ }));
35
39
  const tiles = ordered.map((item) => {
36
40
  const tile = {
37
41
  id: item.id,
@@ -71,7 +75,7 @@ export function LauncherGill({ items, size = "M", onAllApps, loading = false, un
71
75
  icon: _jsx(Sigil, { name: "allApps" }),
72
76
  onSelect: onAllApps,
73
77
  },
74
- ], size: "lg" }), _jsx("div", { className: "tourtois-install-notes", children: installing.map((entry) => entry.state === "installing" ? null : (_jsx(InstallNote, { entry: entry, onRetry: onRetryInstall, onOpen: items.find((item) => item.id === `app:${entry.installationId}`)?.onSelect }, entry.installationId))) }), _jsx("div", { className: "tourtois-launcher-more", children: _jsxs(Button, { size: "sm", variant: "ghost", onClick: () => {
78
+ ], size: "lg" }), _jsx("div", { className: "tourtois-install-notes", children: installing.map((entry) => entry.state === "installing" ? null : (_jsx(InstallNote, { entry: entry, onRetry: onRetryInstall, onOpen: starterItem(items, entry.installationId)?.onSelect }, entry.installationId))) }), _jsx("div", { className: "tourtois-launcher-more", children: _jsxs(Button, { size: "sm", variant: "ghost", onClick: () => {
75
79
  window.open(installDocs, "_blank", "noopener,noreferrer");
76
80
  }, children: ["More Apps", _jsx(ExternalLink, { "aria-hidden": "true", size: 14 })] }) }), editing ? (_jsx(DataList, { "aria-label": "Launcher preferences", children: items.map((item) => (_jsx(DataRow, { children: _jsxs("div", { className: "tourtois-launcher-preference", children: [_jsx("span", { "aria-hidden": "true", className: "grid size-6 place-items-center [&_svg]:size-full", children: item.icon ?? _jsx(Sigil, { name: "installApps" }) }), _jsx("div", { className: "tourtois-launcher-preference-identity", children: _jsx("span", { children: item.label }) }), _jsxs(Select, { "aria-label": `Launcher state for ${item.label}`, value: stateFor(item.id), onChange: (event) => {
77
81
  const value = event.currentTarget.value;
@@ -0,0 +1,7 @@
1
+ import type { AppBarItem } from "@fungi.computer/caps/blocks/app-bar";
2
+ /**
3
+ * The launcher item for an installed starter App. A host names a surface by its
4
+ * address key (`installation:<id>`), so the item id is `app:installation:<id>`;
5
+ * the workbench stories name theirs by the bare App id.
6
+ */
7
+ export declare function starterItem(items: readonly AppBarItem[], installationId: string): AppBarItem | undefined;
@@ -0,0 +1,9 @@
1
+ /**
2
+ * The launcher item for an installed starter App. A host names a surface by its
3
+ * address key (`installation:<id>`), so the item id is `app:installation:<id>`;
4
+ * the workbench stories name theirs by the bare App id.
5
+ */
6
+ export function starterItem(items, installationId) {
7
+ return (items.find((item) => item.id === `app:installation:${installationId}`) ??
8
+ items.find((item) => item.id === `app:${installationId}`));
9
+ }
@@ -4,6 +4,7 @@ import { useQuery, useQueryClient } from "@tanstack/react-query";
4
4
  import { z } from "zod";
5
5
  import { Button } from "@fungi.computer/caps/components/button";
6
6
  import { Keycap } from "@fungi.computer/caps/components/keycap";
7
+ import { starterItem } from "./starter-item.js";
7
8
  import { ShiitakeAvatar } from "@fungi.computer/parakeet/agent-head";
8
9
  const welcomeKey = "welcome";
9
10
  const dismissedSchema = z.object({ dismissed: z.literal(true) });
@@ -44,14 +45,12 @@ export function WelcomeProvider({ teamId, storage, children, }) {
44
45
  }
45
46
  export const useWelcome = () => useContext(WelcomeContext);
46
47
  const isMac = () => /Mac|iPhone|iPad/u.test(navigator.userAgent);
47
- /** Starters are matched by their App id in the launcher's `app:<surface>` ids. */
48
- const starter = (items, appId) => items.find((item) => item.id === `app:${appId}`);
49
48
  /** Says what this place is and points at the one thing to do next. */
50
49
  export function FirstRunWelcome({ items, onDismiss, }) {
51
- const hello = starter(items, "hello");
50
+ const hello = starterItem(items, "hello");
52
51
  // Grove is the first thing to try; until it is installed, Hello is. Never
53
52
  // whichever App sorts first among the rest.
54
- const lead = starter(items, "grove") ?? hello;
53
+ const lead = starterItem(items, "grove") ?? hello;
55
54
  if (!lead)
56
55
  return null;
57
56
  return (_jsxs("section", { className: "tourtois-welcome", "aria-labelledby": "tourtois-welcome-title", children: [_jsx("span", { className: "tourtois-welcome-mascot", "aria-hidden": "true", children: _jsx(ShiitakeAvatar, { className: "h-full w-full", state: { activity: "idle", expression: "normal" } }) }), _jsxs("div", { className: "tourtois-welcome-text", children: [_jsx("h3", { id: "tourtois-welcome-title", children: "This is your Oyster" }), _jsx("p", { children: "Apps open here as windows." }), _jsxs("p", { className: "tourtois-welcome-hint", children: [_jsx(Keycap, { size: "hint", children: isMac() ? "⌘" : "Ctrl" }), " ", _jsx(Keycap, { size: "hint", children: "K" }), " then ", _jsx(Keycap, { size: "hint", children: "O" }), " ", "opens any App"] })] }), _jsxs("div", { className: "tourtois-welcome-actions", children: [_jsxs(Button, { size: "sm", variant: "primary", onClick: () => {
@@ -18,8 +18,6 @@ export { type KeyAppOption, type KeyGrantOption, type KeyGrantPreviewProps, type
18
18
  */
19
19
  export type PlatformControls = Readonly<{
20
20
  openSettings: (location: SettingsLocation) => void;
21
- /** Settings the host backs with real data; undefined means all of them. */
22
- sections?: readonly SettingsLocation["category"][] | undefined;
23
21
  /** Ask a trial Oyster to retry one starter App that failed to install. */
24
22
  retryInstall?: ((installationId: string) => Promise<void>) | undefined;
25
23
  registerDesktopSettings: (handler: WorkbenchDesktopSettings) => Promise<WorkbenchDesktopRegistration>;
package/dist/shell.js CHANGED
@@ -52,7 +52,7 @@ function MountedTourtois({ shell, }) {
52
52
  return _jsx(CanonicalStatus, { message: "This Team dashboard is unavailable." });
53
53
  if (!connection)
54
54
  return _jsx(CanonicalStatus, { message: "Connecting\u2026" });
55
- return (_jsx(AppSurfaceHostProvider, { value: connection.workbench.host, children: _jsx(MemberAvatarSource, { read: () => connection.workbench.memberAvatar(), children: _jsx(TeamTourtois, { teamId: connection.team.teamId, teamName: connection.team.name, computersReader: (signal) => readWorkbenchComputers(connection.workbench, signal), directoryReader: () => connection.workbench.directory(), takeAppOpenRequest: () => connection.workbench.takeAppOpenRequest(), platform: connection.workbench.platform, desktopStorage: shell.storage, desktopMethods: shell.methods, gills: connection.workbench, settingsLaunchers: settingsLaunchers.filter((launcher) => connection.sections === null ||
55
+ return (_jsx(AppSurfaceHostProvider, { value: connection.workbench.host, children: _jsx(MemberAvatarSource, { read: () => connection.workbench.memberAvatar(), children: _jsx(TeamTourtois, { teamId: connection.team.teamId, teamName: connection.team.name, computersReader: (signal) => readWorkbenchComputers(connection.workbench, signal), directoryReader: () => connection.workbench.directory(), takeAppOpenRequest: () => connection.workbench.takeAppOpenRequest(), platform: connection.workbench.platform, desktopStorage: shell.storage, desktopMethods: shell.methods, gills: connection.workbench, settingsSections: connection.sections ?? undefined, settingsLaunchers: settingsLaunchers.filter((launcher) => connection.sections === null ||
56
56
  connection.sections.includes(launcher.location.category)), systemMenuItems: connection.destinations.map(({ id, label }) => (_jsx(DropdownMenuItem, { onSelect: () => {
57
57
  void connection.workbench
58
58
  .openPlatformDestination(id)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fungi.computer/tourtois",
3
- "version": "0.12.2",
3
+ "version": "0.12.3",
4
4
  "author": "Levi <levi@technomancy.dev>",
5
5
  "description": "Tourtois: the trusted desktop shell for Oyster and Fungi, with host-supplied Settings sections",
6
6
  "type": "module",
@@ -83,7 +83,7 @@
83
83
  "@fungi.computer/ear-tag": "0.1.0",
84
84
  "@fungi.computer/gills": "0.3.0",
85
85
  "@fungi.computer/maosaico": "0.1.1",
86
- "@fungi.computer/parakeet": "0.11.2",
86
+ "@fungi.computer/parakeet": "0.11.3",
87
87
  "@fungi.computer/puffball": "0.5.5",
88
88
  "@fungi.computer/shiitake": "0.12.3",
89
89
  "@fungi.computer/sigils": "0.3.0",
@@ -100,13 +100,13 @@
100
100
  "lucide-react": "0.460.0",
101
101
  "react-dom": "18.3.1",
102
102
  "zod": "4.4.3",
103
- "@fungi.computer/nacre": "0.4.1"
103
+ "@fungi.computer/nacre": "0.4.2"
104
104
  },
105
105
  "peerDependencies": {
106
106
  "react": "^18.3.1 || ^19.2.0"
107
107
  },
108
108
  "devDependencies": {
109
- "@fungi.computer/oyster": "0.18.2",
109
+ "@fungi.computer/oyster": "0.19.2",
110
110
  "@cloudflare/workers-types": "5.20260828.1",
111
111
  "@fungi.computer/forage": "0.3.5",
112
112
  "@fungi.computer/mycelium": "0.3.8",