@dxos/plugin-sheet 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.9.1-staging.ee54ba693a",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -49,6 +49,11 @@
       "node": "./dist/lib/neutral/SheetPlugin.node.mjs",
       "default": "./dist/lib/neutral/SheetPlugin.mjs"
     },
+    "#skills": {
+      "source": "./src/skills/index.ts",
+      "types": "./dist/types/src/skills/index.d.ts",
+      "default": "./dist/lib/neutral/skills/index.mjs"
+    },
     "#testing": "./src/testing/index.ts",
     "#translations": {
       "source": "./src/translations.ts",
@@ -94,70 +99,71 @@
     "@lezer/common": "^1.5.2",
     "@lezer/highlight": "^1.2.3",
     "codemirror-lang-spreadsheet": "^1.3.0",
-    "@dxos/app-framework": "0.9.1-main.c7dcc2e112",
-    "@dxos/app-toolkit": "0.9.1-main.c7dcc2e112",
-    "@dxos/client": "0.9.1-main.c7dcc2e112",
-    "@dxos/compute": "0.9.1-main.c7dcc2e112",
-    "@dxos/async": "0.9.1-main.c7dcc2e112",
-    "@dxos/context": "0.9.1-main.c7dcc2e112",
-    "@dxos/compute-hyperformula": "0.9.1-main.c7dcc2e112",
-    "@dxos/debug": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo-react": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/keys": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-graph": "0.9.1-main.c7dcc2e112",
-    "@dxos/lit-grid": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-markdown": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-comments": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-space": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/crypto": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-attention": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-hooks": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-editor": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-grid": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-form": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-menu": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-list": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-editor": "0.9.1-main.c7dcc2e112",
-    "@dxos/types": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112"
+    "@dxos/app-framework": "0.9.1-staging.ee54ba693a",
+    "@dxos/app-toolkit": "0.9.1-staging.ee54ba693a",
+    "@dxos/client": "0.9.1-staging.ee54ba693a",
+    "@dxos/compute": "0.9.1-staging.ee54ba693a",
+    "@dxos/compute-hyperformula": "0.9.1-staging.ee54ba693a",
+    "@dxos/context": "0.9.1-staging.ee54ba693a",
+    "@dxos/async": "0.9.1-staging.ee54ba693a",
+    "@dxos/crypto": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo": "0.9.1-staging.ee54ba693a",
+    "@dxos/debug": "0.9.1-staging.ee54ba693a",
+    "@dxos/invariant": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo-react": "0.9.1-staging.ee54ba693a",
+    "@dxos/lit-grid": "0.9.1-staging.ee54ba693a",
+    "@dxos/log": "0.9.1-staging.ee54ba693a",
+    "@dxos/keys": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-comments": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-graph": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-markdown": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo-doc": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-hooks": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-attention": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-form": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-space": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-grid": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-list": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-menu": "0.9.1-staging.ee54ba693a",
+    "@dxos/schema": "0.9.1-staging.ee54ba693a",
+    "@dxos/types": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui-editor": "0.9.1-staging.ee54ba693a",
+    "@dxos/util": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-editor": "0.9.1-staging.ee54ba693a"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.96.1",
+    "@effect/platform": "0.96.2",
     "@lezer/generator": "^1.8.0",
     "@tldraw/indices": "^2.0.0-alpha.14",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~19.2.7",
+    "@types/react": "~19.2.17",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.21.3",
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
+    "effect": "3.21.4",
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
     "vite": "^8.0.16",
-    "@dxos/lit-grid": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo-generator": "0.9.1-main.c7dcc2e112",
-    "@dxos/random": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-syntax-highlighter": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-testing": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/storybook-utils": "0.9.1-main.c7dcc2e112",
-    "@dxos/test-utils": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-types": "0.9.1-main.c7dcc2e112"
+    "@dxos/echo-generator": "0.9.1-staging.ee54ba693a",
+    "@dxos/lit-grid": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-testing": "0.9.1-staging.ee54ba693a",
+    "@dxos/random": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-syntax-highlighter": "0.9.1-staging.ee54ba693a",
+    "@dxos/storybook-utils": "0.9.1-staging.ee54ba693a",
+    "@dxos/test-utils": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui-types": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui-theme": "0.9.1-staging.ee54ba693a"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.96.1",
-    "effect": "3.21.3",
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112"
+    "@effect/platform": "0.96.2",
+    "effect": "3.21.4",
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
+    "@dxos/ui-theme": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui": "0.9.1-staging.ee54ba693a"
   },
   "publishConfig": {
     "access": "public"

package/src/SheetPlugin.tsx

@@ -9,16 +9,15 @@ import { MarkdownEvents } from '@dxos/plugin-markdown';
 
 import {
   AnchorSort,
-  AppGraphBuilder,
-  NavigationResolver,
   CommentConfig,
   ComputeGraphRegistry,
   CreateObject,
   Markdown,
   OperationHandler,
-  UndoMappings,
   ReactSurface,
   SheetState,
+  SkillDefinition,
+  UndoMappings,
 } from '#capabilities';
 import { meta } from '#meta';
 import { translations } from '#translations';
@@ -28,8 +27,7 @@ import { Sheet } from '#types';
 import pluginSpec from '../PLUGIN.mdl?raw';
 
 export const SheetPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addNavigationResolverModule({ activate: NavigationResolver }),
+  AppPlugin.addSkillDefinitionModule({ activate: SkillDefinition }),
   AppPlugin.addCommentConfigModule({ activate: CommentConfig }),
   AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),

package/src/capabilities/comment-config.ts

@@ -11,12 +11,7 @@ import { Type } from '@dxos/echo';
 import { SheetOperation } from '#types';
 import { Sheet } from '#types';
 
-// NOTE: Explicit annotation required: d.ts emit cannot portably name the inferred @dxos/compute types (TS2883).
-const activate: () => Effect.Effect<
-  Capability.Capability<typeof AppCapabilities.CommentConfig>,
-  never,
-  Capability.Service
-> = Effect.fnUntraced(function* () {
+const activate = Effect.fnUntraced(function* () {
   const config: AppCapabilities.CommentConfig = {
     id: Type.getTypename(Sheet.Sheet),
     comments: 'anchored',

package/src/capabilities/create-object.ts

@@ -12,8 +12,6 @@ import { SpaceCapabilities } from '@dxos/plugin-space';
 
 import { Sheet } from '#types';
 
-import { getSheetsPath } from '../paths';
-
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
@@ -24,8 +22,7 @@ export default Capability.makeModule(
           return yield* Operation.invoke(SpaceOperation.AddObject, {
             object,
             target: options.target,
-            hidden: true,
-            targetNodeId: options.targetNodeId ?? getSheetsPath(options.db.spaceId),
+            targetNodeId: options.targetNodeId,
           });
         }),
     });

package/src/capabilities/index.ts

@@ -5,8 +5,6 @@
 import { Capability } from '@dxos/app-framework';
 import { OperationHandlerSet } from '@dxos/compute';
 
-export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
-export const NavigationResolver = Capability.lazy('NavigationResolver', () => import('./navigation-resolver'));
 export const AnchorSort = Capability.lazy('AnchorSort', () => import('./anchor-sort'));
 export const CommentConfig = Capability.lazy('CommentConfig', () => import('./comment-config'));
 export const ComputeGraphRegistry = Capability.lazy('ComputeGraphRegistry', () => import('./compute-graph-registry'));
@@ -18,4 +16,5 @@ export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHan
 );
 export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
 export const SheetState = Capability.lazy('SheetState', () => import('./state'));
+export const SkillDefinition = Capability.lazy('SkillDefinition', () => import('./skill-definition'));
 export const UndoMappings = Capability.lazy('UndoMappings', () => import('./undo-mappings'));

package/src/capabilities/skill-definition.ts

@@ -0,0 +1,14 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+
+import { SheetSkill } from '#skills';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(Capability.contributes(AppCapabilities.SkillDefinition, SheetSkill)),
+);

package/src/components/Sheet/Sheet.tsx

@@ -7,7 +7,7 @@ import { SheetRoot } from '../SheetRoot';
 import { SheetStatusbar } from '../SheetStatusbar';
 import { SheetToolbar } from '../SheetToolbar';
 
-export { useSheetContext, type SheetContextValue, type SheetRootProps } from '../SheetRoot';
+export { type SheetContextValue, type SheetRootProps, useSheetContext } from '../SheetRoot';
 export { type SheetContentProps } from '../SheetContent';
 export { type SheetToolbarProps } from '../SheetToolbar';
 export { type SheetStatusbarProps } from '../SheetStatusbar';

package/src/components/SheetContent/SheetCellEditor.stories.tsx

@@ -9,7 +9,7 @@ import { Client } from '@dxos/client';
 import { defaultFunctions } from '@dxos/compute-hyperformula';
 import { getRegisteredFunctionNames } from '@dxos/compute-hyperformula/testing';
 import { Obj } from '@dxos/echo';
-import { createDocAccessor } from '@dxos/echo-client';
+import { Doc } from '@dxos/echo-doc';
 import { useAsyncEffect } from '@dxos/react-hooks';
 import { CellEditor, type CellEditorProps } from '@dxos/react-ui-grid';
 import { withTheme } from '@dxos/react-ui/testing';
@@ -54,7 +54,7 @@ const AutomergeStory = ({ value, ...props }: CellEditorProps) => {
 
     const functionNames = getRegisteredFunctionNames();
     const functions = defaultFunctions.filter(({ name }) => functionNames.includes(name));
-    const accessor = createDocAccessor(object, ['cells', cell, 'value']);
+    const accessor = Doc.createAccessor(object, ['cells', cell, 'value']);
     return [automerge(accessor), sheetExtension({ functions })];
   }, [object]);
 

package/src/components/SheetContent/util.ts

@@ -5,7 +5,7 @@
 import { useEffect, useState } from 'react';
 
 import { inRange } from '@dxos/compute-hyperformula';
-import { createDocAccessor } from '@dxos/echo-client';
+import { Doc } from '@dxos/echo-doc';
 import { cellClassesForFieldType, parseValue } from '@dxos/react-ui-form';
 import {
   type DxGridAxisMeta,
@@ -144,7 +144,7 @@ export const useSheetModelDxGridProps = (
   const [rows, setRows] = useState<DxGridAxisMeta>(createDxGridRows(model));
 
   useEffect(() => {
-    const cellsAccessor = createDocAccessor(model.sheet, ['cells']);
+    const cellsAccessor = Doc.createAccessor(model.sheet, ['cells']);
     if (dxGrid) {
       dxGrid.getCells = cellGetter(model);
     }
@@ -160,8 +160,8 @@ export const useSheetModelDxGridProps = (
   }, [model, dxGrid]);
 
   useEffect(() => {
-    const columnMetaAccessor = createDocAccessor(model.sheet, ['columnMeta']);
-    const rowMetaAccessor = createDocAccessor(model.sheet, ['rowMeta']);
+    const columnMetaAccessor = Doc.createAccessor(model.sheet, ['columnMeta']);
+    const rowMetaAccessor = Doc.createAccessor(model.sheet, ['rowMeta']);
     const handleColumnMetaUpdate = () => {
       setColumns(createDxGridColumns(model));
     };

package/src/containers/RangeList/RangeList.tsx

@@ -37,7 +37,7 @@ export const RangeList = ({ sheet: sheetProp }: RangeListProps) => {
       <Input.Root>
         <Input.Label>{t('range-list.heading')}</Input.Label>
       </Input.Root>
-      {sheet.ranges.length < 1 ? (
+      {sheet.ranges.length === 0 ? (
         <Message.Root>
           <Message.Title>{t('no-ranges.message')}</Message.Title>
         </Message.Root>

package/src/index.ts

@@ -4,5 +4,4 @@
 
 export * from './meta';
 export * from './operations';
-export * from './paths';
 export * from './types';

package/src/operations/create.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { CollectionModel } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { Database, Obj } from '@dxos/echo';
+
+import { Sheet, SheetOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof SheetOperation.Create> = SheetOperation.Create.pipe(
+  Operation.withHandler(
+    Effect.fn(function* ({ name, rows, columns }) {
+      const object = yield* Database.add(Sheet.make({ name, rows, columns }));
+      yield* CollectionModel.add({ object }).pipe(Effect.catchTag('EntityNotFoundError', () => Effect.void));
+      yield* Database.flush();
+      return { id: Obj.getURI(object) };
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/get-values.ts

@@ -0,0 +1,83 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Operation } from '@dxos/compute';
+import { addressFromA1Notation, addressToA1Notation, isFormula } from '@dxos/compute-hyperformula';
+import { Database } from '@dxos/echo';
+
+import { SheetOperation, addressFromIndex, addressToIndex, mapFormulaIndicesToRefs } from '../types';
+
+const handler: Operation.WithHandler<typeof SheetOperation.GetValues> = SheetOperation.GetValues.pipe(
+  Operation.withHandler(
+    Effect.fn(function* ({ sheet: sheetRef, range }) {
+      const sheet = yield* Database.load(sheetRef);
+
+      let fromRow: number;
+      let fromCol: number;
+      let toRow: number;
+      let toCol: number;
+
+      if (range) {
+        const [fromPart, toPart = fromPart] = range.split(':');
+        const from = addressFromA1Notation(fromPart);
+        const to = addressFromA1Notation(toPart);
+        fromRow = from.row;
+        fromCol = from.col;
+        toRow = to.row;
+        toCol = to.col;
+      } else {
+        let minRow = Infinity;
+        let minCol = Infinity;
+        let maxRow = -1;
+        let maxCol = -1;
+        for (const key of Object.keys(sheet.cells)) {
+          const cellValue = sheet.cells[key]?.value;
+          if (cellValue !== undefined && cellValue !== null) {
+            const { row, col } = addressFromIndex(sheet, key);
+            if (row < minRow) {
+              minRow = row;
+            }
+            if (row > maxRow) {
+              maxRow = row;
+            }
+            if (col < minCol) {
+              minCol = col;
+            }
+            if (col > maxCol) {
+              maxCol = col;
+            }
+          }
+        }
+        fromRow = minRow === Infinity ? 0 : minRow;
+        fromCol = minCol === Infinity ? 0 : minCol;
+        toRow = maxRow;
+        toCol = maxCol;
+      }
+
+      if (toRow < 0) {
+        return { values: [], range: 'A1:A1' };
+      }
+
+      const values: (unknown | null)[][] = [];
+      for (let row = fromRow; row <= toRow; row++) {
+        const rowValues: (unknown | null)[] = [];
+        for (let col = fromCol; col <= toCol; col++) {
+          const idx = addressToIndex(sheet, { row, col });
+          const rawValue = sheet.cells[idx]?.value ?? null;
+          const value =
+            rawValue !== null && isFormula(String(rawValue)) ? mapFormulaIndicesToRefs(sheet, rawValue) : rawValue;
+          rowValues.push(value);
+        }
+        values.push(rowValues);
+      }
+
+      const actualRange = `${addressToA1Notation({ row: fromRow, col: fromCol })}:${addressToA1Notation({ row: toRow, col: toCol })}`;
+      return { values, range: actualRange };
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/index.ts

@@ -5,8 +5,11 @@
 import { OperationHandlerSet } from '@dxos/compute';
 
 export const SheetOperationHandlerSet = OperationHandlerSet.lazy(
+  () => import('./create'),
   () => import('./drop-axis'),
+  () => import('./get-values'),
   () => import('./insert-axis'),
   () => import('./restore-axis'),
   () => import('./scroll-to-anchor'),
+  () => import('./set-values'),
 );

package/src/operations/set-values.ts

@@ -0,0 +1,29 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Operation } from '@dxos/compute';
+import { addressFromA1Notation, isFormula } from '@dxos/compute-hyperformula';
+import { Database, Obj } from '@dxos/echo';
+
+import { SheetOperation, addressToIndex, mapFormulaRefsToIndices } from '../types';
+
+const handler: Operation.WithHandler<typeof SheetOperation.SetValues> = SheetOperation.SetValues.pipe(
+  Operation.withHandler(
+    Effect.fn(function* ({ sheet: sheetRef, cells }) {
+      const sheet = yield* Database.load(sheetRef);
+      Obj.update(sheet, (sheet) => {
+        for (const [address, value] of Object.entries(cells)) {
+          const cell = addressFromA1Notation(address);
+          const idx = addressToIndex(sheet, cell);
+          const stored = isFormula(String(value)) ? mapFormulaRefsToIndices(sheet, String(value)) : value;
+          sheet.cells[idx] = { value: stored };
+        }
+      });
+    }),
+  ),
+);
+
+export default handler;

package/src/skills/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { default as SheetSkill } from './sheet-skill';

package/src/skills/sheet-skill.ts

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Skill, Template } from '@dxos/compute';
+import { trim } from '@dxos/util';
+
+import { Sheet, SheetOperation } from '#types';
+
+const operations = [SheetOperation.Create, SheetOperation.GetValues, SheetOperation.SetValues];
+
+const make = () =>
+  Skill.make({
+    key: Sheet.SKILL_KEY,
+    name: 'Sheet',
+    tools: Skill.toolDefinitions({ operations }),
+    agentCanEnable: true,
+    instructions: Template.make({
+      source: trim`
+        You are an expert at working with spreadsheets.
+        The context object represents a Sheet — a collaborative spreadsheet backed by ECHO.
+
+        ## Reading data
+
+        Use the \`getValues\` tool to read cell values from the sheet.
+        It returns a 2D array indexed [row][col] and the A1 range it covers.
+        Omit the \`range\` parameter to read the entire occupied area, or pass a range like "A1:C5" to read a subset.
+
+        ## Writing data
+
+        Use \`setValues\` to write one or more cells at once.
+        Pass a map of A1 addresses to values, e.g. \`{ "A1": "Name", "B1": 42, "C1": "=SUM(A1:A5)" }\`.
+        Cell values can be plain scalars (string, number, boolean) or formula strings starting with "=".
+        Formula examples: "=SUM(A1:A5)", "=A1*B1", "=IF(C2>0,\"yes\",\"no\")".
+        Over 400 HyperFormula functions are available: arithmetic, statistical, text, date/time, financial, logical.
+
+      `,
+    }),
+  });
+
+const skill: Skill.Definition = {
+  key: Sheet.SKILL_KEY,
+  make,
+};
+
+export default skill;

package/src/types/Sheet.ts

@@ -6,12 +6,16 @@
 
 import * as Schema from 'effect/Schema';
 
+import { AppAnnotation } from '@dxos/app-toolkit';
 import { addressFromA1Notation, isFormula } from '@dxos/compute-hyperformula';
-import { DXN, Annotation, Obj, Type } from '@dxos/echo';
+import { Annotation, DXN, Obj, Type } from '@dxos/echo';
 import { FormInputAnnotation } from '@dxos/echo/Annotation';
+import { CollectionItemAnnotation } from '@dxos/schema';
 
 import { addressToIndex, initialize, mapFormulaRefsToIndices } from './util';
 
+export const SKILL_KEY = 'org.dxos.skill.sheet';
+
 export type SheetSize = {
   rows: number;
   columns: number;
@@ -42,32 +46,33 @@ export const RowColumnMeta = Schema.Struct({
 
 // TODO(burdon): Reconcile col/column (across packages).
 // TODO(burdon): Index to all updates when rows/columns are inserted/deleted.
-export const Sheet = Schema.Struct({
-  name: Schema.optional(Schema.String),
-
-  // Sparse map of cells referenced by index.
-  cells: Schema.Record({ key: Schema.String, value: CellValue }).pipe(FormInputAnnotation.set(false)),
+export class Sheet extends Type.makeObject<Sheet>(DXN.make('org.dxos.type.sheet', '0.1.0'))(
+  Schema.Struct({
+    name: Schema.optional(Schema.String),
 
-  // Ordered row indices.
-  rows: Schema.Array(Schema.String).pipe(FormInputAnnotation.set(false)),
+    // Sparse map of cells referenced by index.
+    cells: Schema.Record({ key: Schema.String, value: CellValue }).pipe(FormInputAnnotation.set(false)),
 
-  // Ordered column indices.
-  columns: Schema.Array(Schema.String).pipe(FormInputAnnotation.set(false)),
+    // Ordered row indices.
+    rows: Schema.Array(Schema.String).pipe(FormInputAnnotation.set(false)),
 
-  // Row metadata referenced by index.
-  rowMeta: Schema.Record({ key: Schema.String, value: RowColumnMeta }).pipe(FormInputAnnotation.set(false)),
+    // Ordered column indices.
+    columns: Schema.Array(Schema.String).pipe(FormInputAnnotation.set(false)),
 
-  // Column metadata referenced by index.
-  columnMeta: Schema.Record({ key: Schema.String, value: RowColumnMeta }).pipe(FormInputAnnotation.set(false)),
+    // Row metadata referenced by index.
+    rowMeta: Schema.Record({ key: Schema.String, value: RowColumnMeta }).pipe(FormInputAnnotation.set(false)),
 
-  // Cell formatting referenced by indexed range.
-  ranges: Schema.Array(Range).pipe(FormInputAnnotation.set(false)),
-}).pipe(
-  Annotation.IconAnnotation.set({ icon: 'ph--grid-nine--regular', hue: 'indigo' }),
-  Type.makeObject(DXN.make('org.dxos.type.sheet', '0.1.0')),
-);
+    // Column metadata referenced by index.
+    columnMeta: Schema.Record({ key: Schema.String, value: RowColumnMeta }).pipe(FormInputAnnotation.set(false)),
 
-export type Sheet = Type.InstanceType<typeof Sheet>;
+    // Cell formatting referenced by indexed range.
+    ranges: Schema.Array(Range).pipe(FormInputAnnotation.set(false)),
+  }).pipe(
+    Annotation.IconAnnotation.set({ icon: 'ph--grid-nine--regular', hue: 'indigo' }),
+    AppAnnotation.SkillsAnnotation.set([SKILL_KEY]),
+    CollectionItemAnnotation.set(true),
+  ),
+) {}
 
 export type SheetProps = {
   name?: string;