@dxos/plugin-native 0.8.4-main.67995b8 → 0.8.4-main.72ec0f3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-native",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.72ec0f3",
   "description": "Composer plugin that runs when on a native device.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,9 +10,9 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "source": "./src/index.ts"
+      "browser": "./dist/lib/browser/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -24,23 +24,28 @@
     "src"
   ],
   "dependencies": {
-    "@tauri-apps/plugin-os": "^2.3.0",
+    "@effect/platform": "^0.92.1",
+    "@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.1",
     "@tauri-apps/plugin-updater": "^2.9.0",
-    "effect": "3.17.0",
-    "@dxos/app-framework": "0.8.4-main.67995b8",
-    "@dxos/log": "0.8.4-main.67995b8",
-    "@dxos/plugin-help": "0.8.4-main.67995b8",
-    "@dxos/plugin-navtree": "0.8.4-main.67995b8",
-    "@dxos/util": "0.8.4-main.67995b8"
+    "effect": "3.18.3",
+    "@dxos/ai": "0.8.4-main.72ec0f3",
+    "@dxos/log": "0.8.4-main.72ec0f3",
+    "@dxos/app-framework": "0.8.4-main.72ec0f3",
+    "@dxos/plugin-assistant": "0.8.4-main.72ec0f3",
+    "@dxos/plugin-help": "0.8.4-main.72ec0f3",
+    "@dxos/util": "0.8.4-main.72ec0f3",
+    "@dxos/plugin-navtree": "0.8.4-main.72ec0f3"
   },
   "devDependencies": {
-    "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.67995b8"
+    "vite": "7.1.9",
+    "@dxos/react-ui": "0.8.4-main.72ec0f3"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
-    "@dxos/react-ui": "0.8.4-main.67995b8"
+    "@dxos/react-ui": "0.8.4-main.72ec0f3"
   },
   "publishConfig": {
     "access": "public"

package/src/NativePlugin.tsx

@@ -2,22 +2,32 @@
 // Copyright 2023 DXOS.org
 //
 
-import { definePlugin, Events, defineModule, contributes, Capabilities } from '@dxos/app-framework';
+import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
+import { AssistantEvents } from '@dxos/plugin-assistant';
 
-import { Updater } from './capabilities';
+import { Ollama, Updater, Window } 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,
-    }),
-  ]);
+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,
+  }),
+]);

package/src/capabilities/index.ts

@@ -4,4 +4,6 @@
 
 import { lazy } from '@dxos/app-framework';
 
+export const Ollama = lazy(() => import('./ollama'));
 export const Updater = lazy(() => import('./updater'));
+export const Window = lazy(() => import('./window'));

package/src/capabilities/ollama.ts

@@ -0,0 +1,82 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as HttpClient from '@effect/platform/HttpClient';
+import { Command } from '@tauri-apps/plugin-shell';
+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 * as AiServiceRouter from '@dxos/ai/AiServiceRouter';
+import { Capabilities, type Capability, type PluginContext, contributes } from '@dxos/app-framework';
+import { log } from '@dxos/log';
+
+// Running ollama on non-standard port.
+const OLLAMA_HOST = 'http://localhost:21434';
+
+export default (_context: PluginContext): Capability<any> => {
+  const runtime = ManagedRuntime.make(OllamaSidecar.layerLive);
+
+  // 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 contributes(
+    Capabilities.AiModelResolver,
+    OllamaSidecarModelResolver.pipe(Layer.provide(sidecarLayer)),
+    async () => {
+      await runtime.dispose();
+    },
+  );
+};
+
+class OllamaSidecar extends Context.Tag('@dxos/plugin-native/OllamaSidecar')<
+  OllamaSidecar,
+  {
+    endpoint: string;
+  }
+>() {
+  static layerLive = Layer.scoped(
+    OllamaSidecar,
+    Effect.gen(function* () {
+      const command = Command.sidecar('sidecar/ollama', ['serve'], {
+        env: {
+          OLLAMA_HOST,
+          OLLAMA_ORIGINS: '*', // CORS
+        },
+      });
+
+      // NOTE: Keeping those as console.log for consistent formatting.
+      command.stdout.on('data', (data) => console.log('[ollama]', data.toString()));
+      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 }));
+      const child = yield* Effect.promise(() => command.spawn());
+      yield* Effect.addFinalizer(
+        Effect.fn(function* () {
+          yield* Effect.promise(() => child.kill());
+        }),
+      );
+      log.info('Running ollama', { pid: child.pid });
+
+      return {
+        endpoint: OLLAMA_HOST,
+      };
+    }),
+  );
+}
+
+const OllamaSidecarModelResolver: Layer.Layer<AiServiceRouter.AiModelResolver, never, OllamaSidecar> =
+  Layer.unwrapEffect(
+    Effect.gen(function* () {
+      const { endpoint } = yield* OllamaSidecar;
+      return AiServiceRouter.OllamaResolver({
+        host: endpoint,
+        transformClient: HttpClient.withTracerPropagation(false),
+      });
+    }),
+  ).pipe(Layer.provide(FetchHttpClient.layer));

package/src/capabilities/updater.ts

@@ -4,19 +4,25 @@
 
 import { type } from '@tauri-apps/plugin-os';
 import { relaunch } from '@tauri-apps/plugin-process';
-import { check, type DownloadEvent } from '@tauri-apps/plugin-updater';
-import { Duration, Effect, Fiber, Match, pipe, Schedule } from 'effect';
+import { type DownloadEvent, check } 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 Function from 'effect/Function';
+import * as Match from 'effect/Match';
+import * as Schedule from 'effect/Schedule';
 
-import { Capabilities, contributes, createIntent, LayoutAction, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { log } from '@dxos/log';
 
-import { NATIVE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 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)) {
+  if (!SUPPORTS_OTA.includes(platform) || window.location.hostname === 'localhost') {
     return contributes(Capabilities.Null, null);
   }
 
@@ -39,7 +45,7 @@ export default (context: PluginContext) => {
         }),
         Match.when({ event: 'Progress' }, (event) => {
           downloaded += event.data.chunkLength;
-          log.info('download progress', { downloaded, contentLength });
+          log.verbose('download progress', { downloaded, contentLength });
         }),
         Match.when({ event: 'Finished' }, () => {
           log.info('download completed');
@@ -53,12 +59,12 @@ export default (context: PluginContext) => {
         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 }],
+            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(),
           },
         }),
@@ -66,7 +72,7 @@ export default (context: PluginContext) => {
     }
   });
 
-  const fiber = pipe(
+  const fiber = Function.pipe(
     // prettier-ignore
     action,
     Effect.repeat(Schedule.fixed(Duration.hours(1))),

package/src/capabilities/window.ts

@@ -0,0 +1,49 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { LogicalPosition, LogicalSize, getCurrentWindow } from '@tauri-apps/api/window';
+
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
+
+export default (_context: PluginContext) => {
+  return contributes(Capabilities.Null, null, () => {
+    const appWindow = getCurrentWindow();
+
+    // Save window state to localStorage.
+    async function saveWindowState() {
+      const size = await appWindow.innerSize();
+      const position = await appWindow.innerPosition();
+      localStorage.setItem(
+        'windowState',
+        JSON.stringify({
+          width: size.width,
+          height: size.height,
+          x: position.x,
+          y: position.y,
+        }),
+      );
+    }
+
+    // Restore window state from localStorage.
+    async function restoreWindowState() {
+      const savedState = localStorage.getItem('windowState');
+      if (savedState) {
+        const state = JSON.parse(savedState);
+
+        await appWindow.setSize(new LogicalSize(state.width, state.height));
+        await appWindow.setPosition(new LogicalPosition(state.x, state.y));
+      }
+    }
+
+    // Listen for window events and save state.
+    void appWindow.listen('tauri://resize', saveWindowState);
+    void appWindow.listen('tauri://move', saveWindowState);
+
+    // Restore state when app loads.
+    document.addEventListener('DOMContentLoaded', restoreWindowState);
+
+    // Save state before closing.
+    window.addEventListener('beforeunload', saveWindowState);
+  });
+};

package/src/meta.ts

@@ -3,10 +3,13 @@
 //
 
 import { type PluginMeta } from '@dxos/app-framework';
-
-export const NATIVE_PLUGIN = 'dxos.org/plugin/native';
+import { trim } from '@dxos/util';
 
 export const meta: PluginMeta = {
-  id: NATIVE_PLUGIN,
+  id: 'dxos.org/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.
+  `,
 };

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"]
-}

package/dist/lib/browser/updater-KSM3TUHI.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/updater.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { type } from '@tauri-apps/plugin-os';\nimport { relaunch } from '@tauri-apps/plugin-process';\nimport { check, type DownloadEvent } from '@tauri-apps/plugin-updater';\nimport { Duration, Effect, Fiber, Match, pipe, Schedule } from 'effect';\n\nimport { Capabilities, contributes, createIntent, LayoutAction, type PluginContext } from '@dxos/app-framework';\nimport { log } from '@dxos/log';\n\nimport { NATIVE_PLUGIN } from '../meta';\n\nconst SUPPORTS_OTA = ['linux', 'macos', 'windows'];\n\nexport default (context: PluginContext) => {\n  const platform = type();\n  if (!SUPPORTS_OTA.includes(platform)) {\n    return contributes(Capabilities.Null, null);\n  }\n\n  const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);\n\n  // https://tauri.app/plugin/updater/#checking-for-updates\n  const action = Effect.gen(function* () {\n    log.info('checking for updates');\n    const update = yield* Effect.tryPromise(() => check());\n    log.info('checked for updates', { version: update?.version, currentVersion: update?.currentVersion });\n    if (update) {\n      log.info('update available', update);\n      let downloaded = 0;\n      let contentLength = 0;\n\n      const handleDownload = Match.type<DownloadEvent>().pipe(\n        Match.when({ event: 'Started' }, (event) => {\n          contentLength = event.data.contentLength ?? 0;\n          log.info('download started', { contentLength });\n        }),\n        Match.when({ event: 'Progress' }, (event) => {\n          downloaded += event.data.chunkLength;\n          log.info('download progress', { downloaded, contentLength });\n        }),\n        Match.when({ event: 'Finished' }, () => {\n          log.info('download completed');\n        }),\n        Match.exhaustive,\n      );\n\n      yield* Effect.tryPromise(() => update.downloadAndInstall(handleDownload));\n\n      yield* dispatch(\n        createIntent(LayoutAction.AddToast, {\n          part: 'toast',\n          subject: {\n            id: `${NATIVE_PLUGIN}/update-ready`,\n            title: ['update ready label', { ns: NATIVE_PLUGIN }],\n            description: ['update ready description', { ns: NATIVE_PLUGIN }],\n            duration: Infinity,\n            actionLabel: ['update label', { ns: NATIVE_PLUGIN }],\n            actionAlt: ['update alt', { ns: NATIVE_PLUGIN }],\n            onAction: () => relaunch(),\n          },\n        }),\n      );\n    }\n  });\n\n  const fiber = pipe(\n    // prettier-ignore\n    action,\n    Effect.repeat(Schedule.fixed(Duration.hours(1))),\n    Effect.runFork,\n  );\n\n  return contributes(Capabilities.Null, null, () => {\n    Effect.runSync(Fiber.interrupt(fiber));\n  });\n};\n"],
-  "mappings": ";;;;;AAIA,SAASA,YAAY;AACrB,SAASC,gBAAgB;AACzB,SAASC,aAAiC;AAC1C,SAASC,UAAUC,QAAQC,OAAOC,OAAOC,MAAMC,gBAAgB;AAE/D,SAASC,cAAcC,aAAaC,cAAcC,oBAAwC;AAC1F,SAASC,WAAW;;AAIpB,IAAMC,eAAe;EAAC;EAAS;EAAS;;AAExC,IAAA,kBAAe,CAACC,YAAAA;AACd,QAAMC,WAAWC,KAAAA;AACjB,MAAI,CAACH,aAAaI,SAASF,QAAAA,GAAW;AACpC,WAAOG,YAAYC,aAAaC,MAAM,IAAA;EACxC;AAEA,QAAM,EAAEC,SAAQ,IAAKP,QAAQQ,cAAcH,aAAaI,gBAAgB;AAGxE,QAAMC,SAASC,OAAOC,IAAI,aAAA;AACxBC,QAAIC,KAAK,wBAAA,QAAA;;;;;;AACT,UAAMC,SAAS,OAAOJ,OAAOK,WAAW,MAAMC,MAAAA,CAAAA;AAC9CJ,QAAIC,KAAK,uBAAuB;MAAEI,SAASH,QAAQG;MAASC,gBAAgBJ,QAAQI;IAAe,GAAA;;;;;;AACnG,QAAIJ,QAAQ;AACVF,UAAIC,KAAK,oBAAoBC,QAAAA;;;;;;AAC7B,UAAIK,aAAa;AACjB,UAAIC,gBAAgB;AAEpB,YAAMC,iBAAiBC,MAAMrB,KAAI,EAAkBsB,KACjDD,MAAME,KAAK;QAAEC,OAAO;MAAU,GAAG,CAACA,UAAAA;AAChCL,wBAAgBK,MAAMC,KAAKN,iBAAiB;AAC5CR,YAAIC,KAAK,oBAAoB;UAAEO;QAAc,GAAA;;;;;;MAC/C,CAAA,GACAE,MAAME,KAAK;QAAEC,OAAO;MAAW,GAAG,CAACA,UAAAA;AACjCN,sBAAcM,MAAMC,KAAKC;AACzBf,YAAIC,KAAK,qBAAqB;UAAEM;UAAYC;QAAc,GAAA;;;;;;MAC5D,CAAA,GACAE,MAAME,KAAK;QAAEC,OAAO;MAAW,GAAG,MAAA;AAChCb,YAAIC,KAAK,sBAAA,QAAA;;;;;;MACX,CAAA,GACAS,MAAMM,UAAU;AAGlB,aAAOlB,OAAOK,WAAW,MAAMD,OAAOe,mBAAmBR,cAAAA,CAAAA;AAEzD,aAAOf,SACLwB,aAAaC,aAAaC,UAAU;QAClCC,MAAM;QACNC,SAAS;UACPC,IAAI,GAAGC,aAAAA;UACPC,OAAO;YAAC;YAAsB;cAAEC,IAAIF;YAAc;;UAClDG,aAAa;YAAC;YAA4B;cAAED,IAAIF;YAAc;;UAC9DI,UAAUC;UACVC,aAAa;YAAC;YAAgB;cAAEJ,IAAIF;YAAc;;UAClDO,WAAW;YAAC;YAAc;cAAEL,IAAIF;YAAc;;UAC9CQ,UAAU,MAAMC,SAAAA;QAClB;MACF,CAAA,CAAA;IAEJ;EACF,CAAA;AAEA,QAAMC,QAAQvB;;IAEZd;IACAC,OAAOqC,OAAOC,SAASC,MAAMC,SAASC,MAAM,CAAA,CAAA,CAAA;IAC5CzC,OAAO0C;EAAO;AAGhB,SAAOjD,YAAYC,aAAaC,MAAM,MAAM,MAAA;AAC1CK,WAAO2C,QAAQC,MAAMC,UAAUT,KAAAA,CAAAA;EACjC,CAAA;AACF;",
-  "names": ["type", "relaunch", "check", "Duration", "Effect", "Fiber", "Match", "pipe", "Schedule", "Capabilities", "contributes", "createIntent", "LayoutAction", "log", "SUPPORTS_OTA", "context", "platform", "type", "includes", "contributes", "Capabilities", "Null", "dispatch", "getCapability", "IntentDispatcher", "action", "Effect", "gen", "log", "info", "update", "tryPromise", "check", "version", "currentVersion", "downloaded", "contentLength", "handleDownload", "Match", "pipe", "when", "event", "data", "chunkLength", "exhaustive", "downloadAndInstall", "createIntent", "LayoutAction", "AddToast", "part", "subject", "id", "NATIVE_PLUGIN", "title", "ns", "description", "duration", "Infinity", "actionLabel", "actionAlt", "onAction", "relaunch", "fiber", "repeat", "Schedule", "fixed", "Duration", "hours", "runFork", "runSync", "Fiber", "interrupt"]
-}