@dxos/plugin-space 0.8.4-main.bc674ce → 0.8.4-main.c351d160a8

package/dist/lib/browser/chunk-SJCNERZI.mjs

@@ -0,0 +1,115 @@
+// src/helpers/query.ts
+import * as Array from "effect/Array";
+import * as Effect from "effect/Effect";
+import * as EffectFunction from "effect/Function";
+import * as Match from "effect/Match";
+import * as Option from "effect/Option";
+import * as SchemaAST from "effect/SchemaAST";
+import { DXN, Filter, Key, Query } from "@dxos/echo";
+import { ReferenceAnnotationId, getTypeAnnotation, unwrapOptional } from "@dxos/echo/internal";
+import { runAndForwardErrors } from "@dxos/effect";
+import { log } from "@dxos/log";
+import { Person } from "@dxos/types";
+var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-space/src/helpers/query.ts";
+var evalQuery = (queryString) => {
+  const globals = {
+    Query,
+    Filter,
+    Person
+  };
+  try {
+    return new Function(...Object.keys(globals), `return ${queryString}`)(...Object.values(globals));
+  } catch (err) {
+    log.catch(err, void 0, {
+      F: __dxlog_file,
+      L: 33,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    return Query.select(Filter.nothing());
+  }
+};
+var resolveSchemaWithRegistry = (registry, query) => {
+  const resolve = Effect.fn(function* (dxn) {
+    const typename = DXN.parse(dxn).asTypeDXN()?.type;
+    if (!typename) {
+      return Option.none();
+    }
+    const query2 = registry.query({
+      typename,
+      location: [
+        "database",
+        "runtime"
+      ]
+    });
+    const schemas = yield* Effect.promise(() => query2.run());
+    return Array.head(schemas);
+  });
+  return resolveSchema(query, resolve).pipe(Effect.map((schema) => Option.getOrUndefined(schema)), runAndForwardErrors);
+};
+var resolveSchema = (query, resolve) => {
+  return Match.value(query).pipe(
+    Match.withReturnType(),
+    // TODO(wittjosiah): Reconcile with filter match?
+    Match.when({
+      type: "select"
+    }, ({ filter }) => typenameFromFilter(filter).pipe(Option.map((typename) => resolve(typename)), Option.getOrElse(() => Effect.succeed(Option.none())))),
+    Match.when({
+      type: "filter"
+    }, ({ filter }) => typenameFromFilter(filter).pipe(Option.map((typename) => resolve(typename)), Option.getOrElse(() => Effect.succeed(Option.none())))),
+    Match.when({
+      type: "reference-traversal"
+    }, ({ anchor, property }) => resolveSchema(anchor, resolve).pipe(Effect.map((base) => base.pipe(Option.map((schema) => SchemaAST.getPropertySignatures(schema.ast)), Option.flatMap((properties) => Array.findFirst(properties, (p) => p.name === property)), Option.flatMap((property2) => SchemaAST.getAnnotation(ReferenceAnnotationId)(unwrapOptional(property2))), Option.map((annotation) => annotation.typename))), Effect.flatMap(Option.match({
+      onNone: () => Effect.succeed(Option.none()),
+      onSome: (typename) => resolve(DXN.fromTypename(typename).toString())
+    })))),
+    Match.when({
+      type: "relation",
+      filter: Match.defined
+    }, ({ filter }) => typenameFromFilter(filter).pipe(Option.map((typename) => resolve(typename)), Option.getOrElse(() => Effect.succeed(Option.none())))),
+    Match.when({
+      type: "relation-traversal"
+    }, ({ anchor, direction }) => resolveSchema(anchor, resolve).pipe(Effect.map((base) => base.pipe(Option.map((schema) => getTypeAnnotation(schema)), Option.flatMap((annotation) => Option.fromNullable(direction === "source" ? annotation?.sourceSchema : annotation?.targetSchema)))), Effect.flatMap(Option.match({
+      onNone: () => Effect.succeed(Option.none()),
+      onSome: (typename) => resolve(typename)
+    })))),
+    Match.when({
+      type: "options"
+    }, ({ query: query2 }) => resolveSchema(query2, resolve)),
+    Match.orElse((_q) => {
+      return Effect.succeed(Option.none());
+    })
+  );
+};
+var typenameFromFilter = (filter) => Match.value(filter).pipe(Match.withReturnType(), Match.when({
+  type: "object"
+}, ({ typename }) => Option.fromNullable(typename)), Match.when({
+  type: "and"
+}, ({ filters }) => EffectFunction.pipe(filters, Array.map(typenameFromFilter), Array.findFirst(Option.isSome), Option.flatten)), Match.when({
+  type: "or"
+}, ({ filters }) => EffectFunction.pipe(filters, Array.map(typenameFromFilter), Array.findFirst(Option.isSome), Option.flatten)), Match.orElse(() => Option.none()));
+var getQueryTarget = (query, space) => {
+  return Match.value(query).pipe(Match.when({
+    type: "from"
+  }, ({ from }) => {
+    if (from._tag !== "scope") {
+      return space?.db;
+    }
+    const result = Option.fromNullable(from.scope.queues).pipe(Option.flatMap((queues) => Array.head(queues)), Option.flatMap((queueDxn) => Option.fromNullable(DXN.tryParse(String(queueDxn)))), Option.flatMap((parsed) => {
+      const q = parsed.asQueueDXN();
+      if (!q || !Key.ObjectId.isValid(q.queueId)) return Option.none();
+      return Option.fromNullable(space?.queues.get(parsed));
+    }));
+    if (from.scope.queues?.length && Option.isNone(result)) {
+      return void 0;
+    }
+    return Option.getOrElse(result, () => space?.db);
+  }), Match.orElse(() => space?.db));
+};
+
+export {
+  evalQuery,
+  resolveSchemaWithRegistry,
+  getQueryTarget
+};
+//# sourceMappingURL=chunk-SJCNERZI.mjs.map

package/dist/lib/browser/chunk-SJCNERZI.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/query.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Array from 'effect/Array';\nimport * as Effect from 'effect/Effect';\nimport * as EffectFunction from 'effect/Function';\nimport * as Match from 'effect/Match';\nimport * as Option from 'effect/Option';\nimport type * as Schema from 'effect/Schema';\nimport * as SchemaAST from 'effect/SchemaAST';\n\nimport { DXN, Filter, Key, Query, type QueryAST, type SchemaRegistry } from '@dxos/echo';\nimport {\n  ReferenceAnnotationId,\n  type ReferenceAnnotationValue,\n  getTypeAnnotation,\n  unwrapOptional,\n} from '@dxos/echo/internal';\nimport { runAndForwardErrors } from '@dxos/effect';\nimport { log } from '@dxos/log';\nimport { type Space } from '@dxos/react-client/echo';\nimport { Person } from '@dxos/types';\n\n// TODO(wittjosiah): Factor out and add tests.\n// TODO(wittjosiah): Support arbitrary type imports.\nexport const evalQuery = (queryString: string): Query.Any => {\n  const globals = { Query, Filter, Person };\n  try {\n    // eslint-disable-next-line @typescript-eslint/no-implied-eval\n    return new Function(...Object.keys(globals), `return ${queryString}`)(...Object.values(globals));\n  } catch (err) {\n    log.catch(err);\n    return Query.select(Filter.nothing());\n  }\n};\n\nexport const resolveSchemaWithRegistry = (registry: SchemaRegistry.SchemaRegistry, query: QueryAST.Query) => {\n  const resolve = Effect.fn(function* (dxn: string) {\n    const typename = DXN.parse(dxn).asTypeDXN()?.type;\n    if (!typename) {\n      return Option.none();\n    }\n\n    const query = registry.query({ typename, location: ['database', 'runtime'] });\n    const schemas = yield* Effect.promise(() => query.run());\n    return Array.head(schemas);\n  });\n\n  return resolveSchema(query, resolve).pipe(\n    Effect.map((schema) => Option.getOrUndefined(schema)),\n    runAndForwardErrors,\n  );\n};\n\nconst resolveSchema = (\n  query: QueryAST.Query,\n  resolve: (dxn: string) => Effect.Effect<Option.Option<Schema.Schema.AnyNoContext>>,\n): Effect.Effect<Option.Option<Schema.Schema.AnyNoContext>> => {\n  return Match.value(query).pipe(\n    Match.withReturnType<Effect.Effect<Option.Option<Schema.Schema.AnyNoContext>>>(),\n    // TODO(wittjosiah): Reconcile with filter match?\n    Match.when({ type: 'select' }, ({ filter }) =>\n      typenameFromFilter(filter).pipe(\n        Option.map((typename) => resolve(typename)),\n        Option.getOrElse(() => Effect.succeed(Option.none<Schema.Schema.AnyNoContext>())),\n      ),\n    ),\n    Match.when({ type: 'filter' }, ({ filter }) =>\n      typenameFromFilter(filter).pipe(\n        Option.map((typename) => resolve(typename)),\n        Option.getOrElse(() => Effect.succeed(Option.none<Schema.Schema.AnyNoContext>())),\n      ),\n    ),\n    Match.when({ type: 'reference-traversal' }, ({ anchor, property }) =>\n      resolveSchema(anchor, resolve).pipe(\n        Effect.map((base) =>\n          base.pipe(\n            Option.map((schema) => SchemaAST.getPropertySignatures(schema.ast)),\n            Option.flatMap((properties) => Array.findFirst(properties, (p) => p.name === property)),\n            Option.flatMap((property) =>\n              SchemaAST.getAnnotation<ReferenceAnnotationValue>(ReferenceAnnotationId)(unwrapOptional(property)),\n            ),\n            Option.map((annotation) => annotation.typename),\n          ),\n        ),\n        Effect.flatMap(\n          Option.match({\n            onNone: () => Effect.succeed(Option.none()),\n            onSome: (typename) => resolve(DXN.fromTypename(typename).toString()),\n          }),\n        ),\n      ),\n    ),\n    Match.when({ type: 'relation', filter: Match.defined }, ({ filter }) =>\n      typenameFromFilter(filter).pipe(\n        Option.map((typename) => resolve(typename)),\n        Option.getOrElse(() => Effect.succeed(Option.none<Schema.Schema.AnyNoContext>())),\n      ),\n    ),\n    Match.when({ type: 'relation-traversal' }, ({ anchor, direction }) =>\n      resolveSchema(anchor, resolve).pipe(\n        Effect.map((base) =>\n          base.pipe(\n            Option.map((schema) => getTypeAnnotation(schema)),\n            Option.flatMap((annotation) =>\n              Option.fromNullable(direction === 'source' ? annotation?.sourceSchema : annotation?.targetSchema),\n            ),\n          ),\n        ),\n        Effect.flatMap(\n          Option.match({\n            onNone: () => Effect.succeed(Option.none()),\n            onSome: (typename) => resolve(typename),\n          }),\n        ),\n      ),\n    ),\n    Match.when({ type: 'options' }, ({ query }) => resolveSchema(query, resolve)),\n    Match.orElse((_q) => {\n      // TODO(wittjosiah): Implement other cases.\n      return Effect.succeed(Option.none());\n    }),\n  );\n};\n\nconst typenameFromFilter = (filter: QueryAST.Filter): Option.Option<string> =>\n  Match.value(filter).pipe(\n    Match.withReturnType<Option.Option<string>>(),\n    Match.when({ type: 'object' }, ({ typename }) => Option.fromNullable(typename)),\n    Match.when({ type: 'and' }, ({ filters }) =>\n      EffectFunction.pipe(filters, Array.map(typenameFromFilter), Array.findFirst(Option.isSome), Option.flatten),\n    ),\n    Match.when({ type: 'or' }, ({ filters }) =>\n      EffectFunction.pipe(filters, Array.map(typenameFromFilter), Array.findFirst(Option.isSome), Option.flatten),\n    ),\n    Match.orElse(() => Option.none()),\n  );\n\n// TODO(wittjosiah): Currently assumes from scope is at the top-level of the ast.\nexport const getQueryTarget = (query: QueryAST.Query, space?: Space) => {\n  return Match.value(query).pipe(\n    Match.when({ type: 'from' }, ({ from }) => {\n      if (from._tag !== 'scope') {\n        return space?.db;\n      }\n      const result = Option.fromNullable(from.scope.queues).pipe(\n        Option.flatMap((queues) => Array.head(queues)),\n        Option.flatMap((queueDxn) => Option.fromNullable(DXN.tryParse(String(queueDxn)))),\n        Option.flatMap((parsed) => {\n          const q = parsed.asQueueDXN();\n          if (!q || !Key.ObjectId.isValid(q.queueId)) return Option.none();\n          return Option.fromNullable(space?.queues.get(parsed));\n        }),\n      );\n      // Skip query when a requested queue is not found (structurally invalid DXN or valid DXN\n      // referencing a queue not present in space.queues, e.g. not yet synced) to avoid 400 errors.\n      // TODO(wittjosiah): Can we handle this upstream?\n      if (from.scope.queues?.length && Option.isNone(result)) {\n        return undefined;\n      }\n      return Option.getOrElse(result, () => space?.db);\n    }),\n    Match.orElse(() => space?.db),\n  );\n};\n"],
+  "mappings": "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",
+  "names": ["Array", "Effect", "EffectFunction", "Match", "Option", "SchemaAST", "DXN", "Filter", "Key", "Query", "ReferenceAnnotationId", "getTypeAnnotation", "unwrapOptional", "runAndForwardErrors", "log", "Person", "evalQuery", "queryString", "globals", "Function", "Object", "keys", "values", "err", "catch", "select", "nothing", "resolveSchemaWithRegistry", "registry", "query", "resolve", "fn", "dxn", "typename", "parse", "asTypeDXN", "type", "none", "location", "schemas", "promise", "run", "head", "resolveSchema", "pipe", "map", "schema", "getOrUndefined", "value", "withReturnType", "when", "filter", "typenameFromFilter", "getOrElse", "succeed", "anchor", "property", "base", "getPropertySignatures", "ast", "flatMap", "properties", "findFirst", "p", "name", "getAnnotation", "annotation", "match", "onNone", "onSome", "fromTypename", "toString", "defined", "direction", "fromNullable", "sourceSchema", "targetSchema", "orElse", "_q", "filters", "isSome", "flatten", "getQueryTarget", "space", "from", "_tag", "db", "result", "scope", "queues", "queueDxn", "tryParse", "String", "parsed", "q", "asQueueDXN", "ObjectId", "isValid", "queueId", "get", "length", "isNone", "undefined"]
+}

package/dist/lib/browser/{chunk-AWVAX26X.mjs → chunk-SSTUPFZ2.mjs}

@@ -1,13 +1,13 @@
 // src/capabilities/identity-created/index.ts
 import { Capability } from "@dxos/app-framework";
-var IdentityCreated = Capability.lazy("IdentityCreated", () => import("./identity-created-VCFYLSBB.mjs"));
+var IdentityCreated = Capability.lazy("IdentityCreated", () => import("./identity-created-ETXNQYR6.mjs"));
 
 // src/capabilities/operation-resolver/index.ts
 import { Capability as Capability2 } from "@dxos/app-framework";
-var OperationResolver = Capability2.lazy("OperationResolver", () => import("./operation-resolver-SIRQT36Z.mjs"));
+var OperationResolver = Capability2.lazy("OperationResolver", () => import("./operation-resolver-D4LHB4D4.mjs"));
 
 export {
   IdentityCreated,
   OperationResolver
 };
-//# sourceMappingURL=chunk-AWVAX26X.mjs.map
+//# sourceMappingURL=chunk-SSTUPFZ2.mjs.map

package/dist/lib/browser/chunk-UYOJYBGW.mjs

@@ -0,0 +1,168 @@
+import {
+  SpaceCapabilities
+} from "./chunk-6IT5IBB5.mjs";
+import {
+  meta
+} from "./chunk-CBWGVOJE.mjs";
+
+// src/containers/SpacePresence/SpacePresence.tsx
+import React, { forwardRef, useCallback, useEffect, useState } from "react";
+import { useAtomCapability } from "@dxos/app-framework/ui";
+import { generateName } from "@dxos/display-name";
+import { Obj } from "@dxos/echo";
+import { PublicKey } from "@dxos/react-client";
+import { useMembers, useSpace } from "@dxos/react-client/echo";
+import { useIdentity } from "@dxos/react-client/halo";
+import { Avatar, List, ListItem, Popover, Tooltip, useDefaultValue, useTranslation } from "@dxos/react-ui";
+import { AttentionGlyph, useAttention } from "@dxos/react-ui-attention";
+import { ComplexMap, keyToFallback } from "@dxos/util";
+var REFRESH_INTERVAL = 5e3;
+var ACTIVITY_DURATION = 3e4;
+var noViewers = new ComplexMap(PublicKey.hash);
+var getName = (identity) => identity.profile?.displayName ?? generateName(identity.identityKey.toHex());
+var SpacePresence = ({ object, spaceId }) => {
+  const ephemeral = useAtomCapability(SpaceCapabilities.EphemeralState);
+  const identity = useIdentity();
+  const db = Obj.getDatabase(object);
+  const space = useSpace(spaceId ?? db?.spaceId);
+  const spaceMembers = useMembers(spaceId ?? db?.spaceId);
+  const [_moment, setMoment] = useState(Date.now());
+  useEffect(() => {
+    const interval = setInterval(() => setMoment(Date.now()), REFRESH_INTERVAL);
+    return () => clearInterval(interval);
+  }, []);
+  const memberOnline = useCallback((member) => member.presence === 1, []);
+  const memberIsNotSelf = useCallback((member) => !identity?.identityKey.equals(member.identity.identityKey), [
+    identity?.identityKey
+  ]);
+  if (!identity || !ephemeral || !space) {
+    return null;
+  }
+  const currentObjectViewers = ephemeral.viewersByObject[Obj.getDXN(object).toString()] ?? noViewers;
+  const membersForObject = spaceMembers.filter((member) => memberOnline(member) && memberIsNotSelf(member)).filter((member) => currentObjectViewers.has(member.identity.identityKey)).map((member) => {
+    const objectView = currentObjectViewers.get(member.identity.identityKey);
+    const lastSeen = objectView?.lastSeen ?? -Infinity;
+    const currentlyAttended = objectView?.currentlyAttended ?? false;
+    return {
+      ...member,
+      currentlyAttended,
+      lastSeen
+    };
+  }).toSorted((a, b) => a.lastSeen - b.lastSeen);
+  return /* @__PURE__ */ React.createElement(FullPresence, {
+    members: membersForObject
+  });
+};
+var FullPresence = (props) => {
+  const { size = 9, onMemberClick } = props;
+  const members = useDefaultValue(props.members, () => []);
+  if (members.length === 0) {
+    return null;
+  }
+  return /* @__PURE__ */ React.createElement("div", {
+    className: "dx-avatar-group",
+    "data-testid": "spacePlugin.presence"
+  }, members.slice(0, 3).map((member, i) => /* @__PURE__ */ React.createElement(Tooltip.Trigger, {
+    key: member.identity.identityKey.toHex(),
+    side: "bottom",
+    content: getName(member.identity),
+    className: "grid focus:outline-hidden"
+  }, /* @__PURE__ */ React.createElement(PresenceAvatar, {
+    identity: member.identity,
+    match: member.currentlyAttended,
+    index: members.length - i,
+    onClick: () => onMemberClick?.(member),
+    size
+  }))), members.length > 3 && /* @__PURE__ */ React.createElement(Popover.Root, null, /* @__PURE__ */ React.createElement(Popover.Trigger, {
+    className: "grid focus:outline-hidden"
+  }, /* @__PURE__ */ React.createElement(Avatar.Root, null, /* @__PURE__ */ React.createElement(Avatar.Content, {
+    status: "inactive",
+    style: {
+      zIndex: members.length - 4
+    },
+    fallback: `+${members.length - 3}`,
+    size
+  }))), /* @__PURE__ */ React.createElement(Popover.Portal, null, /* @__PURE__ */ React.createElement(Popover.Content, {
+    side: "bottom"
+  }, /* @__PURE__ */ React.createElement(Popover.Arrow, null), /* @__PURE__ */ React.createElement(Popover.Viewport, {
+    classNames: "max-h-56"
+  }, /* @__PURE__ */ React.createElement(List, null, members.map((member) => /* @__PURE__ */ React.createElement(ListItem.Root, {
+    key: member.identity.identityKey.toHex(),
+    classNames: "flex gap-2 items-center cursor-pointer mb-2",
+    onClick: () => onMemberClick?.(member),
+    "data-testid": "identity-list-item"
+  }, /* @__PURE__ */ React.createElement(PresenceAvatar, {
+    identity: member.identity,
+    size,
+    showName: true,
+    match: member.currentlyAttended
+  })))))))));
+};
+var PresenceAvatar = /* @__PURE__ */ forwardRef(({ identity, showName, match, index, onClick, size }, forwardedRef) => {
+  const status = match ? "current" : "active";
+  const fallbackValue = keyToFallback(identity.identityKey);
+  return /* @__PURE__ */ React.createElement(Avatar.Root, null, /* @__PURE__ */ React.createElement(Avatar.Content, {
+    status,
+    hue: identity.profile?.data?.hue || fallbackValue.hue,
+    "data-testid": "spacePlugin.presence.member",
+    "data-status": status,
+    size,
+    ...index ? {
+      style: {
+        zIndex: index
+      }
+    } : {},
+    onClick,
+    fallback: identity.profile?.data?.emoji || fallbackValue.emoji,
+    ref: forwardedRef
+  }), /* @__PURE__ */ React.createElement(Avatar.Label, {
+    classNames: showName ? "text-sm truncate px-2" : "sr-only"
+  }, getName(identity)));
+});
+var SmallPresenceLive = ({ id, open, viewers }) => {
+  const { hasAttention, isAncestor, isRelated } = useAttention(id);
+  const attended = hasAttention || isRelated;
+  const containsAttended = isAncestor && !open;
+  const getActiveViewers = (viewers2) => {
+    const moment = Date.now();
+    return Array.from(viewers2.values()).filter((viewer) => moment - viewer.lastSeen < ACTIVITY_DURATION);
+  };
+  const [activeViewers, setActiveViewers] = useState(viewers ? getActiveViewers(viewers) : []);
+  useEffect(() => {
+    if (viewers) {
+      setActiveViewers(getActiveViewers(viewers));
+      const interval = setInterval(() => {
+        setActiveViewers(getActiveViewers(viewers));
+      }, REFRESH_INTERVAL);
+      return () => clearInterval(interval);
+    }
+  }, [
+    viewers
+  ]);
+  return /* @__PURE__ */ React.createElement(SmallPresence, {
+    count: activeViewers.length,
+    attended,
+    containsAttended
+  });
+};
+var SmallPresence = ({ count = 0, attended, containsAttended }) => {
+  const { t } = useTranslation(meta.id);
+  return /* @__PURE__ */ React.createElement(Tooltip.Trigger, {
+    asChild: true,
+    content: t("presence label", {
+      count
+    }),
+    side: "bottom"
+  }, /* @__PURE__ */ React.createElement(AttentionGlyph, {
+    attended,
+    containsAttended,
+    presence: count > 1 ? "many" : count === 1 ? "one" : "none",
+    classNames: "self-center mx-1"
+  }));
+};
+
+export {
+  SpacePresence,
+  SmallPresenceLive
+};
+//# sourceMappingURL=chunk-UYOJYBGW.mjs.map

package/dist/lib/browser/chunk-UYOJYBGW.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/containers/SpacePresence/SpacePresence.tsx"],
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport React, { forwardRef, useCallback, useEffect, useState } from 'react';\n\nimport { useAtomCapability } from '@dxos/app-framework/ui';\nimport { generateName } from '@dxos/display-name';\nimport { type Key, Obj } from '@dxos/echo';\nimport { PublicKey } from '@dxos/react-client';\nimport { type SpaceMember, useMembers, useSpace } from '@dxos/react-client/echo';\nimport { type Identity, useIdentity } from '@dxos/react-client/halo';\nimport {\n  Avatar,\n  type AvatarContentProps,\n  type DxAvatar,\n  List,\n  ListItem,\n  Popover,\n  type Size,\n  type ThemedClassName,\n  Tooltip,\n  useDefaultValue,\n  useTranslation,\n} from '@dxos/react-ui';\nimport { AttentionGlyph, type AttentionGlyphProps, useAttention } from '@dxos/react-ui-attention';\nimport { ComplexMap, keyToFallback } from '@dxos/util';\n\nimport { meta } from '../../meta';\nimport { type ObjectViewerProps, SpaceCapabilities } from '../../types';\n\n// TODO(thure): Get/derive these values from protocol\nconst REFRESH_INTERVAL = 5000;\nconst ACTIVITY_DURATION = 30_000;\n\n// TODO(thure): This is chiefly meant to satisfy TS & provide an empty map after `deepSignal` interactions.\nconst noViewers = new ComplexMap<PublicKey, ObjectViewerProps>(PublicKey.hash);\n\n// TODO(wittjosiah): Factor out?\nconst getName = (identity: Identity) => identity.profile?.displayName ?? generateName(identity.identityKey.toHex());\n\nexport type SpacePresenceProps = {\n  object: Obj.Unknown;\n  spaceId?: Key.SpaceId;\n};\n\nexport const SpacePresence = ({ object, spaceId }: SpacePresenceProps) => {\n  const ephemeral = useAtomCapability(SpaceCapabilities.EphemeralState);\n  const identity = useIdentity();\n  const db = Obj.getDatabase(object);\n  const space = useSpace(spaceId ?? db?.spaceId);\n  const spaceMembers = useMembers(spaceId ?? db?.spaceId);\n\n  const [_moment, setMoment] = useState(Date.now());\n\n  // NOTE(thure): This is necessary so Presence updates without any underlying data updating.\n  useEffect(() => {\n    const interval = setInterval(() => setMoment(Date.now()), REFRESH_INTERVAL);\n    return () => clearInterval(interval);\n  }, []);\n\n  const memberOnline = useCallback((member: SpaceMember) => member.presence === 1, []);\n  const memberIsNotSelf = useCallback(\n    (member: SpaceMember) => !identity?.identityKey.equals(member.identity.identityKey),\n    [identity?.identityKey],\n  );\n\n  // TODO(thure): Could it be a smell to return early when there are interactions with `deepSignal` later, since it\n  //  prevents reactivity?\n  if (!identity || !ephemeral || !space) {\n    return null;\n  }\n\n  const currentObjectViewers = ephemeral.viewersByObject[Obj.getDXN(object).toString()] ?? noViewers;\n\n  const membersForObject = spaceMembers\n    .filter((member) => memberOnline(member) && memberIsNotSelf(member))\n    .filter((member) => currentObjectViewers.has(member.identity.identityKey))\n    .map((member) => {\n      const objectView = currentObjectViewers.get(member.identity.identityKey);\n      const lastSeen = objectView?.lastSeen ?? -Infinity;\n      const currentlyAttended = objectView?.currentlyAttended ?? false;\n\n      return {\n        ...member,\n        currentlyAttended,\n        lastSeen,\n      };\n    })\n    .toSorted((a, b) => a.lastSeen - b.lastSeen);\n\n  return <FullPresence members={membersForObject} />;\n};\n\nexport type Member = SpaceMember & {\n  /**\n   * Last time a member was seen on this object.\n   */\n  lastSeen: number;\n  currentlyAttended: boolean;\n};\n\nexport type MemberPresenceProps = ThemedClassName<{\n  size?: Size;\n  members?: Member[];\n  showCount?: boolean;\n  onMemberClick?: (member: Member) => void;\n}>;\n\nexport const FullPresence = (props: MemberPresenceProps) => {\n  const { size = 9, onMemberClick } = props;\n  const members = useDefaultValue(props.members, () => []);\n\n  if (members.length === 0) {\n    return null;\n  }\n\n  return (\n    <div className='dx-avatar-group' data-testid='spacePlugin.presence'>\n      {members.slice(0, 3).map((member, i) => (\n        <Tooltip.Trigger\n          key={member.identity.identityKey.toHex()}\n          side='bottom'\n          content={getName(member.identity)}\n          className='grid focus:outline-hidden'\n        >\n          <PresenceAvatar\n            identity={member.identity}\n            match={member.currentlyAttended} // TODO(Zan): Match always true now we're showing 'members viewing current object'.\n            index={members.length - i}\n            onClick={() => onMemberClick?.(member)}\n            size={size}\n          />\n        </Tooltip.Trigger>\n      ))}\n\n      {members.length > 3 && (\n        <Popover.Root>\n          <Popover.Trigger className='grid focus:outline-hidden'>\n            <Avatar.Root>\n              {/* TODO(wittjosiah): Make text fit. */}\n              <Avatar.Content\n                status='inactive'\n                style={{ zIndex: members.length - 4 }}\n                fallback={`+${members.length - 3}`}\n                size={size}\n              />\n            </Avatar.Root>\n          </Popover.Trigger>\n          <Popover.Portal>\n            <Popover.Content side='bottom'>\n              <Popover.Arrow />\n              <Popover.Viewport classNames='max-h-56'>\n                <List>\n                  {members.map((member) => (\n                    <ListItem.Root\n                      key={member.identity.identityKey.toHex()}\n                      classNames='flex gap-2 items-center cursor-pointer mb-2'\n                      onClick={() => onMemberClick?.(member)}\n                      data-testid='identity-list-item'\n                    >\n                      {/* TODO(Zan): Match always true now we're showing 'members viewing current object'. */}\n                      <PresenceAvatar\n                        identity={member.identity}\n                        size={size}\n                        showName\n                        match={member.currentlyAttended}\n                      />\n                    </ListItem.Root>\n                  ))}\n                </List>\n              </Popover.Viewport>\n            </Popover.Content>\n          </Popover.Portal>\n        </Popover.Root>\n      )}\n    </div>\n  );\n};\n\ntype PresenceAvatarProps = Pick<AvatarContentProps, 'size'> & {\n  identity: Identity;\n  showName?: boolean;\n  match?: boolean;\n  index?: number;\n  onClick?: () => void;\n};\n\nconst PresenceAvatar = forwardRef<DxAvatar, PresenceAvatarProps>(\n  ({ identity, showName, match, index, onClick, size }, forwardedRef) => {\n    const status = match ? 'current' : 'active';\n    const fallbackValue = keyToFallback(identity.identityKey);\n    return (\n      <Avatar.Root>\n        <Avatar.Content\n          status={status}\n          hue={identity.profile?.data?.hue || fallbackValue.hue}\n          data-testid='spacePlugin.presence.member'\n          data-status={status}\n          size={size}\n          {...(index ? { style: { zIndex: index } } : {})}\n          onClick={onClick}\n          fallback={identity.profile?.data?.emoji || fallbackValue.emoji}\n          ref={forwardedRef}\n        />\n        <Avatar.Label classNames={showName ? 'text-sm truncate px-2' : 'sr-only'}>{getName(identity)}</Avatar.Label>\n      </Avatar.Root>\n    );\n  },\n);\n\nexport type SmallPresenceLiveProps = {\n  id?: string;\n  open?: boolean;\n  viewers?: ComplexMap<PublicKey, ObjectViewerProps>;\n};\n\nexport const SmallPresenceLive = ({ id, open, viewers }: SmallPresenceLiveProps) => {\n  const { hasAttention, isAncestor, isRelated } = useAttention(id);\n  const attended = hasAttention || isRelated;\n  const containsAttended = isAncestor && !open;\n  const getActiveViewers = (viewers: ComplexMap<PublicKey, ObjectViewerProps>): ObjectViewerProps[] => {\n    const moment = Date.now();\n    return Array.from<ObjectViewerProps>(viewers.values()).filter(\n      (viewer) => moment - viewer.lastSeen < ACTIVITY_DURATION,\n    );\n  };\n\n  const [activeViewers, setActiveViewers] = useState(viewers ? getActiveViewers(viewers) : []);\n\n  useEffect(() => {\n    if (viewers) {\n      setActiveViewers(getActiveViewers(viewers));\n      const interval = setInterval(() => {\n        setActiveViewers(getActiveViewers(viewers));\n      }, REFRESH_INTERVAL);\n      return () => clearInterval(interval);\n    }\n  }, [viewers]);\n\n  return <SmallPresence count={activeViewers.length} attended={attended} containsAttended={containsAttended} />;\n};\n\nexport type SmallPresenceProps = {\n  count?: number;\n} & Pick<AttentionGlyphProps, 'attended' | 'containsAttended'>;\n\nexport const SmallPresence = ({ count = 0, attended, containsAttended }: SmallPresenceProps) => {\n  const { t } = useTranslation(meta.id);\n\n  return (\n    <Tooltip.Trigger asChild content={t('presence label', { count })} side='bottom'>\n      <AttentionGlyph\n        attended={attended}\n        containsAttended={containsAttended}\n        presence={count > 1 ? 'many' : count === 1 ? 'one' : 'none'}\n        classNames='self-center mx-1'\n      />\n    </Tooltip.Trigger>\n  );\n};\n"],
+  "mappings": "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",
+  "names": ["React", "forwardRef", "useCallback", "useEffect", "useState", "useAtomCapability", "generateName", "Obj", "PublicKey", "useMembers", "useSpace", "useIdentity", "Avatar", "List", "ListItem", "Popover", "Tooltip", "useDefaultValue", "useTranslation", "AttentionGlyph", "useAttention", "ComplexMap", "keyToFallback", "REFRESH_INTERVAL", "ACTIVITY_DURATION", "noViewers", "ComplexMap", "PublicKey", "hash", "getName", "identity", "profile", "displayName", "generateName", "identityKey", "toHex", "SpacePresence", "object", "spaceId", "ephemeral", "useAtomCapability", "SpaceCapabilities", "EphemeralState", "useIdentity", "db", "Obj", "getDatabase", "space", "useSpace", "spaceMembers", "useMembers", "_moment", "setMoment", "useState", "Date", "now", "useEffect", "interval", "setInterval", "clearInterval", "memberOnline", "useCallback", "member", "presence", "memberIsNotSelf", "equals", "currentObjectViewers", "viewersByObject", "getDXN", "toString", "membersForObject", "filter", "has", "map", "objectView", "get", "lastSeen", "currentlyAttended", "toSorted", "a", "b", "FullPresence", "members", "props", "size", "onMemberClick", "useDefaultValue", "length", "div", "className", "data-testid", "slice", "i", "Tooltip", "Trigger", "key", "side", "content", "PresenceAvatar", "match", "index", "onClick", "Popover", "Root", "Avatar", "Content", "status", "style", "zIndex", "fallback", "Portal", "Arrow", "Viewport", "classNames", "List", "ListItem", "showName", "forwardRef", "forwardedRef", "fallbackValue", "keyToFallback", "hue", "data", "data-status", "emoji", "ref", "Label", "SmallPresenceLive", "id", "open", "viewers", "hasAttention", "isAncestor", "isRelated", "useAttention", "attended", "containsAttended", "getActiveViewers", "moment", "Array", "from", "values", "viewer", "activeViewers", "setActiveViewers", "SmallPresence", "count", "t", "useTranslation", "meta", "asChild", "AttentionGlyph"]
+}

package/dist/lib/browser/cli/index.mjs

@@ -1,21 +1,23 @@
 import {
   IdentityCreated,
   OperationResolver
-} from "../chunk-AWVAX26X.mjs";
+} from "../chunk-SSTUPFZ2.mjs";
 import {
   SpaceEvents
-} from "../chunk-CCRSHECL.mjs";
+} from "../chunk-6IT5IBB5.mjs";
 import {
   meta
-} from "../chunk-HSMQFM57.mjs";
+} from "../chunk-CBWGVOJE.mjs";
 
 // src/cli/plugin.ts
 import * as Effect17 from "effect/Effect";
-import { Capability, Common as Common12, Plugin as Plugin2 } from "@dxos/app-framework";
+import { ActivationEvents, Capability, Plugin as Plugin2 } from "@dxos/app-framework";
+import { AppPlugin } from "@dxos/app-toolkit";
 import { Tag } from "@dxos/echo";
+import { Collection as Collection2 } from "@dxos/echo";
 import { ClientEvents } from "@dxos/plugin-client/types";
-import { Collection as Collection2, DataTypes } from "@dxos/schema";
-import { AnchoredTo, Employer, Event, HasConnection, HasRelationship, HasSubject, Organization, Person, Project, Task } from "@dxos/types";
+import { DataTypes } from "@dxos/schema";
+import { AnchoredTo, Employer, Event, HasConnection, HasRelationship, HasSubject, Organization, Person, Pipeline, Task } from "@dxos/types";
 
 // src/cli/commands/database/index.ts
 import * as Command5 from "@effect/cli/Command";
@@ -27,12 +29,13 @@ import * as Prompt from "@effect/cli/Prompt";
 import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
-import { Common as AppFrameworkCommon, Plugin } from "@dxos/app-framework";
+import { Plugin } from "@dxos/app-framework";
+import { AppActivationEvents, AppCapabilities } from "@dxos/app-toolkit";
 import { CommandConfig, Common, flushAndSync, print, spaceLayer } from "@dxos/cli-util";
 import { SpaceProperties } from "@dxos/client/echo";
 import { Database, Filter, Obj, Ref, Type } from "@dxos/echo";
+import { Collection } from "@dxos/echo";
 import { EntityKind, getTypeAnnotation } from "@dxos/echo/internal";
-import { Collection } from "@dxos/schema";
 
 // src/cli/commands/database/util.ts
 import { FormBuilder } from "@dxos/cli-util";
@@ -58,13 +61,13 @@ var add = Command.make("add", {
   const { json } = yield* CommandConfig;
   const manager = yield* Plugin.Service;
   const { db } = yield* Database.Service;
-  yield* manager.activate(AppFrameworkCommon.ActivationEvent.SetupMetadata);
+  yield* manager.activate(AppActivationEvents.SetupMetadata);
   const resolve = (typename2) => {
-    const metadata2 = manager.capabilities.getAll(AppFrameworkCommon.Capability.Metadata).find(({ id }) => id === typename2)?.metadata;
+    const metadata2 = manager.capabilities.getAll(AppCapabilities.Metadata).find(({ id }) => id === typename2)?.metadata;
     return metadata2?.createObject ? metadata2 : void 0;
   };
-  const [properties] = yield* Database.Service.runQuery(Filter.type(SpaceProperties));
-  const collection = yield* Database.Service.load(properties[Collection.Collection.typename]);
+  const [properties] = yield* Database.runQuery(Filter.type(SpaceProperties));
+  const collection = yield* Database.load(properties[Collection.Collection.typename]);
   const selectedTypename = yield* Option.match(typename, {
     onNone: () => selectTypename(resolve),
     onSome: (t) => Effect.succeed(t)
@@ -93,7 +96,7 @@ var add = Command.make("add", {
   });
 })).pipe(Command.withDescription("Add an object to a space."), Command.provide(({ spaceId }) => spaceLayer(spaceId, true)));
 var selectTypename = Effect.fn(function* (resolve) {
-  const schemas = yield* Database.Service.runSchemaQuery({
+  const schemas = yield* Database.runSchemaQuery({
     location: [
       "database",
       "runtime"
@@ -127,7 +130,7 @@ var handler = ({ typename }) => Effect2.gen(function* () {
     onNone: () => Filter2.everything(),
     onSome: (typename2) => Filter2.typename(typename2)
   });
-  const objects = yield* Database2.Service.runQuery(filter);
+  const objects = yield* Database2.runQuery(filter);
   if (json) {
     yield* Console2.log(JSON.stringify(objects, null, 2));
   } else {
@@ -165,9 +168,9 @@ var remove = Command3.make("remove", {
   } else {
     throw new Error("Must specify typename or id");
   }
-  const objects = yield* Database3.Service.runQuery(query3);
+  const objects = yield* Database3.runQuery(query3);
   for (const object of objects) {
-    yield* Database3.Service.remove(object);
+    yield* Database3.remove(object);
   }
   if (json) {
     yield* Console3.log(JSON.stringify({
@@ -193,7 +196,7 @@ var stats = Command4.make("stats", {
   spaceId: Common4.spaceId.pipe(Options4.optional)
 }, () => Effect4.gen(function* () {
   const { json } = yield* CommandConfig4;
-  const objects = yield* Database4.Service.runQuery(Query2.select(Filter4.everything()));
+  const objects = yield* Database4.runQuery(Query2.select(Filter4.everything()));
   const stats2 = Function.pipe(objects, Array.groupBy((obj) => Obj2.getTypename(obj) ?? "<empty>"), Record.map((objs) => objs.length));
   if (json) {
     yield* Console4.log(JSON.stringify(stats2, null, 2));
@@ -273,9 +276,7 @@ var handler2 = ({ spaceId }) => Effect6.gen(function* () {
   const { json } = yield* CommandConfig6;
   const client = yield* ClientService2;
   const space2 = yield* getSpace(spaceId);
-  yield* Effect6.tryPromise(() => space2.db.flush({
-    indexes: true
-  }));
+  yield* Effect6.tryPromise(() => space2.db.flush());
   yield* waitForSync(space2);
   yield* Effect6.tryPromise(() => space2.close());
   if (json) {
@@ -325,9 +326,7 @@ var handler3 = Effect7.fn(function* ({ name }) {
     }).pipe(FormBuilder3.set("key", space2.key.truncate()), FormBuilder3.set("name", space2.properties.name ?? "<none>"));
     yield* Console7.log(print3(FormBuilder3.build(builder)));
   }
-  yield* Effect7.tryPromise(() => space2.db.flush({
-    indexes: true
-  }));
+  yield* Effect7.tryPromise(() => space2.db.flush());
   yield* waitForSync2(space2);
 });
 var create = Command9.make("create", {
@@ -495,9 +494,7 @@ var handler5 = Effect10.fn(function* ({ invitationCode, authCode }) {
     }
     return;
   }
-  yield* Effect10.tryPromise(() => space2.db.flush({
-    indexes: true
-  }));
+  yield* Effect10.tryPromise(() => space2.db.flush());
   yield* waitForSync3(space2);
   if (json) {
     yield* Console9.log(JSON.stringify({
@@ -595,9 +592,7 @@ var handler8 = ({ spaceId }) => Effect13.gen(function* () {
   const client = yield* ClientService8;
   const space2 = yield* getSpace4(spaceId);
   yield* Effect13.tryPromise(() => space2.open());
-  yield* Effect13.tryPromise(() => space2.db.flush({
-    indexes: true
-  }));
+  yield* Effect13.tryPromise(() => space2.db.flush());
   yield* waitForSync4(space2);
   if (json) {
     yield* Console12.log(JSON.stringify({
@@ -787,14 +782,22 @@ var space = Command19.make("space").pipe(Command19.withDescription("Manage ECHO
 // src/cli/plugin.ts
 var SpacePlugin = Plugin2.define(meta).pipe(
   // TODO(wittjosiah): Could some of these commands make use of operations?
-  Common12.Plugin.addCommandModule({
+  AppPlugin.addCommandModule({
     commands: [
       database,
       queue,
       space
     ]
   }),
-  Common12.Plugin.addSchemaModule({
+  AppPlugin.addMetadataModule({
+    metadata: {
+      id: Collection2.Collection.typename,
+      metadata: {
+        createObject: (props) => Effect17.sync(() => Collection2.make(props))
+      }
+    }
+  }),
+  AppPlugin.addSchemaModule({
     schema: [
       ...DataTypes,
       AnchoredTo.AnchoredTo,
@@ -805,29 +808,20 @@ var SpacePlugin = Plugin2.define(meta).pipe(
       HasSubject.HasSubject,
       Organization.Organization,
       Person.Person,
-      Project.Project,
+      Pipeline.Pipeline,
       Tag.Tag,
       Task.Task
     ]
   }),
-  Common12.Plugin.addMetadataModule({
-    metadata: {
-      id: Collection2.Collection.typename,
-      metadata: {
-        createObject: (props) => Effect17.sync(() => Collection2.make(props)),
-        addToCollectionOnCreate: true
-      }
-    }
-  }),
-  Plugin2.addModule(({ invitationUrl = "http://localhost:5173", invitationProp = "spaceInvitationCode" }) => {
+  Plugin2.addModule(({ shareableLinkOrigin = "http://localhost:5173", invitationPath = "/", invitationProp = "spaceInvitationCode" }) => {
     const createInvitationUrl = (invitationCode) => {
-      const baseUrl = new URL(invitationUrl);
+      const baseUrl = new URL(invitationPath || "/", shareableLinkOrigin);
       baseUrl.searchParams.set(invitationProp, invitationCode);
       return baseUrl.toString();
     };
     return {
       id: Capability.getModuleTag(OperationResolver),
-      activatesOn: Common12.ActivationEvent.SetupOperationResolver,
+      activatesOn: ActivationEvents.SetupOperationResolver,
       activate: () => OperationResolver({
         createInvitationUrl,
         observability: false