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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-native",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.f5c0578",
   "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,27 @@
     "src"
   ],
   "dependencies": {
+    "@effect/platform": "^0.90.2",
     "@tauri-apps/plugin-os": "^2.3.0",
     "@tauri-apps/plugin-process": "^2.3.0",
+    "@tauri-apps/plugin-shell": "^2.3.0",
     "@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.17.7",
+    "@dxos/ai": "0.8.4-main.f5c0578",
+    "@dxos/app-framework": "0.8.4-main.f5c0578",
+    "@dxos/log": "0.8.4-main.f5c0578",
+    "@dxos/plugin-navtree": "0.8.4-main.f5c0578",
+    "@dxos/util": "0.8.4-main.f5c0578",
+    "@dxos/plugin-assistant": "0.8.4-main.f5c0578",
+    "@dxos/plugin-help": "0.8.4-main.f5c0578"
   },
   "devDependencies": {
     "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.67995b8"
+    "@dxos/react-ui": "0.8.4-main.f5c0578"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
-    "@dxos/react-ui": "0.8.4-main.67995b8"
+    "@dxos/react-ui": "0.8.4-main.f5c0578"
   },
   "publishConfig": {
     "access": "public"

package/src/NativePlugin.tsx

@@ -2,9 +2,10 @@
 // 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 } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
 
@@ -20,4 +21,9 @@ export const NativePlugin = () =>
       activatesOn: Events.DispatcherReady,
       activate: Updater,
     }),
+    defineModule({
+      id: `${meta.id}/module/ollama`,
+      activatesOn: AssistantEvents.SetupAiServiceProviders,
+      activate: Ollama,
+    }),
   ]);

package/src/capabilities/index.ts

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

package/src/capabilities/ollama.ts

@@ -0,0 +1,79 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { FetchHttpClient, HttpClient } from '@effect/platform';
+import { Command } from '@tauri-apps/plugin-shell';
+import { Context, Effect, Layer, ManagedRuntime } from 'effect';
+
+import { AiServiceRouter } from '@dxos/ai';
+import { type PluginContext, contributes } from '@dxos/app-framework';
+import { log } from '@dxos/log';
+import { AssistantCapabilities } from '@dxos/plugin-assistant';
+
+// Running ollama on non-standard port.
+const OLLAMA_HOST = 'http://localhost:21434';
+
+export default (_context: PluginContext) => {
+  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(
+    AssistantCapabilities.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,10 +4,10 @@
 
 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 { Duration, Effect, Fiber, Match, Schedule, pipe } from 'effect';
 
-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';