@dxos/plugin-native 0.8.4-main.dedc0f3 → 0.8.4-main.dfabb4ec29

package/package.json

@@ -1,51 +1,87 @@
 {
   "name": "@dxos/plugin-native",
-  "version": "0.8.4-main.dedc0f3",
+  "version": "0.8.4-main.dfabb4ec29",
   "description": "Composer plugin that runs when on a native device.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#plugin": {
+      "source": "./src/NativePlugin.tsx",
+      "types": "./dist/types/src/NativePlugin.d.ts",
+      "default": "./dist/lib/neutral/NativePlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    }
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@effect/platform": "^0.90.2",
-    "@tauri-apps/api": "^2.3.0",
-    "@tauri-apps/plugin-os": "^2.3.0",
+    "@effect/platform": "0.94.4",
+    "@tauri-apps/api": "^2.8.0",
+    "@tauri-apps/plugin-os": "^2.3.1",
     "@tauri-apps/plugin-process": "^2.3.0",
-    "@tauri-apps/plugin-shell": "^2.3.0",
+    "@tauri-apps/plugin-shell": "^2.3.1",
     "@tauri-apps/plugin-updater": "^2.9.0",
-    "effect": "3.17.7",
-    "@dxos/app-framework": "0.8.4-main.dedc0f3",
-    "@dxos/ai": "0.8.4-main.dedc0f3",
-    "@dxos/log": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-assistant": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-help": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-navtree": "0.8.4-main.dedc0f3",
-    "@dxos/util": "0.8.4-main.dedc0f3"
+    "effect": "3.20.0",
+    "@dxos/app-framework": "0.8.4-main.dfabb4ec29",
+    "@dxos/ai": "0.8.4-main.dfabb4ec29",
+    "@dxos/app-toolkit": "0.8.4-main.dfabb4ec29",
+    "@dxos/log": "0.8.4-main.dfabb4ec29",
+    "@dxos/operation": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-assistant": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-navtree": "0.8.4-main.dfabb4ec29",
+    "@dxos/util": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-help": "0.8.4-main.dfabb4ec29"
   },
   "devDependencies": {
-    "vite": "7.1.1",
-    "@dxos/react-ui": "0.8.4-main.dedc0f3"
+    "vite": "^8.0.10",
+    "@dxos/plugin-testing": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui": "0.8.4-main.dfabb4ec29"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "@dxos/react-ui": "0.8.4-main.dedc0f3"
+    "effect": "3.20.0",
+    "@dxos/react-ui": "0.8.4-main.dfabb4ec29"
   },
   "publishConfig": {
     "access": "public"

package/src/NativePlugin.tsx

@@ -2,33 +2,32 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
+import { ActivationEvents, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 import { AssistantEvents } from '@dxos/plugin-assistant';
 
-import { Ollama, Updater, Window } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
+import { Ollama, SpotlightListener, Updater } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
 
-export const NativePlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/updater`,
-      activatesOn: Events.DispatcherReady,
-      activate: Updater,
-    }),
-    defineModule({
-      id: `${meta.id}/module/window`,
-      activatesOn: Events.DispatcherReady,
-      activate: Window,
-    }),
-    defineModule({
-      id: `${meta.id}/module/ollama`,
-      activatesOn: AssistantEvents.SetupAiServiceProviders,
-      activate: Ollama,
-    }),
-  ]);
+export const NativePlugin = Plugin.define(meta).pipe(
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    id: 'spotlight-listener',
+    activatesOn: ActivationEvents.OperationInvokerReady,
+    activate: SpotlightListener,
+  }),
+  Plugin.addModule({
+    id: 'updater',
+    activatesOn: ActivationEvents.OperationInvokerReady,
+    activate: Updater,
+  }),
+  Plugin.addModule({
+    id: 'ollama',
+    activatesOn: AssistantEvents.SetupAiServiceProviders,
+    activate: Ollama,
+  }),
+  Plugin.make,
+);
+
+export default NativePlugin;

package/src/capabilities/index.ts

@@ -2,8 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
 
-export const Ollama = lazy(() => import('./ollama'));
-export const Updater = lazy(() => import('./updater'));
-export const Window = lazy(() => import('./window'));
+export const Ollama = Capability.lazy('Ollama', () => import('./ollama'));
+export const SpotlightListener = Capability.lazy('SpotlightListener', () => import('./spotlight-listener'));
+export const Updater = Capability.lazy('Updater', () => import('./updater'));

package/src/capabilities/ollama.ts

@@ -2,34 +2,41 @@
 // Copyright 2025 DXOS.org
 //
 
-import { FetchHttpClient, HttpClient } from '@effect/platform';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as HttpClient from '@effect/platform/HttpClient';
 import { Command } from '@tauri-apps/plugin-shell';
-import { Context, Effect, Layer, ManagedRuntime } from 'effect';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as ManagedRuntime from 'effect/ManagedRuntime';
 
-import { AiServiceRouter } from '@dxos/ai';
-import { type Capability, type PluginContext, contributes } from '@dxos/app-framework';
+import { type AiModelResolver } from '@dxos/ai';
+import { OllamaResolver } from '@dxos/ai/resolvers';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { log } from '@dxos/log';
-import { AssistantCapabilities } from '@dxos/plugin-assistant';
 
-// Running ollama on non-standard port.
+// NOTE: Running ollama on non-standard port (config Tauri).
 const OLLAMA_HOST = 'http://localhost:21434';
 
-export default (_context: PluginContext): Capability<any> => {
-  const runtime = ManagedRuntime.make(OllamaSidecar.layerLive);
+export type OllamaCapabilities = Capability.Capability<typeof AppCapabilities.AiModelResolver>;
 
-  // Layer for the sidecar but the lifecycle is managed by the runtime.
-  const sidecarLayer = Layer.effectContext(
-    runtime.runtimeEffect.pipe(Effect.map((rt) => rt.context.pipe(Context.pick(OllamaSidecar)))),
-  );
+export default Capability.makeModule<[], OllamaCapabilities>(() =>
+  Effect.sync(() => {
+    const runtime = ManagedRuntime.make(OllamaSidecar.layerLive);
 
-  return contributes(
-    AssistantCapabilities.AiModelResolver,
-    OllamaSidecarModelResolver.pipe(Layer.provide(sidecarLayer)),
-    async () => {
-      await runtime.dispose();
-    },
-  );
-};
+    // Layer for the sidecar but the lifecycle is managed by the runtime.
+    const sidecarLayer = Layer.effectContext(
+      runtime.runtimeEffect.pipe(Effect.map((rt) => rt.context.pipe(Context.pick(OllamaSidecar)))),
+    );
+
+    return Capability.contributes(
+      AppCapabilities.AiModelResolver,
+      OllamaSidecarModelResolver.pipe(Layer.provide(sidecarLayer)),
+      () => Effect.tryPromise(() => runtime.dispose()),
+    );
+  }),
+);
 
 class OllamaSidecar extends Context.Tag('@dxos/plugin-native/OllamaSidecar')<
   OllamaSidecar,
@@ -48,7 +55,9 @@ class OllamaSidecar extends Context.Tag('@dxos/plugin-native/OllamaSidecar')<
       });
 
       // NOTE: Keeping those as console.log for consistent formatting.
+      // eslint-disable-next-line no-console
       command.stdout.on('data', (data) => console.log('[ollama]', data.toString()));
+      // eslint-disable-next-line no-console
       command.stderr.on('data', (data) => console.error('[ollama]', data.toString()));
       command.on('close', (code) => log.info('Ollama process exited', { code }));
       command.on('error', (error) => log.error('Ollama error', { error }));
@@ -67,12 +76,12 @@ class OllamaSidecar extends Context.Tag('@dxos/plugin-native/OllamaSidecar')<
   );
 }
 
-const OllamaSidecarModelResolver: Layer.Layer<AiServiceRouter.AiModelResolver, never, OllamaSidecar> =
+const OllamaSidecarModelResolver: Layer.Layer<AiModelResolver.AiModelResolver, never, OllamaSidecar> =
   Layer.unwrapEffect(
     Effect.gen(function* () {
       const { endpoint } = yield* OllamaSidecar;
-      return AiServiceRouter.OllamaResolver({
-        host: endpoint,
+      return OllamaResolver.make({
+        endpoint,
         transformClient: HttpClient.withTracerPropagation(false),
       });
     }),

package/src/capabilities/spotlight-listener.ts

@@ -0,0 +1,58 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { log } from '@dxos/log';
+
+// TODO(wittjosiah): Formalize with a stricter schema if we evolve this protocol.
+type SpotlightInvokePayload = {
+  operation: string;
+  payload?: Record<string, any>;
+};
+
+/**
+ * Listens for spotlight:invoke events from the popover window and dispatches the corresponding operation.
+ */
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const { invokePromise } = yield* Capability.get(Capabilities.OperationInvoker);
+
+    const unlisten = yield* Effect.promise(async () => {
+      const { listen } = await import('@tauri-apps/api/event');
+      const { getCurrentWindow } = await import('@tauri-apps/api/window');
+
+      return listen<SpotlightInvokePayload>('spotlight:invoke', async (event) => {
+        const { operation, payload } = event.payload;
+        log.info('Received spotlight invoke event', { operation, payload });
+        try {
+          switch (operation) {
+            case 'open':
+              await invokePromise(LayoutOperation.Open, payload as any);
+              break;
+            case 'switch-workspace':
+              await invokePromise(LayoutOperation.SwitchWorkspace, payload as any);
+              break;
+            default:
+              log.warn('Unknown spotlight operation', { operation });
+          }
+
+          const mainWindow = getCurrentWindow();
+          await mainWindow.show();
+          await mainWindow.setFocus();
+        } catch (err) {
+          log.catch(err);
+        }
+      });
+    });
+
+    return Capability.contributes(Capabilities.Null, null, () =>
+      Effect.sync(() => {
+        unlisten();
+      }),
+    );
+  }),
+);

package/src/capabilities/updater.ts

@@ -4,77 +4,126 @@
 
 import { type } from '@tauri-apps/plugin-os';
 import { relaunch } from '@tauri-apps/plugin-process';
-import { type DownloadEvent, check } from '@tauri-apps/plugin-updater';
-import { Duration, Effect, Fiber, Match, Schedule, pipe } from 'effect';
+import * as Updater from '@tauri-apps/plugin-updater';
+import * as Duration from 'effect/Duration';
+import * as Effect from 'effect/Effect';
+import * as Fiber from 'effect/Fiber';
+import * as Match from 'effect/Match';
+import * as Schedule from 'effect/Schedule';
 
-import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { LayoutOperation } from '@dxos/app-toolkit';
 import { log } from '@dxos/log';
 
-import { NATIVE_PLUGIN } from '../meta';
+import { meta } from '#meta';
+
+import { TAURI_LOCALHOST_PORT } from '../constants';
 
 const SUPPORTS_OTA = ['linux', 'macos', 'windows'];
 
-export default (context: PluginContext) => {
-  // Skip updates if not supported or in dev mode.
-  const platform = type();
-  if (!SUPPORTS_OTA.includes(platform) || window.location.hostname === 'localhost') {
-    return contributes(Capabilities.Null, null);
+/**
+ * Safely check for updates with error logging.
+ */
+const check = async (): Promise<Updater.Update | null> => {
+  try {
+    return await Updater.check();
+  } catch (error) {
+    log.error('failed to check for updates', { error });
+    return null;
   }
+};
 
-  const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+/**
+ * Safely download and install update with error logging.
+ */
+const downloadAndInstall = async (
+  update: Updater.Update,
+  handleDownload: (event: Updater.DownloadEvent) => void,
+): Promise<boolean> => {
+  try {
+    await update.downloadAndInstall(handleDownload);
+    return true;
+  } catch (error) {
+    log.error('failed to download and install update', { error });
+    return false;
+  }
+};
 
-  // https://tauri.app/plugin/updater/#checking-for-updates
-  const action = Effect.gen(function* () {
-    log.info('checking for updates');
-    const update = yield* Effect.tryPromise(() => check());
-    log.info('checked for updates', { version: update?.version, currentVersion: update?.currentVersion });
-    if (update) {
-      log.info('update available', update);
-      let downloaded = 0;
-      let contentLength = 0;
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    // Skip updates if not supported or in dev mode.
+    const platform = type();
+    const isDevServer = window.location.port !== TAURI_LOCALHOST_PORT;
+    if (!SUPPORTS_OTA.includes(platform) || isDevServer) {
+      log.info('skipping updater', { platform, port: window.location.port });
+      return;
+    }
 
-      const handleDownload = Match.type<DownloadEvent>().pipe(
-        Match.when({ event: 'Started' }, (event) => {
-          contentLength = event.data.contentLength ?? 0;
-          log.info('download started', { contentLength });
-        }),
-        Match.when({ event: 'Progress' }, (event) => {
-          downloaded += event.data.chunkLength;
-          log.verbose('download progress', { downloaded, contentLength });
-        }),
-        Match.when({ event: 'Finished' }, () => {
-          log.info('download completed');
-        }),
-        Match.exhaustive,
-      );
+    const { invoke } = yield* Capability.get(Capabilities.OperationInvoker);
 
-      yield* Effect.tryPromise(() => update.downloadAndInstall(handleDownload));
+    // https://tauri.app/plugin/updater/#checking-for-updates
+    // Returns true to keep checking, false to stop.
+    const action = Effect.gen(function* () {
+      log.info('checking for updates');
+      const update = yield* Effect.promise(() => check());
+      if (!update) {
+        log.info('no update available');
+        return true;
+      }
+      log.info('update check complete', {
+        available: update.available,
+        currentVersion: update.currentVersion,
+        version: update.version,
+        date: update.date,
+        body: update.body,
+      });
+      if (update.available) {
+        log.info('update available, starting download', { version: update.version });
+        let downloaded = 0;
+        let contentLength = 0;
 
-      yield* dispatch(
-        createIntent(LayoutAction.AddToast, {
-          part: 'toast',
-          subject: {
-            id: `${NATIVE_PLUGIN}/update-ready`,
-            title: ['update ready label', { ns: NATIVE_PLUGIN }],
-            description: ['update ready description', { ns: NATIVE_PLUGIN }],
+        const handleDownload = Match.type<Updater.DownloadEvent>().pipe(
+          Match.when({ event: 'Started' }, (event) => {
+            contentLength = event.data.contentLength ?? 0;
+            log.info('download started', { contentLength });
+          }),
+          Match.when({ event: 'Progress' }, (event) => {
+            downloaded += event.data.chunkLength;
+            log.verbose('download progress', { downloaded, contentLength });
+          }),
+          Match.when({ event: 'Finished' }, () => {
+            log.info('download completed');
+          }),
+          Match.exhaustive,
+        );
+
+        const downloadSuccess = yield* Effect.promise(() => downloadAndInstall(update, handleDownload));
+
+        if (downloadSuccess) {
+          yield* invoke(LayoutOperation.AddToast, {
+            id: `${meta.id}.update-ready`,
+            title: ['update-ready.label', { ns: meta.id }],
+            description: ['update-ready.description', { ns: meta.id }],
             duration: Infinity,
-            actionLabel: ['update label', { ns: NATIVE_PLUGIN }],
-            actionAlt: ['update alt', { ns: NATIVE_PLUGIN }],
+            actionLabel: ['update.label', { ns: meta.id }],
+            actionAlt: ['update.alt', { ns: meta.id }],
             onAction: () => relaunch(),
-          },
-        }),
-      );
-    }
-  });
+          });
+          return false;
+        }
+      }
+      return true;
+    });
 
-  const fiber = pipe(
-    // prettier-ignore
-    action,
-    Effect.repeat(Schedule.fixed(Duration.hours(1))),
-    Effect.runFork,
-  );
+    // Run immediately on startup, then repeat every hour. Stop once an update is found.
+    const schedule = Schedule.fixed(Duration.hours(1)).pipe(
+      Schedule.whileInput((keepChecking: boolean) => keepChecking),
+    );
+    const fiber = yield* action.pipe(Effect.repeat(schedule), Effect.forkDaemon);
+    log.info('updater module initialized, update check scheduled');
 
-  return contributes(Capabilities.Null, null, () => {
-    Effect.runSync(Fiber.interrupt(fiber));
-  });
-};
+    return Capability.contributes(Capabilities.Null, null, () =>
+      Effect.sync(() => Effect.runSync(Fiber.interrupt(fiber))),
+    );
+  }),
+);

package/src/constants.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+/// Stable port for the Tauri localhost asset server in production builds.
+/// Must match LOCALHOST_PORT in src-tauri/src/lib.rs.
+export const TAURI_LOCALHOST_PORT = '26777';

package/src/index.ts

@@ -3,4 +3,3 @@
 //
 
 export * from './meta';
-export * from './NativePlugin';

package/src/meta.ts

@@ -2,11 +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 NATIVE_PLUGIN = 'dxos.org/plugin/native';
-
-export const meta: PluginMeta = {
-  id: NATIVE_PLUGIN,
+export const meta: Plugin.Meta = {
+  id: 'org.dxos.plugin.native',
   name: 'Native',
+  description: trim`
+    Native platform integration providing desktop-specific features and system-level capabilities.
+    Access native file dialogs, notifications, and OS integrations.
+  `,
+  tags: ['system'],
 };

package/src/plugin.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const NativePlugin = Plugin.lazy(meta, () => import('#plugin'));

package/src/translations.ts

@@ -4,16 +4,16 @@
 
 import { type Resource } from '@dxos/react-ui';
 
-import { meta } from './meta';
+import { meta } from '#meta';
 
 export const translations = [
   {
     'en-US': {
       [meta.id]: {
-        'update ready label': 'Ready to update',
-        'update ready description': 'A new version of Composer is available.',
-        'update label': 'Update',
-        'update alt': 'Relaunch the app to update',
+        'update-ready.label': 'Ready to update',
+        'update-ready.description': 'A new version of Composer is available.',
+        'update.label': 'Update',
+        'update.alt': 'Relaunch the app to update',
       },
     },
   },

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

@@ -1,12 +0,0 @@
-// src/meta.ts
-var NATIVE_PLUGIN = "dxos.org/plugin/native";
-var meta = {
-  id: NATIVE_PLUGIN,
-  name: "Native"
-};
-
-export {
-  NATIVE_PLUGIN,
-  meta
-};
-//# sourceMappingURL=chunk-E2JDGVJI.mjs.map

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

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { type PluginMeta } from '@dxos/app-framework';\n\nexport const NATIVE_PLUGIN = 'dxos.org/plugin/native';\n\nexport const meta: PluginMeta = {\n  id: NATIVE_PLUGIN,\n  name: 'Native',\n};\n"],
-  "mappings": ";AAMO,IAAMA,gBAAgB;AAEtB,IAAMC,OAAmB;EAC9BC,IAAIF;EACJG,MAAM;AACR;",
-  "names": ["NATIVE_PLUGIN", "meta", "id", "name"]
-}