@fungi.computer/tourtois 0.1.0 → 0.2.1

package/dist/queries.js

@@ -1,5 +1,9 @@
 /** Keep host and isolated-workbench reads in distinct cache entries. */
 export const tourtoisQueryKeys = {
+    oysterComputers: (teamId) => ["tourtois", "oyster-computers", teamId],
+    oysterComputerPage: (teamId, offset) => [...tourtoisQueryKeys.oysterComputers(teamId), offset],
+    oysterSelectedComputer: (teamId) => ["tourtois", "oyster-selected-computer", teamId],
+    oysterInternetAccess: (teamId, computerId) => ["tourtois", "oyster-internet-access", teamId, computerId],
     hostSettings: (workspaceId) => ["tourtois", "host-settings", workspaceId],
     workbench: () => ["tourtois", "workbench"],
     workbenchComputers: (teamId) => ["tourtois", "workbench-computers", teamId],

package/dist/shell-commands.d.ts

@@ -1,5 +1,5 @@
 import { CommandDialogs, type ShellCommandState } from "./command-dialogs.js";
-import { type ShellActions } from "@fungi.computer/oyster/shell/commands";
+import { type ShellActions } from "@fungi.computer/nacre/commands";
 import type { TourtoisAppSurfaceHost } from "./app-surface.js";
 /** The Back hint for this platform, e.g. "Back (Ctrl K, then [)". */
 export declare function backHint(): string;

package/dist/shell-commands.js

@@ -2,13 +2,13 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { CommandDialogs } from "./command-dialogs.js";
 import { useLayer } from "@fungi.computer/maosaico";
 import { Sigil, isSigilName } from "@fungi.computer/sigils";
-import { backBinding, shellCommands, } from "@fungi.computer/oyster/shell/commands";
+import { backBinding, shellCommands, } from "@fungi.computer/nacre/commands";
 import { useEffect, useMemo, useRef, useState, useSyncExternalStore, } from "react";
 import { AppIcon } from "./app-icon.js";
-import { installShellKeys } from "@fungi.computer/oyster/shell/keys";
+import { installShellKeys } from "@fungi.computer/nacre/keys";
 /** The Back hint for this platform, e.g. "Back (Ctrl K, then [)". */
 export function backHint() {
-    const key = backBinding.slice("<leader> ".length);
+    const key = backBinding.slice("<leader>".length);
     return `Back (${isMac() ? "⌘K" : "Ctrl K"}, then ${key})`;
 }
 const emptySnapshot = Object.freeze({
@@ -73,7 +73,7 @@ export function useShellCommands(host, actions) {
             category: "Window",
             description: "Hide visible Apps, or restore the Apps hidden by Show desktop.",
             projections: {
-                bindings: { values: ["<leader> d"], order: 8 },
+                bindings: { values: ["<leader>d"], order: 8 },
                 palette: { order: 18 },
                 help: { order: 8 },
             },

package/dist/shell-host.d.ts

@@ -1,11 +1,11 @@
-import { type TeamWorkbenchHostHandle, type WorkbenchPlatformDestination, type WorkbenchGillRequest, type WorkbenchGillWatch } from "@fungi.computer/oyster/shell/workbench";
+import { type TeamWorkbenchHostHandle, type WorkbenchPlatformDestination, type WorkbenchGillRequest, type WorkbenchGillWatch } from "@fungi.computer/nacre/workbench";
 import { type PlatformControls } from "./platform-controls.js";
 import type { GillReply } from "@fungi.computer/gills";
 import type { MemberAvatar } from "@fungi.computer/sprite-zdog/avatar";
 import * as z from "zod";
 import { type AppOpenInput } from "@fungi.computer/agar/apps";
 import type { TourtoisAppSurfaceHost } from "./app-surface.js";
-import { type WorkbenchDirectory } from "@fungi.computer/oyster/shell/workbench-directory";
+import { workbenchComputerDirectorySchema, type WorkbenchDirectory } from "@fungi.computer/nacre/workbench-directory";
 declare const teamIdentitySchema: z.ZodObject<{
     team: z.ZodObject<{
         teamId: z.ZodString;
@@ -14,14 +14,12 @@ declare const teamIdentitySchema: z.ZodObject<{
     }, z.core.$strict>;
 }, z.core.$strict>;
 export type TeamIdentity = z.output<typeof teamIdentitySchema>["team"];
-declare const workbenchComputerDirectorySchema: z.ZodObject<{
-    nextOffset: z.ZodNullable<z.ZodNumber>;
-    computers: z.ZodArray<z.ZodObject<{
-        name: z.ZodString;
-        computerId: z.ZodString;
-    }, z.core.$strip>>;
-}, z.core.$strict>;
 export type TeamComputerPage = z.output<typeof workbenchComputerDirectorySchema>;
+/** The complete inventory offered to the shell's Computer picker. */
+export declare function readWorkbenchComputers(workbench: Pick<TourtoisShell, "computers">, signal: AbortSignal): Promise<{
+    computerId: string;
+    name: string;
+}[]>;
 /**
  * The trusted shell's view of its host: Team/Computer/App directory reads,
  * child-App mounting and host-offered platform destinations. The host

package/dist/shell-host.js

@@ -1,12 +1,12 @@
 import { APP_NAVIGATION_TITLE_MAX, parseAppStatusItems, APP_NAVIGATION_CRUMBS_MAX, APP_NAVIGATION_LABEL_MAX, APP_NAVIGATION_MENU_MAX, APP_NAVIGATION_PRIMARY_MAX, APP_NAVIGATION_SIBLINGS_MAX, APP_NAVIGATION_STATUS_MAX, } from "@fungi.computer/agar";
-import { teamComputerDirectorySchema, teamComputerSchema, } from "@fungi.computer/oyster/shell/workbench";
-import { createAppSurfaceCommandHost } from "@fungi.computer/oyster/shell/command-host";
+import {} from "@fungi.computer/nacre/workbench";
+import { createAppSurfaceCommandHost } from "@fungi.computer/nacre/command-host";
 import * as Schema from "effect/Schema";
 import {} from "./platform-controls.js";
 import { parseMemberAvatar } from "./member-avatar.js";
 import * as z from "zod";
 import { appOpenInputSchema, } from "@fungi.computer/agar/apps";
-import { workbenchDirectorySchema, } from "@fungi.computer/oyster/shell/workbench-directory";
+import { workbenchDirectorySchema, workbenchComputerDirectorySchema, } from "@fungi.computer/nacre/workbench-directory";
 const teamIdentitySchema = z.strictObject({
     team: z.strictObject({
         teamId: z.string().min(1),
@@ -14,9 +14,26 @@ const teamIdentitySchema = z.strictObject({
         handle: z.string().min(1),
     }),
 });
-const workbenchComputerDirectorySchema = teamComputerDirectorySchema.extend({
-    computers: z.array(teamComputerSchema.pick({ computerId: true, name: true }).strip()),
-});
+/** The complete inventory offered to the shell's Computer picker. */
+export async function readWorkbenchComputers(workbench, signal) {
+    const computers = [];
+    const assertActive = () => {
+        if (signal.aborted)
+            throw new DOMException("", "AbortError");
+    };
+    let offset = 0;
+    for (;;) {
+        assertActive();
+        const page = await workbench.computers({ limit: 100, offset });
+        assertActive();
+        computers.push(...page.computers);
+        if (page.nextOffset === null)
+            return computers;
+        if (page.nextOffset <= offset)
+            throw new Error("Computer directory pagination did not advance.");
+        offset = page.nextOffset;
+    }
+}
 const platformDestinationsSchema = z
     .array(z.strictObject({
     id: z.string().min(1).max(64),
@@ -29,6 +46,7 @@ const relayCommands = (maximum) => z
     .array(z.strictObject({
     id: relayId,
     label: relayLabel,
+    icon: z.literal("play").optional(),
     variant: z.enum(["primary", "outline", "ghost"]).optional(),
     tone: z.literal("destructive").optional(),
     disabled: z.boolean().optional(),
@@ -55,6 +73,7 @@ const navigationRelaySchema = z
         .array(z.strictObject({
         id: relayId,
         label: relayLabel,
+        presentation: z.literal("bead").optional(),
         tone: z
             .enum(["neutral", "info", "warning", "success", "error"])
             .optional(),
@@ -89,6 +108,8 @@ function parseNavigationRelay(value) {
 }
 function commandOf(command) {
     let copy = { id: command.id, label: command.label };
+    if (command.icon !== undefined)
+        copy = { ...copy, icon: command.icon };
     if (command.variant !== undefined)
         copy = { ...copy, variant: command.variant };
     if (command.tone !== undefined)
@@ -98,8 +119,12 @@ function commandOf(command) {
     return copy;
 }
 function statusOf(item) {
-    const copy = { id: item.id, label: item.label };
-    return item.tone === undefined ? copy : { ...copy, tone: item.tone };
+    let copy = { id: item.id, label: item.label };
+    if (item.presentation !== undefined)
+        copy = { ...copy, presentation: item.presentation };
+    if (item.tone !== undefined)
+        copy = { ...copy, tone: item.tone };
+    return copy;
 }
 function childLaunch(launch) {
     return {
@@ -116,7 +141,7 @@ export function createTourtoisShell(workbench) {
     // One Whistle graph for Tourtois's own shell commands and every mounted
     // child's Release-validated commands, so the menu bar and Cmd-K follow focus.
     const commands = createAppSurfaceCommandHost();
-    const mount = async (container, launch, signal, { onAgentSessionSelection, onComputerChoice, onNavigation, onAppOpen, onAppRole, onSelectionChanged, onNavigationState, onStatusItems, onFocus, }) => {
+    const mount = async (container, launch, signal, { onAgentSessionSelection, onDeliveryPending, onComputerChoice, onNavigation, onAppOpen, onAppRole, onSelectionChanged, onNavigationState, onStatusItems, onFocus, }) => {
         const commandMount = commands.mount(launch.surfaceId, launch.commands);
         let resolveHandle = () => undefined;
         const handleReady = new Promise((resolve) => {
@@ -124,6 +149,7 @@ export function createTourtoisShell(workbench) {
         });
         let contribution;
         const events = {
+            ...(onDeliveryPending && { onDeliveryPending }),
             ...(onComputerChoice && { onComputerChoice }),
             onAgentSessionSelection: (selection) => onAgentSessionSelection(selection),
             ...(onNavigation && { onNavigation }),
@@ -177,7 +203,7 @@ export function createTourtoisShell(workbench) {
         try {
             // The child's frame lives in this window's own slot, so the browser
             // moves, clips and stacks it with the window.
-            handle = await workbench.mount(container, childLaunch(launch), events);
+            handle = await workbench.mount(container, childLaunch(launch), events, signal);
         }
         catch (error) {
             commandMount.dispose();

package/dist/shell-module.d.ts

@@ -1,4 +1,4 @@
-import type { MountPlatformControls, MountShell } from "@fungi.computer/oyster/shell/shell-module";
+import type { MountPlatformControls, MountShell } from "@fungi.computer/nacre/shell-module";
 /**
  * This Release's shell module, emitted as `shell.js` beside `index.html`.
  * A host imports it from its own origin after first paint; Tourtois's code

package/dist/shell.d.ts

@@ -1,4 +1,4 @@
-import type { MountShell } from "@fungi.computer/oyster/shell/shell-module";
+import type { MountShell } from "@fungi.computer/nacre/shell-module";
 /**
  * Tourtois's shell module contract: render Tourtois as the host's trusted
  * shell in this top-level document.

package/dist/shell.js

@@ -10,7 +10,7 @@ import { QueryClientProvider, useQuery, useQueryClient, } from "@tanstack/react-
 import { TeamTourtois } from "./TeamDesktop.js";
 import { AppSurfaceHostProvider } from "./app-surface.js";
 import { accountAvatarQuery, MemberAvatarSource } from "./member-avatar.js";
-import { createTourtoisShell } from "./shell-host.js";
+import { createTourtoisShell, readWorkbenchComputers } from "./shell-host.js";
 function CanonicalStatus({ message }) {
     return (_jsx("main", { className: "tourtois-shell tourtois-team-desktop", "data-tourtois-shell": true, children: _jsx("p", { className: "tourtois-directory-status", role: "status", children: message }) }));
 }
@@ -52,13 +52,7 @@ function MountedTourtois({ shell, }) {
         return _jsx(CanonicalStatus, { message: "This Team dashboard is unavailable." });
     if (!connection)
         return _jsx(CanonicalStatus, { message: "Connecting\u2026" });
-    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) => connection.workbench
-                    .computers({ limit: 100, offset: 0 })
-                    .then((page) => {
-                    if (signal.aborted)
-                        throw new DOMException("", "AbortError");
-                    return page.computers;
-                }), 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 ||
+    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 ||
                     connection.sections.includes(launcher.location.category)), systemMenuItems: connection.destinations.map(({ id, label }) => (_jsx(DropdownMenuItem, { onSelect: () => {
                         void connection.workbench
                             .openPlatformDestination(id)
@@ -74,7 +68,9 @@ function MountedTourtois({ shell, }) {
  */
 export const mountShell = (root, shell) => {
     const queryClient = createQueryClient();
-    const reactRoot = createRoot(root);
+    // The Release bundles its own React runtime. Keep its useId values distinct
+    // from the embedding host's labels, controls and portalled overlays.
+    const reactRoot = createRoot(root, { identifierPrefix: "tourtois-shell-" });
     reactRoot.render(_jsx(QueryClientProvider, { client: queryClient, children: _jsx(MountedTourtois, { shell: shell }) }));
     return Promise.resolve(() => {
         reactRoot.unmount();

package/dist/useAppWindowManager.d.ts

@@ -309,7 +309,7 @@ export declare function useAppWindowManager(host: TourtoisAppSurfaceHost | null,
                 }>[];
             }>;
             container: HTMLElement;
-            status: import("@fungi.computer/oyster/shell/window-manager").WindowStatus;
+            status: import("@fungi.computer/nacre/window-manager").WindowStatus;
             generation: number;
             error?: unknown;
             cleanupError?: unknown;
@@ -327,6 +327,7 @@ export declare function useAppWindowManager(host: TourtoisAppSurfaceHost | null,
                 primary?: readonly Readonly<{
                     id: string;
                     label: string;
+                    icon?: "play";
                     variant?: "primary" | "outline" | "ghost";
                     tone?: "destructive";
                     disabled?: boolean;
@@ -334,6 +335,7 @@ export declare function useAppWindowManager(host: TourtoisAppSurfaceHost | null,
                 menu?: readonly Readonly<{
                     id: string;
                     label: string;
+                    icon?: "play";
                     variant?: "primary" | "outline" | "ghost";
                     tone?: "destructive";
                     disabled?: boolean;
@@ -341,6 +343,7 @@ export declare function useAppWindowManager(host: TourtoisAppSurfaceHost | null,
                 status?: readonly Readonly<{
                     id: string;
                     label: string;
+                    presentation?: "bead";
                     tone?: "neutral" | "info" | "warning" | "success" | "error";
                 }>[];
             }> | null;

package/dist/useAppWindowManager.js

@@ -10,6 +10,9 @@ export function useAppWindowManager(host, teamId, events) {
             if (!host)
                 throw new Error("App host unavailable");
             return await host.mount(container, launch, signal, {
+                ...(projectionEvents.onDeliveryPending && {
+                    onDeliveryPending: projectionEvents.onDeliveryPending,
+                }),
                 onAgentSessionSelection: (selection) => {
                     if (!host.reportAgentSessionSelection)
                         return Promise.reject(new Error("Hub Agent browser host unavailable"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fungi.computer/tourtois",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "author": "Levi <levi@technomancy.dev>",
   "description": "Tourtois: the trusted desktop shell for Oyster and Fungi, with host-supplied Settings sections",
   "type": "module",
@@ -69,19 +69,19 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@fungi.computer/agar": "0.2.0",
-    "@fungi.computer/cairn": "0.0.1",
-    "@fungi.computer/caps": "0.1.0",
-    "@fungi.computer/gills": "0.1.0",
-    "@fungi.computer/maosaico": "0.0.1",
-    "@fungi.computer/oyster": "0.2.0",
-    "@fungi.computer/parakeet": "0.1.0",
-    "@fungi.computer/puffball": "0.1.0",
-    "@fungi.computer/shiitake": "0.2.0",
-    "@fungi.computer/sigils": "0.1.0",
-    "@fungi.computer/sprite": "0.1.0",
-    "@fungi.computer/sprite-zdog": "0.1.0",
-    "@fungi.computer/whistle": "0.0.2",
+    "@fungi.computer/agar": "0.3.0",
+    "@fungi.computer/cairn": "0.1.0",
+    "@fungi.computer/caps": "0.2.0",
+    "@fungi.computer/ear-tag": "0.1.0",
+    "@fungi.computer/gills": "0.2.0",
+    "@fungi.computer/maosaico": "0.1.0",
+    "@fungi.computer/parakeet": "0.2.1",
+    "@fungi.computer/puffball": "0.2.0",
+    "@fungi.computer/shiitake": "0.3.1",
+    "@fungi.computer/sigils": "0.2.0",
+    "@fungi.computer/sprite": "0.2.0",
+    "@fungi.computer/sprite-zdog": "0.2.0",
+    "@fungi.computer/whistle": "0.1.0",
     "@tanstack/history": "1.162.1",
     "@tanstack/react-form": "1.33.2",
     "@tanstack/react-query": "5.102.8",
@@ -91,15 +91,17 @@
     "effect": "4.0.2",
     "lucide-react": "0.460.0",
     "react-dom": "18.3.1",
-    "zod": "4.4.3"
+    "zod": "4.4.3",
+    "@fungi.computer/nacre": "0.0.1"
   },
   "peerDependencies": {
     "react": "^18.3.1 || ^19.2.0"
   },
   "devDependencies": {
+    "@fungi.computer/oyster": "0.3.2",
     "@cloudflare/workers-types": "5.20260828.1",
-    "@fungi.computer/forage": "0.1.0",
-    "@fungi.computer/mycelium": "0.1.0",
+    "@fungi.computer/forage": "0.2.0",
+    "@fungi.computer/mycelium": "0.2.1",
     "@ladle/react": "5.1.1",
     "@types/react": "18.3.3",
     "@vitejs/plugin-react": "6.1.1",
@@ -165,7 +167,25 @@
       "packageStylesheets": [
         "@fungi.computer/caps",
         "@fungi.computer/parakeet"
-      ]
+      ],
+      "entry": "index.html",
+      "maxOutputBytes": 67108864,
+      "backend": {
+        "entry": "backend/index.ts",
+        "exportName": "Tourtois",
+        "compatibilityDate": "2026-09-04",
+        "runtime": {
+          "kind": "durable-facet",
+          "stateSchema": 1
+        }
+      },
+      "assetBase": "./",
+      "assets": {
+        "maxManifestBytes": 1048576,
+        "maxObjects": 1024,
+        "maxObjectBytes": 16777216,
+        "maxTotalBytes": 67108864
+      }
     }
   },
   "license": "MIT",
@@ -211,6 +231,7 @@
     "workbench": "ladle serve --host 127.0.0.1 --port 61001",
     "workbench:build": "ladle build --outDir ../../.botanical/tourtois-ladle",
     "test:overlay-layering": "node test/overlay-layering.browser.mjs",
+    "test:window-new-version": "node test/window-new-version.browser.mjs",
     "test:workbench": "node test/workbench.browser.mjs && node test/desktop-gills.browser.mjs && node test/app-directory-isolation.browser.mjs && node test/workflows-launcher-icon.browser.mjs && node test/landing-bugs.browser.mjs && node test/desktop-under-windows.browser.mjs && node test/show-desktop.browser.mjs && node test/window-stack.browser.mjs && node test/region-layers.browser.mjs && node test/window-chrome-back.browser.mjs && node test/app-bar-menu.browser.mjs && node test/launcher-gill.browser.mjs && node test/desktop-storage.browser.mjs && node test/desktop-method-editing.browser.mjs && node test/phone-desktop.browser.mjs && node test/phone-layout.browser.mjs && node test/phone-app-switcher.browser.mjs && node test/computer-choice.browser.mjs",
     "test": "pnpm run test:unit && pnpm run test:merge",
     "test:settings-icons": "node --import tsx ../../tooling/repository/scripts/workbench-proofs.mjs --output ../../.botanical/tourtois-ladle --origin-env TOURTOIS_WORKBENCH_URL test/settings-icons.browser.mjs",