@dxos/plugin-deck 0.8.4-main.f5c0578 → 0.8.4-main.fcfe5033a5

package/src/containers/Sidebar/SidebarButton.tsx

@@ -0,0 +1,94 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useCallback } from 'react';
+
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { IconButton, type IconButtonProps, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { getLinkedVariant } from '@dxos/react-ui-attention';
+
+import { useDeckCompanions, useDeckState } from '#hooks';
+import { meta } from '#meta';
+
+export const ToggleSidebarButton = ({
+  classNames,
+  variant = 'ghost',
+}: ThemedClassName<Pick<IconButtonProps, 'variant'>>) => {
+  const { updateState } = useDeckState();
+  const { t } = useTranslation(meta.id);
+
+  const handleClick = useCallback(() => {
+    updateState((state) => ({
+      ...state,
+      sidebarState: state.sidebarState === 'expanded' ? 'collapsed' : 'expanded',
+    }));
+  }, [updateState]);
+
+  return (
+    <IconButton
+      variant={variant}
+      icon='ph--sidebar--regular'
+      iconOnly
+      size={4}
+      label={t('open-navigation-sidebar.label')}
+      onClick={handleClick}
+      classNames={classNames}
+    />
+  );
+};
+
+export const CloseSidebarButton = () => {
+  const { updateState } = useDeckState();
+  const { t } = useTranslation(meta.id);
+
+  const handleClick = useCallback(() => {
+    updateState((state) => ({ ...state, sidebarState: 'collapsed' }));
+  }, [updateState]);
+
+  return (
+    <IconButton
+      variant='ghost'
+      icon='ph--caret-line-left--regular'
+      iconOnly
+      size={4}
+      label={t('close-navigation-sidebar.button')}
+      onClick={handleClick}
+      classNames='rounded-none px-1 dx-focus-ring-inset pe-[max(.5rem,env(safe-area-inset-left))]'
+    />
+  );
+};
+
+export const ToggleComplementarySidebarButton = ({
+  inR0,
+  classNames,
+  current,
+}: ThemedClassName<{ inR0?: boolean; current?: string }>) => {
+  const { invokePromise } = useOperationInvoker();
+  const { state, updateState } = useDeckState();
+  const { t } = useTranslation(meta.id);
+
+  const companions = useDeckCompanions();
+  const handleClick = useCallback(() => {
+    const nextState = state.complementarySidebarState === 'expanded' ? 'collapsed' : 'expanded';
+    updateState((state) => ({ ...state, complementarySidebarState: nextState }));
+
+    const subject = state.complementarySidebarPanel ?? (companions[0] && getLinkedVariant(companions[0].id));
+    if (nextState === 'expanded' && !current && subject) {
+      void invokePromise(LayoutOperation.UpdateComplementary, { subject });
+    }
+  }, [state, updateState, current, companions, invokePromise]);
+
+  return (
+    <IconButton
+      variant='ghost'
+      classNames={['[&>svg]:-scale-x-100', classNames]}
+      icon='ph--sidebar-simple--regular'
+      iconOnly
+      label={t('open-complementary-sidebar.label')}
+      tooltipSide={inR0 ? 'left' : undefined}
+      onClick={handleClick}
+    />
+  );
+};

package/src/containers/index.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export * from './Deck';
+export * from './Plank';
+export * from './Sidebar';
+
+export const DeckLayout: ComponentType<any> = lazy(() => import('./DeckLayout'));

package/src/hooks/index.ts

@@ -5,6 +5,8 @@
 export * from './useBreakpoints';
 export * from './useCompanions';
 export * from './useDeckCompanions';
+export * from './useDeckState';
 export * from './useHoistStatusbar';
 export * from './useMainSize';
 export * from './useNodeActionExpander';
+export * from './useSelectedCompanion';

package/src/hooks/useCompanions.ts

@@ -4,15 +4,15 @@
 
 import { useMemo } from 'react';
 
-import { useAppGraph } from '@dxos/app-framework';
+import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { useConnections } from '@dxos/plugin-graph';
 import { byPosition } from '@dxos/util';
 
-import { PLANK_COMPANION_TYPE } from '../types';
+import { PLANK_COMPANION_TYPE } from '#types';
 
 export const useCompanions = (id?: string) => {
   const { graph } = useAppGraph();
-  const nodes = useConnections(graph, id);
+  const nodes = useConnections(graph, id, 'child');
   const companions = nodes.filter((node) => node.type === PLANK_COMPANION_TYPE);
   return useMemo(() => companions.toSorted((a, b) => byPosition(a.properties, b.properties)), [companions]);
 };

package/src/hooks/useDeckCompanions.ts

@@ -2,18 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Label, useAppGraph } from '@dxos/app-framework';
-import { type Node, ROOT_ID, useConnections } from '@dxos/plugin-graph';
+import { useAppGraph } from '@dxos/app-toolkit/ui';
+import { Node, type Node as NodeType } from '@dxos/plugin-graph';
+import { useConnections } from '@dxos/plugin-graph';
+import { type Label } from '@dxos/ui-types';
 import { type Position, byPosition } from '@dxos/util';
 
-import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '../types';
+import { DECK_COMPANION_TYPE } from '#types';
 
-export const getCompanionId = (id: string) => {
-  const [_, companionId] = id.split(ATTENDABLE_PATH_SEPARATOR);
-  return companionId ?? 'never';
-};
-
-export type DeckCompanion = Node<
+export type DeckCompanion = NodeType.Node<
   any,
   {
     label: Label;
@@ -27,7 +24,7 @@ export type DeckCompanion = Node<
 
 export const useDeckCompanions = (): DeckCompanion[] => {
   const { graph } = useAppGraph();
-  const connections = useConnections(graph, ROOT_ID);
+  const connections = useConnections(graph, Node.RootId, 'child');
   const companions = connections.filter((node) => node.type === DECK_COMPANION_TYPE) as DeckCompanion[];
   return companions.toSorted((a, b) => byPosition(a.properties, b.properties));
 };

package/src/hooks/useDeckState.ts

@@ -0,0 +1,73 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useAtomValue } from '@effect-atom/atom-react';
+import { useCallback, useMemo } from 'react';
+
+import { Capabilities } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/ui';
+import { invariant } from '@dxos/invariant';
+
+import {
+  DeckCapabilities,
+  type EphemeralDeckState,
+  type DeckPluginState,
+  type DeckState,
+  type StoredDeckState,
+} from '#types';
+
+export type DeckStateHook = {
+  /** Combined state value (reactive). Includes both persisted and ephemeral state. */
+  state: DeckPluginState;
+  /** The active deck, computed from decks[activeDeck]. */
+  deck: DeckState;
+  /** Update persisted state. */
+  updateState: (fn: (current: StoredDeckState) => StoredDeckState) => void;
+  /** Update ephemeral state. */
+  updateEphemeral: (fn: (current: EphemeralDeckState) => EphemeralDeckState) => void;
+};
+
+/**
+ * Hook to access the deck plugin state reactively.
+ * Returns the combined state, the active deck, and update functions for each atom.
+ */
+export const useDeckState = (): DeckStateHook => {
+  const registry = useCapability(Capabilities.AtomRegistry);
+  const stateAtom = useCapability(DeckCapabilities.State);
+  const ephemeralAtom = useCapability(DeckCapabilities.EphemeralState);
+  const persistedState = useAtomValue(stateAtom);
+  const ephemeralState = useAtomValue(ephemeralAtom);
+
+  // Compute deck from decks[activeDeck] to ensure it's always current.
+  const deck = useMemo(() => {
+    const deck = persistedState.decks[persistedState.activeDeck];
+    invariant(deck, `Deck not found: ${persistedState.activeDeck}`);
+    return deck;
+  }, [persistedState.decks, persistedState.activeDeck]);
+
+  // Combine persisted and ephemeral state into a unified view.
+  const state = useMemo(
+    (): DeckPluginState => ({
+      ...persistedState,
+      ...ephemeralState,
+    }),
+    [persistedState, ephemeralState],
+  );
+
+  const updateState = useCallback(
+    (fn: (current: StoredDeckState) => StoredDeckState) => {
+      registry.set(stateAtom, fn(registry.get(stateAtom)));
+    },
+    [registry, stateAtom],
+  );
+
+  const updateEphemeral = useCallback(
+    (fn: (current: EphemeralDeckState) => EphemeralDeckState) => {
+      registry.set(ephemeralAtom, fn(registry.get(ephemeralAtom)));
+    },
+    [registry, ephemeralAtom],
+  );
+
+  return useMemo(() => ({ state, deck, updateState, updateEphemeral }), [state, deck, updateState, updateEphemeral]);
+};

package/src/hooks/useHoistStatusbar.ts

@@ -4,16 +4,15 @@
 
 import { useMemo } from 'react';
 
-import { Capabilities, useCapability } from '@dxos/app-framework';
+import { useAtomCapability } from '@dxos/app-framework/ui';
 import { useThemeContext } from '@dxos/react-ui';
 
-import { DECK_PLUGIN } from '../meta';
-import type { DeckSettingsProps, LayoutMode } from '../types';
+import { DeckCapabilities, type LayoutMode } from '#types';
 
 export const useHoistStatusbar = (breakpoint: string, layoutMode?: LayoutMode): boolean => {
-  const enableStatusbar = useCapability(Capabilities.SettingsStore).getStore<DeckSettingsProps>(DECK_PLUGIN)!.value
-    .enableStatusbar;
   const { safeAreaPadding } = useThemeContext();
+  const enableStatusbar = useAtomCapability(DeckCapabilities.Settings).enableStatusbar;
+
   return useMemo(() => {
     return (
       breakpoint === 'desktop' &&

package/src/hooks/useMainSize.ts

@@ -7,7 +7,7 @@ import { useMainContext } from '@dxos/react-ui';
 export const useMainSize = () => {
   const { navigationSidebarState, complementarySidebarState } = useMainContext('DeckPluginPlank');
   return {
-    'data-sidebar-inline-start-state': navigationSidebarState,
-    'data-sidebar-inline-end-state': complementarySidebarState,
+    'data-sidebar-left-state': navigationSidebarState,
+    'data-sidebar-right-state': complementarySidebarState,
   };
 };

package/src/hooks/useNodeActionExpander.ts

@@ -4,14 +4,14 @@
 
 import { useEffect } from 'react';
 
-import { type Node, getGraph } from '@dxos/plugin-graph';
+import { Graph, type Node } from '@dxos/plugin-graph';
 
-export const useNodeActionExpander = (node?: Node) => {
+export const useNodeActionExpander = (node?: Node.Node) => {
   useEffect(() => {
     if (node) {
       const frame = requestAnimationFrame(() => {
-        const graph = getGraph(node);
-        void graph.expand(node.id);
+        const graph = Graph.getGraph(node);
+        void Graph.expand(graph, node.id, 'action');
       });
       return () => cancelAnimationFrame(frame);
     }

package/src/hooks/useSelectedCompanion.ts

@@ -0,0 +1,32 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { useMemo } from 'react';
+
+import { type Node } from '@dxos/plugin-graph';
+import { getLinkedVariant } from '@dxos/react-ui-attention';
+
+/**
+ * Resolves which companion to show based on variant preference.
+ * Falls back to first available if preferred variant not found.
+ */
+export const useSelectedCompanion = (companions: Node.Node[], preferredVariant?: string) => {
+  return useMemo(() => {
+    if (companions.length === 0) {
+      return { companionId: undefined, variant: undefined };
+    }
+
+    // Try to find companion matching the preferred variant.
+    if (preferredVariant) {
+      const preferred = companions.find((companion) => getLinkedVariant(companion.id) === preferredVariant);
+      if (preferred) {
+        return { companionId: preferred.id, variant: getLinkedVariant(preferred.id) };
+      }
+    }
+
+    // Fallback to first companion.
+    const first = companions[0];
+    return { companionId: first.id, variant: getLinkedVariant(first.id) };
+  }, [companions, preferredVariant]);
+};

package/src/index.ts

@@ -2,8 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-export { DeckCapabilities } from './capabilities';
-export { DeckEvents } from './events';
+export { DeckCapabilities, DeckEvents } from './types';
 export * from './DeckPlugin';
 export * from './meta';
 export { useCompanions } from './hooks';

package/src/layout.test.ts

@@ -0,0 +1,59 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, expect, test } from 'vitest';
+
+import { openEntry, openSubjectsOnActiveDeck } from './layout';
+
+describe('openEntry', () => {
+  test('pushes new id to the end', () => {
+    expect(openEntry(['a', 'b'], 'c')).toEqual(['a', 'b', 'c']);
+  });
+
+  test('no-op when id already present', () => {
+    expect(openEntry(['a', 'b'], 'a')).toEqual(['a', 'b']);
+  });
+
+  test('replaces by key prefix when key matches', () => {
+    expect(openEntry(['foo+1', 'b'], 'foo+2', { key: 'foo' })).toEqual(['foo+2', 'b']);
+  });
+});
+
+describe('openSubjectsOnActiveDeck', () => {
+  test('truncates after pivot then appends one subject', () => {
+    expect(openSubjectsOnActiveDeck(['a', 'b', 'c', 'd'], ['e'], { pivotId: 'a' })).toEqual(['a', 'e']);
+  });
+
+  test('appends to end when pivot not in deck', () => {
+    expect(openSubjectsOnActiveDeck(['a', 'b'], ['c'], { pivotId: 'missing' })).toEqual(['a', 'b', 'c']);
+  });
+
+  test('without pivotId appends each subject to the end', () => {
+    expect(openSubjectsOnActiveDeck(['a'], ['b', 'c'], {})).toEqual(['a', 'b', 'c']);
+  });
+
+  test('with pivot keeps all new subjects after truncate', () => {
+    expect(openSubjectsOnActiveDeck(['a', 'b', 'c'], ['x', 'y'], { pivotId: 'a' })).toEqual(['a', 'x', 'y']);
+  });
+
+  test('passes key through to openEntry', () => {
+    expect(openSubjectsOnActiveDeck(['foo+1'], ['foo+2'], { key: 'foo' })).toEqual(['foo+2']);
+  });
+
+  test('returns deck unchanged when subject is already open (no pivot)', () => {
+    expect(openSubjectsOnActiveDeck(['a', 'b', 'c'], ['b'])).toEqual(['a', 'b', 'c']);
+  });
+
+  test('returns deck unchanged when subject is already open (with pivot)', () => {
+    expect(openSubjectsOnActiveDeck(['a', 'b', 'c'], ['c'], { pivotId: 'a' })).toEqual(['a', 'b', 'c']);
+  });
+
+  test('returns deck unchanged when all subjects are already open', () => {
+    expect(openSubjectsOnActiveDeck(['a', 'b', 'c'], ['b', 'c'], { pivotId: 'a' })).toEqual(['a', 'b', 'c']);
+  });
+
+  test('truncates after pivot when subject is new even if some are already open', () => {
+    expect(openSubjectsOnActiveDeck(['a', 'b', 'c'], ['b', 'd'], { pivotId: 'a' })).toEqual(['a', 'b', 'd']);
+  });
+});

package/src/layout.ts

@@ -4,38 +4,23 @@
 
 import { produce } from 'immer';
 
-import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention';
-
-import { type DeckAction, type NewPlankPositioning } from './types';
-
-export const createEntryId = (entryId: string, variant?: string) =>
-  variant ? `${entryId}${ATTENDABLE_PATH_SEPARATOR}${variant}` : entryId;
-
-export const parseEntryId = (entryId: string) => {
-  const [id, variant] = entryId.split(ATTENDABLE_PATH_SEPARATOR);
-  return { id, variant };
-};
+import { type DeckAction } from '#types';
 
 type OpenLayoutEntryOptions = {
   key?: string;
-  positioning?: NewPlankPositioning;
-  pivotId?: string;
-  variant?: string;
 };
 
-export const openEntry = (deck: string[], _entryId: string, options?: OpenLayoutEntryOptions): string[] => {
-  return produce(deck, (draft) => {
-    const entryId = createEntryId(_entryId, options?.variant);
-
-    // Check that the entry is not already in the part
+/**
+ * Mutates a deck list using stack semantics: new items open to the right (`push`).
+ * Callers that open from a pivot must truncate the deck first (see deck `open` operation).
+ */
+export const openEntry = (deck: readonly string[], entryId: string, options?: OpenLayoutEntryOptions): string[] => {
+  return produce([...deck], (draft) => {
     if (draft.find((id) => id === entryId)) {
       return;
     }
 
     const key = options?.key;
-    const plankPositioning = options?.positioning ?? 'start';
-    const pivotId = options?.pivotId;
-
     if (key) {
       const index = draft.findIndex((id) => id.split('+')[0] === key);
       if (index !== -1) {
@@ -44,27 +29,40 @@ export const openEntry = (deck: string[], _entryId: string, options?: OpenLayout
       }
     }
 
-    if (pivotId) {
-      const pivotIndex = draft.findIndex((id) => id === pivotId);
-      if (pivotIndex !== -1) {
-        if (plankPositioning === 'start') {
-          draft.splice(pivotIndex, 0, entryId);
-        } else {
-          draft.splice(pivotIndex + 1, 0, entryId);
-        }
-        return;
-      }
-    }
-
-    // If no pivot found or provided, fall back to original behavior
-    if (plankPositioning === 'start') {
-      draft.unshift(entryId);
-    } else {
-      draft.push(entryId);
-    }
+    draft.push(entryId);
   });
 };
 
+export type OpenSubjectsOnActiveDeckOptions = {
+  pivotId?: string;
+  key?: string;
+};
+
+/**
+ * Computes the next multi-mode `active` list for {@link LayoutOperation.Open}.
+ * If `pivotId` is present and found, truncates the deck after that id.
+ * Applies each subject with {@link openEntry}.
+ * If the pivot is missing, appends onto the full `active` list.
+ *
+ * When all subjects are already present in the active deck, the deck is returned
+ * unchanged so that pivot truncation does not discard open planks when navigating
+ * to something that is already visible.
+ */
+export const openSubjectsOnActiveDeck = (
+  active: readonly string[],
+  subject: readonly string[],
+  options?: OpenSubjectsOnActiveDeckOptions,
+): string[] => {
+  if (subject.length > 0 && subject.every((id) => active.includes(id))) {
+    return [...active];
+  }
+
+  const { pivotId, key } = options ?? {};
+  const pivotIndex = pivotId ? active.findIndex((id) => id === pivotId) : -1;
+  const baseDeck = pivotIndex !== -1 ? active.slice(0, pivotIndex + 1) : [...active];
+  return subject.reduce((acc, entryId) => openEntry(acc, entryId, { key }), baseDeck);
+};
+
 export const closeEntry = (deck: string[], entryId: string): string[] => {
   return produce(deck, (draft) => {
     const index = draft.findIndex((id) => id === entryId);

package/src/meta.ts

@@ -2,12 +2,15 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type PluginMeta } from '@dxos/app-framework';
+import { type Plugin } from '@dxos/app-framework';
+import { trim } from '@dxos/util';
 
-export const DECK_PLUGIN = 'dxos.org/plugin/deck' as const;
-
-export const meta: PluginMeta = {
-  id: DECK_PLUGIN,
+export const meta: Plugin.Meta = {
+  id: 'org.dxos.plugin.deck',
   name: 'Layout',
+  description: trim`
+    Flexible layout system for arranging workspace views in tabs, splits, and panels.
+    Customize your workspace organization with drag-and-drop layout management.
+  `,
   icon: 'ph--layout--regular',
 };

package/src/operations/add-toast.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities } from '@dxos/app-framework';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+
+import { DeckCapabilities } from '../types';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.AddToast> = LayoutOperation.AddToast.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      yield* Capabilities.updateAtomValue(DeckCapabilities.EphemeralState, (state) => ({
+        ...state,
+        toasts: [...state.toasts, input as LayoutOperation.Toast],
+      }));
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/adjust.ts

@@ -0,0 +1,83 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+import { AttentionCapabilities } from '@dxos/plugin-attention/types';
+import { Graph } from '@dxos/plugin-graph';
+import { byPosition } from '@dxos/util';
+
+import { incrementPlank } from '../layout';
+import { DeckCapabilities, PLANK_COMPANION_TYPE } from '../types';
+import { computeActiveUpdates } from '../util';
+import { Adjust, ChangeCompanion } from './definitions';
+import { updateActiveDeck } from './helpers';
+
+const handler: Operation.WithHandler<typeof Adjust> = Adjust.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      const _state = yield* Capabilities.getAtomValue(DeckCapabilities.State);
+      const deck = yield* DeckCapabilities.getDeck();
+      const attention = yield* Capability.get(AttentionCapabilities.Attention);
+      const { graph } = yield* Capability.get(AppCapabilities.AppGraph);
+
+      let soloOperation:
+        | { type: 'solo'; entryId: string; mode: string }
+        | { type: 'unsolo'; entryId: string }
+        | undefined;
+
+      if (input.type === 'increment-end' || input.type === 'increment-start') {
+        const next = incrementPlank(deck.active, input);
+        const { deckUpdates } = computeActiveUpdates({ next, deck, attention });
+        yield* Capabilities.updateAtomValue(DeckCapabilities.State, (state) => updateActiveDeck(state, deckUpdates));
+      }
+
+      if (input.type.startsWith('solo')) {
+        const entryId = input.id;
+        if (!deck.solo) {
+          soloOperation = { type: 'solo', entryId, mode: input.type };
+        } else {
+          if (input.type === 'solo--fullscreen') {
+            soloOperation = { type: 'solo', entryId, mode: 'solo--fullscreen' };
+          } else if (input.type === 'solo') {
+            soloOperation = { type: 'unsolo', entryId };
+          }
+        }
+      }
+
+      if (soloOperation?.type === 'solo') {
+        yield* Operation.invoke(LayoutOperation.SetLayoutMode, {
+          subject: soloOperation.entryId,
+          mode: soloOperation.mode,
+        });
+      } else if (soloOperation?.type === 'unsolo') {
+        yield* Operation.invoke(LayoutOperation.SetLayoutMode, { mode: 'multi' });
+        yield* Operation.invoke(LayoutOperation.Open, { subject: [soloOperation.entryId] });
+      }
+
+      if (input.type === 'companion') {
+        const companion = Function.pipe(
+          Graph.getNode(graph, input.id),
+          Option.map((node) =>
+            Graph.getConnections(graph, node.id, 'child')
+              .filter((n) => n.type === PLANK_COMPANION_TYPE)
+              .toSorted((a, b) => byPosition(a.properties, b.properties)),
+          ),
+          Option.flatMap((companions) => (companions.length > 0 ? Option.some(companions[0]) : Option.none())),
+        );
+
+        if (Option.isSome(companion)) {
+          yield* Operation.invoke(ChangeCompanion, { companion: companion.value.id });
+        }
+      }
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/change-companion.ts

@@ -0,0 +1,35 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities } from '@dxos/app-framework';
+import { Operation } from '@dxos/operation';
+import { getLinkedVariant } from '@dxos/react-ui-attention';
+
+import { DeckCapabilities } from '../types';
+import { ChangeCompanion } from './definitions';
+import { updateActiveDeck } from './helpers';
+
+const handler: Operation.WithHandler<typeof ChangeCompanion> = ChangeCompanion.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      if (input.companion === null) {
+        yield* Capabilities.updateAtomValue(DeckCapabilities.State, (state) =>
+          updateActiveDeck(state, { companionOpen: false }),
+        );
+      } else {
+        const variant = getLinkedVariant(input.companion);
+        yield* Capabilities.updateAtomValue(DeckCapabilities.State, (state) =>
+          updateActiveDeck(state, {
+            companionOpen: true,
+            companionVariant: variant,
+          }),
+        );
+      }
+    }),
+  ),
+);
+
+export default handler;