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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-native",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.9.1-staging.ee54ba693a",
   "description": "Composer plugin that runs when on a native device.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -18,10 +18,10 @@
       "types": "./dist/types/src/capabilities/index.d.ts",
       "default": "./dist/lib/neutral/capabilities/index.mjs"
     },
-    "#components": {
-      "source": "./src/components/index.ts",
-      "types": "./dist/types/src/components/index.d.ts",
-      "default": "./dist/lib/neutral/components/index.mjs"
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
     },
     "#meta": {
       "source": "./src/meta.ts",
@@ -71,36 +71,36 @@
   ],
   "dependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.96.1",
+    "@effect/platform": "0.96.2",
     "@tauri-apps/api": "^2.11.0",
     "@tauri-apps/plugin-os": "^2.3.2",
     "@tauri-apps/plugin-process": "^2.3.1",
     "@tauri-apps/plugin-shell": "^2.3.5",
     "@tauri-apps/plugin-updater": "^2.10.1",
     "date-fns": "^3.6.0",
-    "@dxos/app-framework": "0.9.1-main.c7dcc2e112",
-    "@dxos/ai": "0.9.1-main.c7dcc2e112",
-    "@dxos/app-toolkit": "0.9.1-main.c7dcc2e112",
-    "@dxos/effect": "0.9.1-main.c7dcc2e112",
-    "@dxos/keys": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-assistant": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112"
+    "@dxos/ai": "0.9.1-staging.ee54ba693a",
+    "@dxos/app-toolkit": "0.9.1-staging.ee54ba693a",
+    "@dxos/effect": "0.9.1-staging.ee54ba693a",
+    "@dxos/keys": "0.9.1-staging.ee54ba693a",
+    "@dxos/app-framework": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-assistant": "0.9.1-staging.ee54ba693a",
+    "@dxos/log": "0.9.1-staging.ee54ba693a",
+    "@dxos/util": "0.9.1-staging.ee54ba693a"
   },
   "devDependencies": {
-    "@types/react": "~19.2.7",
-    "effect": "3.21.3",
-    "react": "~19.2.3",
+    "@types/react": "~19.2.17",
+    "effect": "3.21.4",
+    "react": "~19.2.7",
     "vite": "^8.0.16",
-    "@dxos/plugin-testing": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-form": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112"
+    "@dxos/plugin-testing": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-form": "0.9.1-staging.ee54ba693a"
   },
   "peerDependencies": {
-    "effect": "3.21.3",
-    "react": "~19.2.3",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-form": "0.9.1-main.c7dcc2e112"
+    "effect": "3.21.4",
+    "react": "~19.2.7",
+    "@dxos/react-ui": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-form": "0.9.1-staging.ee54ba693a"
   },
   "publishConfig": {
     "access": "public"

package/src/capabilities/ollama.ts

@@ -2,27 +2,40 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Atom } from '@effect-atom/atom-react';
 import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
 import * as HttpClient from '@effect/platform/HttpClient';
 import { Command } from '@tauri-apps/plugin-shell';
+import * as Cause from 'effect/Cause';
 import * as Context from 'effect/Context';
+import * as Duration from 'effect/Duration';
 import * as Effect from 'effect/Effect';
+import * as Either from 'effect/Either';
+import * as Exit from 'effect/Exit';
+import * as Fiber from 'effect/Fiber';
 import * as Layer from 'effect/Layer';
 import * as ManagedRuntime from 'effect/ManagedRuntime';
+import * as Schedule from 'effect/Schedule';
+import * as Stream from 'effect/Stream';
 
-import { type AiModelResolver } from '@dxos/ai';
-import { OllamaResolver } from '@dxos/ai/resolvers';
-import { Capability } from '@dxos/app-framework';
+import { type AiModelResolver, Provider } from '@dxos/ai';
+import { OllamaAdmin, OllamaResolver } from '@dxos/ai/resolvers';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { log } from '@dxos/log';
+import { AssistantCapabilities, type Ollama } from '@dxos/plugin-assistant';
 
 // NOTE: Running ollama on non-standard port (config Tauri).
 const OLLAMA_HOST = 'http://localhost:21434';
 
-export type OllamaCapabilities = Capability.Capability<typeof AppCapabilities.AiModelResolver>;
+export type OllamaCapabilities =
+  | Capability.Capability<typeof AppCapabilities.AiModelResolver>
+  | Capability.Capability<typeof AssistantCapabilities.OllamaManager>;
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
 
-export default Capability.makeModule<[], OllamaCapabilities>(() =>
-  Effect.sync(() => {
     const runtime = ManagedRuntime.make(OllamaSidecar.layerLive);
 
     // Layer for the sidecar but the lifecycle is managed by the runtime.
@@ -30,11 +43,232 @@ export default Capability.makeModule<[], OllamaCapabilities>(() =>
       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()),
-    );
+    const admin = OllamaAdmin.make({ endpoint: OLLAMA_HOST });
+    const stateAtom = Atom.make<Ollama.ModelsState>({
+      kind: 'idle',
+      models: [],
+      loaded: [],
+      pulls: {},
+      errors: {},
+    }).pipe(Atom.keepAlive);
+
+    // Read/update the reactive state atom as Effects.
+    const getState = Effect.sync(() => registry.get(stateAtom));
+    const updateState = (f: (state: Ollama.ModelsState) => Ollama.ModelsState): Effect.Effect<void> =>
+      Effect.sync(() => registry.set(stateAtom, f(registry.get(stateAtom))));
+
+    // Connection-level failure (reaching the service); shown at the section, not tied to a model.
+    const fail = (error: string): Effect.Effect<void> => updateState((state) => ({ ...state, kind: 'failed', error }));
+
+    // Per-model action error (load/unload/remove/pull); shown inline on that model's row. Pass
+    // `undefined` to clear.
+    const setError = (name: string, error: string | undefined): Effect.Effect<void> =>
+      updateState((state) => {
+        const errors = { ...state.errors };
+        if (error) {
+          errors[name] = error;
+        } else {
+          delete errors[name];
+        }
+        return { ...state, errors };
+      });
+
+    // Write (or clear, when `progress` is undefined) the in-flight progress for `name`.
+    const setProgress = (name: string, progress: OllamaAdmin.PullProgress | undefined): Effect.Effect<void> =>
+      updateState((state) => {
+        const pulls = { ...state.pulls };
+        if (progress) {
+          pulls[name] = progress;
+        } else {
+          delete pulls[name];
+        }
+        return { ...state, pulls };
+      });
+
+    // Force the scoped sidecar layer, spawning the process idempotently — the runtime is lazy and
+    // only spawns on first force, so opening settings starts Ollama rather than hitting a refused
+    // connection, and a chat already using the resolver does not spawn a second process. The endpoint
+    // is unused; forcing `OllamaSidecar` is what triggers the spawn. Failures surface as defects.
+    const ensureRunning: Effect.Effect<void> = Effect.asVoid(OllamaSidecar).pipe(Effect.provide(sidecarLayer));
+
+    // Run an admin effect with the HttpClient provided, folding its typed failure into an Either so
+    // callers branch on the result without a typed error channel.
+    const runAdmin = <A, E extends { readonly message: string }>(
+      effect: Effect.Effect<A, E, HttpClient.HttpClient>,
+    ): Effect.Effect<Either.Either<A, string>> =>
+      effect.pipe(Effect.provide(clientLayer), Effect.either, Effect.map(Either.mapLeft((error) => error.message)));
+
+    // In-flight pull fibers, so a pull can be cancelled via interruption.
+    const pullFibers = new Map<string, Fiber.RuntimeFiber<void>>();
+
+    // Refresh only the loaded-into-memory set (cheap; no spawn). Logs load/unload transitions so the
+    // console reflects which model is resident when a chat request triggers a load.
+    const refreshLoaded: Effect.Effect<void> = Effect.gen(function* () {
+      const result = yield* runAdmin(admin.ps);
+      if (Either.isLeft(result)) {
+        return;
+      }
+      const before = (yield* getState).loaded.map((model) => model.name);
+      const after = result.right.map((model) => model.name);
+      if (before.join() !== after.join()) {
+        yield* Effect.sync(() => log.info('ollama loaded models changed', { loaded: after }));
+      }
+      yield* updateState((state) => ({ ...state, loaded: result.right }));
+    });
+
+    const refresh: Effect.Effect<void> = Effect.gen(function* () {
+      yield* updateState((state) => ({ ...state, kind: 'loading', error: undefined }));
+      const started = yield* Effect.exit(ensureRunning);
+      if (Exit.isFailure(started)) {
+        return yield* fail(formatError(Cause.squash(started.cause)));
+      }
+      // The sidecar process spawns before its HTTP server is listening, so retry until the first
+      // `list` succeeds rather than reporting a spurious failure on startup.
+      const result = yield* runAdmin(
+        admin.list.pipe(Effect.retry({ schedule: Schedule.spaced(Duration.millis(300)), times: 29 })),
+      );
+      if (Either.isLeft(result)) {
+        return yield* fail(result.left);
+      }
+      yield* updateState((state) => ({ ...state, kind: 'ready', models: result.right, error: undefined }));
+      yield* Effect.sync(() => log.info('ollama models', { installed: result.right.map((model) => model.name) }));
+      yield* refreshLoaded;
+    });
+
+    const pull = (name: string): Effect.Effect<void> =>
+      Effect.gen(function* () {
+        const started = yield* Effect.exit(ensureRunning);
+        if (Exit.isFailure(started)) {
+          return yield* fail(formatError(Cause.squash(started.cause)));
+        }
+        yield* setError(name, undefined);
+        yield* Effect.sync(() => log.info('ollama pull started', { name }));
+        yield* setProgress(name, { status: 'starting' });
+
+        // Ollama reports `completed`/`total` per layer (digest); aggregate across layers so the
+        // overall percent is monotonic rather than resetting to 0 as each layer starts.
+        const downloaded = new Map<string, { completed: number; total: number }>();
+        const onProgress = (progress: OllamaAdmin.PullProgress): Effect.Effect<void> =>
+          Effect.suspend(() => {
+            if (progress.digest && progress.total) {
+              downloaded.set(progress.digest, { completed: progress.completed ?? 0, total: progress.total });
+              let completed = 0;
+              let total = 0;
+              for (const layer of downloaded.values()) {
+                completed += layer.completed;
+                total += layer.total;
+              }
+              return setProgress(name, { status: progress.status, completed, total });
+            }
+            // Non-download phase (manifest, verifying, writing): keep the status label, drop totals.
+            return setProgress(name, { status: progress.status });
+          });
+
+        // Run the pull on a daemon fiber so `cancel` can interrupt it; clear progress and drop the
+        // fiber on every exit path. A cancelled pull interrupts the fiber — treated as a no-op.
+        const work = admin.pull(name).pipe(
+          Stream.runForEach(onProgress),
+          Effect.provide(clientLayer),
+          Effect.matchCauseEffect({
+            onFailure: (cause) =>
+              Cause.isInterruptedOnly(cause)
+                ? Effect.sync(() => log.info('ollama pull finished', { name, cancelled: true }))
+                : Effect.gen(function* () {
+                    const message = formatError(Cause.squash(cause));
+                    yield* Effect.sync(() => log.warn('ollama pull failed', { name, error: message }));
+                    yield* setError(name, message);
+                  }),
+            onSuccess: () =>
+              Effect.gen(function* () {
+                yield* Effect.sync(() => log.info('ollama pull finished', { name, cancelled: false }));
+                yield* refresh;
+              }),
+          }),
+          Effect.ensuring(setProgress(name, undefined)),
+          Effect.ensuring(Effect.sync(() => pullFibers.delete(name))),
+        );
+
+        const fiber = yield* Effect.forkDaemon(work);
+        yield* Effect.sync(() => pullFibers.set(name, fiber));
+      });
+
+    const cancel = (name: string): Effect.Effect<void> =>
+      Effect.gen(function* () {
+        yield* Effect.sync(() => log.info('ollama pull cancelled', { name }));
+        const fiber = pullFibers.get(name);
+        if (fiber) {
+          // The pull's `ensuring` clears progress and drops the fiber on interruption.
+          yield* Fiber.interrupt(fiber);
+        }
+      });
+
+    const load = (name: string): Effect.Effect<void> =>
+      Effect.gen(function* () {
+        yield* setError(name, undefined);
+        const started = yield* Effect.exit(ensureRunning);
+        if (Exit.isFailure(started)) {
+          return yield* setError(name, formatError(Cause.squash(started.cause)));
+        }
+        yield* Effect.sync(() => log.info('ollama load', { name }));
+        const result = yield* runAdmin(admin.load(name));
+        if (Either.isLeft(result)) {
+          yield* Effect.sync(() => log.warn('ollama load failed', { name, error: result.left }));
+          return yield* setError(name, result.left);
+        }
+        yield* refreshLoaded;
+      });
+
+    const unload = (name: string): Effect.Effect<void> =>
+      Effect.gen(function* () {
+        yield* setError(name, undefined);
+        const started = yield* Effect.exit(ensureRunning);
+        if (Exit.isFailure(started)) {
+          return yield* setError(name, formatError(Cause.squash(started.cause)));
+        }
+        yield* Effect.sync(() => log.info('ollama unload', { name }));
+        const result = yield* runAdmin(admin.unload(name));
+        if (Either.isLeft(result)) {
+          return yield* setError(name, result.left);
+        }
+        yield* refreshLoaded;
+      });
+
+    const remove = (name: string): Effect.Effect<void> =>
+      Effect.gen(function* () {
+        yield* setError(name, undefined);
+        const started = yield* Effect.exit(ensureRunning);
+        if (Exit.isFailure(started)) {
+          return yield* setError(name, formatError(Cause.squash(started.cause)));
+        }
+        const result = yield* runAdmin(admin.remove(name));
+        if (Either.isLeft(result)) {
+          return yield* setError(name, result.left);
+        }
+        yield* refresh;
+      });
+
+    const manager: Ollama.Manager = {
+      endpoint: OLLAMA_HOST,
+      state: stateAtom,
+      refresh,
+      refreshLoaded,
+      pull,
+      cancel,
+      load,
+      unload,
+      remove,
+    };
+
+    return [
+      // The runtime-dispose finalizer lives on the resolver contribution only; the manager closes
+      // over the same runtime, so there is a single disposal path.
+      Capability.contributes(
+        AppCapabilities.AiModelResolver,
+        OllamaSidecarModelResolver.pipe(Layer.provide(sidecarLayer)),
+        () => Effect.tryPromise(() => runtime.dispose()),
+      ),
+      Capability.contributes(AssistantCapabilities.OllamaManager, manager),
+    ];
   }),
 );
 
@@ -47,6 +281,9 @@ class OllamaSidecar extends Context.Tag('@dxos/plugin-native/OllamaSidecar')<
   static layerLive = Layer.scoped(
     OllamaSidecar,
     Effect.gen(function* () {
+      // The `ollama` launcher discovers `llama-server` + its libraries relative to its own
+      // executable (`<exe>/lib/ollama/`), ignoring OLLAMA_LIBRARY_PATH, so the runtime ships into
+      // `Contents/MacOS/lib/ollama` next to the signed sidecar (see tauri.conf bundle.macOS.files).
       const command = Command.sidecar('sidecar/ollama', ['serve'], {
         env: {
           OLLAMA_HOST,
@@ -54,11 +291,11 @@ 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()));
+      // Ollama writes nearly all of its output (including normal startup/inference logs) to stderr,
+      // so route by the structured `level=` field rather than the stream to avoid flooding the
+      // console with red errors. Kept on `console.*` for Ollama's own line formatting.
+      command.stdout.on('data', (data) => logSidecar(data.toString()));
+      command.stderr.on('data', (data) => logSidecar(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());
@@ -82,7 +319,35 @@ const OllamaSidecarModelResolver: Layer.Layer<AiModelResolver.AiModelResolver, n
       const { endpoint } = yield* OllamaSidecar;
       return OllamaResolver.make({
         endpoint,
+        provider: Provider.builtIn.id,
         transformClient: HttpClient.withTracerPropagation(false),
       });
     }),
   ).pipe(Layer.provide(FetchHttpClient.layer));
+
+const formatError = (error: unknown): string =>
+  typeof error === 'string' ? error : error instanceof Error ? error.message : String(error);
+
+/** Effect HttpClient layer shared by every admin call. */
+const clientLayer = FetchHttpClient.layer;
+
+/**
+ * Route a chunk of Ollama process output to the console by its structured log level. Ollama emits
+ * `INFO`/`WARN` to stderr alongside genuine errors, so only `level=ERROR` lines surface as errors.
+ */
+const logSidecar = (chunk: string): void => {
+  for (const line of chunk.split('\n')) {
+    if (line.trim().length === 0) {
+      continue;
+    }
+    /* eslint-disable no-console */
+    if (line.includes('level=ERROR')) {
+      console.error('[ollama]', line);
+    } else if (line.includes('level=WARN')) {
+      console.warn('[ollama]', line);
+    } else {
+      console.log('[ollama]', line);
+    }
+    /* eslint-enable no-console */
+  }
+};

package/src/capabilities/react-surface.tsx

@@ -9,7 +9,7 @@ import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface, useSettingsState } from '@dxos/app-framework/ui';
 import { AppSurface } from '@dxos/app-toolkit/ui';
 
-import { NativeSettings } from '#components';
+import { NativeSettings } from '#containers';
 import { meta } from '#meta';
 import { type Settings } from '#types';
 

package/src/{components → containers}/NativeSettings/NativeSettings.tsx

@@ -5,17 +5,18 @@
 import { useAtomValue } from '@effect-atom/atom-react';
 import { formatDistanceToNow } from 'date-fns/formatDistanceToNow';
 import * as Match from 'effect/Match';
+import * as Schema from 'effect/Schema';
 import React, { type ReactNode, useState } from 'react';
 
 import { useCapability } from '@dxos/app-framework/ui';
 import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { Button, useTranslation } from '@dxos/react-ui';
-import { Settings as SettingsForm } from '@dxos/react-ui-form';
+import { Form } from '@dxos/react-ui-form';
 
 import { meta } from '#meta';
 import { NativeCapabilities, type Settings, type Update } from '#types';
 
-export type NativeSettingsProps = AppSurface.SettingsArticleProps<Settings.Settings>;
+export type NativeSettingsProps = AppSurface.SettingsProps<Settings.Settings>;
 
 type Pending = null | 'check' | 'install' | 'relaunch';
 
@@ -53,13 +54,17 @@ export const NativeSettings = (_props: NativeSettingsProps) => {
   });
 
   return (
-    <SettingsForm.Viewport>
-      <SettingsForm.Section title={t('settings.title')}>
-        <SettingsForm.Item title={t('settings.updates.label')} description={description}>
-          {button}
-        </SettingsForm.Item>
-      </SettingsForm.Section>
-    </SettingsForm.Viewport>
+    <Form.Root schema={Schema.Struct({})} values={{}} variant='settings'>
+      <Form.Viewport scroll>
+        <Form.Content>
+          <Form.Section title={meta.profile.name ?? meta.profile.key}>
+            <Form.Row label={t('settings.updates.label')} description={description}>
+              {button}
+            </Form.Row>
+          </Form.Section>
+        </Form.Content>
+      </Form.Viewport>
+    </Form.Root>
   );
 };
 

package/src/translations.ts

@@ -14,7 +14,6 @@ export const translations = [
         'update-ready.description': 'A new version of Composer is available.',
         'update.label': 'Update',
         'update.alt': 'Relaunch the app to update',
-        'settings.title': 'App',
         'settings.updates.label': 'Updates',
         'settings.updates.check.label': 'Check for updates',
         'settings.updates.checking.label': 'Checking…',

package/dist/lib/neutral/NativeSettings-EYX4X3D3.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/components/NativeSettings/NativeSettings.tsx"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { useAtomValue } from '@effect-atom/atom-react';\nimport { formatDistanceToNow } from 'date-fns/formatDistanceToNow';\nimport * as Match from 'effect/Match';\nimport React, { type ReactNode, useState } from 'react';\n\nimport { useCapability } from '@dxos/app-framework/ui';\nimport { type AppSurface } from '@dxos/app-toolkit/ui';\nimport { Button, useTranslation } from '@dxos/react-ui';\nimport { Settings as SettingsForm } from '@dxos/react-ui-form';\n\nimport { meta } from '#meta';\nimport { NativeCapabilities, type Settings, type Update } from '#types';\n\nexport type NativeSettingsProps = AppSurface.SettingsArticleProps<Settings.Settings>;\n\ntype Pending = null | 'check' | 'install' | 'relaunch';\n\ntype UpdateActions = {\n  onCheck: () => Promise<void>;\n  onInstall: () => Promise<void>;\n  onRelaunch: () => Promise<void>;\n};\n\ntype UpdateRow = { description: string; button: ReactNode };\n\nexport const NativeSettings = (_props: NativeSettingsProps) => {\n  const { t } = useTranslation(meta.profile.key);\n  const manager = useCapability(NativeCapabilities.UpdateManager);\n  const status = useAtomValue(manager.status);\n\n  // UI-level pending flag. The status atom can flip between `checking` and `up-to-date` faster\n  // than the user can perceive, so we also gate the button on the click handler's lifetime to\n  // guarantee no duplicate triggers and a visible busy state.\n  const [pending, setPending] = useState<Pending>(null);\n\n  const runAction = (kind: Exclude<Pending, null>, action: () => Promise<void>) => async () => {\n    setPending(kind);\n    try {\n      await action();\n    } finally {\n      setPending(null);\n    }\n  };\n\n  const { description, button } = renderUpdateRow(status, pending, t, {\n    onCheck: runAction('check', manager.check),\n    onInstall: runAction('install', manager.install),\n    onRelaunch: runAction('relaunch', manager.relaunch),\n  });\n\n  return (\n    <SettingsForm.Viewport>\n      <SettingsForm.Section title={t('settings.title')}>\n        <SettingsForm.Item title={t('settings.updates.label')} description={description}>\n          {button}\n        </SettingsForm.Item>\n      </SettingsForm.Section>\n    </SettingsForm.Viewport>\n  );\n};\n\nconst renderUpdateRow = (\n  status: Update.Status,\n  pending: Pending,\n  t: (key: string, options?: Record<string, unknown>) => string,\n  { onCheck, onInstall, onRelaunch }: UpdateActions,\n): UpdateRow => {\n  const isChecking = pending === 'check' || status.kind === 'checking';\n  const isInstalling = pending === 'install' || status.kind === 'downloading';\n\n  const checkButton = (disabled = false) => (\n    <Button disabled={disabled || isChecking || isInstalling || pending === 'relaunch'} onClick={() => void onCheck()}>\n      {isChecking ? t('settings.updates.checking.label') : t('settings.updates.check.label')}\n    </Button>\n  );\n\n  return Match.value(status).pipe(\n    Match.withReturnType<UpdateRow>(),\n    Match.when({ kind: 'unsupported' }, () => ({\n      description: t('settings.updates.unsupported.message'),\n      button: checkButton(true),\n    })),\n    Match.when({ kind: 'idle' }, () => ({\n      description: isChecking ? t('settings.updates.checking.message') : t('settings.updates.idle.message'),\n      button: checkButton(),\n    })),\n    Match.when({ kind: 'checking' }, () => ({\n      description: t('settings.updates.checking.message'),\n      button: checkButton(),\n    })),\n    Match.when({ kind: 'up-to-date' }, (s) => ({\n      description: isChecking\n        ? t('settings.updates.checking.message')\n        : t('settings.updates.up-to-date.message', {\n            checkedAt: formatDistanceToNow(new Date(s.checkedAt), { addSuffix: true }),\n          }),\n      button: checkButton(),\n    })),\n    Match.when({ kind: 'available' }, (s) => ({\n      description: t('settings.updates.available.message', { version: s.version }),\n      button: (\n        <Button variant='primary' disabled={isInstalling} onClick={() => void onInstall()}>\n          {isInstalling ? t('settings.updates.downloading.label') : t('settings.updates.update-now.label')}\n        </Button>\n      ),\n    })),\n    Match.when({ kind: 'downloading' }, (s) => {\n      const percent = s.contentLength > 0 ? Math.round((s.downloaded / s.contentLength) * 100) : 0;\n      return {\n        description: t('settings.updates.downloading.message', { percent }),\n        button: <Button disabled>{t('settings.updates.downloading.label')}</Button>,\n      };\n    }),\n    Match.when({ kind: 'ready' }, () => ({\n      description: t('settings.updates.ready.message'),\n      button: (\n        <Button variant='primary' disabled={pending === 'relaunch'} onClick={() => void onRelaunch()}>\n          {t('settings.updates.relaunch.label')}\n        </Button>\n      ),\n    })),\n    Match.when({ kind: 'failed' }, (s) => ({\n      description: t('settings.updates.failed.message', { error: s.error }),\n      button: checkButton(),\n    })),\n    Match.exhaustive,\n  );\n};\n"],
-  "mappings": "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",
-  "names": ["useAtomValue", "formatDistanceToNow", "Match", "React", "useState", "useCapability", "Button", "useTranslation", "Settings", "SettingsForm", "meta", "NativeCapabilities", "NativeSettings", "_props", "t", "profile", "key", "manager", "UpdateManager", "status", "pending", "setPending", "runAction", "kind", "action", "description", "button", "renderUpdateRow", "onCheck", "check", "onInstall", "install", "onRelaunch", "relaunch", "Viewport", "Section", "title", "Item", "isChecking", "isInstalling", "checkButton", "disabled", "onClick", "value", "pipe", "withReturnType", "when", "s", "checkedAt", "Date", "addSuffix", "version", "variant", "percent", "contentLength", "Math", "round", "downloaded", "error", "exhaustive"]
-}

package/dist/lib/neutral/ollama-BHWFTROM.mjs

@@ -1,62 +0,0 @@
-import "./chunk-J5LGTIGS.mjs";
-
-// src/capabilities/ollama.ts
-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 { OllamaResolver } from "@dxos/ai/resolvers";
-import { Capability } from "@dxos/app-framework";
-import { AppCapabilities } from "@dxos/app-toolkit";
-import { log } from "@dxos/log";
-var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-native/src/capabilities/ollama.ts";
-var OLLAMA_HOST = "http://localhost:21434";
-var ollama_default = Capability.makeModule(() => Effect.sync(() => {
-  const runtime = ManagedRuntime.make(OllamaSidecar.layerLive);
-  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()));
-}));
-var OllamaSidecar = class _OllamaSidecar extends Context.Tag("@dxos/plugin-native/OllamaSidecar")() {
-  static layerLive = Layer.scoped(_OllamaSidecar, Effect.gen(function* () {
-    const command = Command.sidecar("sidecar/ollama", [
-      "serve"
-    ], {
-      env: {
-        OLLAMA_HOST,
-        OLLAMA_ORIGINS: "*"
-      }
-    });
-    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
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 38, S: this }));
-    command.on("error", (error) => log.error("Ollama error", {
-      error
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 41, S: this }));
-    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
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 48, S: this });
-    return {
-      endpoint: OLLAMA_HOST
-    };
-  }));
-};
-var OllamaSidecarModelResolver = Layer.unwrapEffect(Effect.gen(function* () {
-  const { endpoint } = yield* OllamaSidecar;
-  return OllamaResolver.make({
-    endpoint,
-    transformClient: HttpClient.withTracerPropagation(false)
-  });
-})).pipe(Layer.provide(FetchHttpClient.layer));
-export {
-  ollama_default as default
-};
-//# sourceMappingURL=ollama-BHWFTROM.mjs.map

package/dist/lib/neutral/ollama-BHWFTROM.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/ollama.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as FetchHttpClient from '@effect/platform/FetchHttpClient';\nimport * as HttpClient from '@effect/platform/HttpClient';\nimport { Command } from '@tauri-apps/plugin-shell';\nimport * as Context from 'effect/Context';\nimport * as Effect from 'effect/Effect';\nimport * as Layer from 'effect/Layer';\nimport * as ManagedRuntime from 'effect/ManagedRuntime';\n\nimport { type AiModelResolver } from '@dxos/ai';\nimport { OllamaResolver } from '@dxos/ai/resolvers';\nimport { Capability } from '@dxos/app-framework';\nimport { AppCapabilities } from '@dxos/app-toolkit';\nimport { log } from '@dxos/log';\n\n// NOTE: Running ollama on non-standard port (config Tauri).\nconst OLLAMA_HOST = 'http://localhost:21434';\n\nexport type OllamaCapabilities = Capability.Capability<typeof AppCapabilities.AiModelResolver>;\n\nexport default Capability.makeModule<[], OllamaCapabilities>(() =>\n  Effect.sync(() => {\n    const runtime = ManagedRuntime.make(OllamaSidecar.layerLive);\n\n    // Layer for the sidecar but the lifecycle is managed by the runtime.\n    const sidecarLayer = Layer.effectContext(\n      runtime.runtimeEffect.pipe(Effect.map((rt) => rt.context.pipe(Context.pick(OllamaSidecar)))),\n    );\n\n    return Capability.contributes(\n      AppCapabilities.AiModelResolver,\n      OllamaSidecarModelResolver.pipe(Layer.provide(sidecarLayer)),\n      () => Effect.tryPromise(() => runtime.dispose()),\n    );\n  }),\n);\n\nclass OllamaSidecar extends Context.Tag('@dxos/plugin-native/OllamaSidecar')<\n  OllamaSidecar,\n  {\n    endpoint: string;\n  }\n>() {\n  static layerLive = Layer.scoped(\n    OllamaSidecar,\n    Effect.gen(function* () {\n      const command = Command.sidecar('sidecar/ollama', ['serve'], {\n        env: {\n          OLLAMA_HOST,\n          OLLAMA_ORIGINS: '*', // CORS\n        },\n      });\n\n      // NOTE: Keeping those as console.log for consistent formatting.\n      // eslint-disable-next-line no-console\n      command.stdout.on('data', (data) => console.log('[ollama]', data.toString()));\n      // eslint-disable-next-line no-console\n      command.stderr.on('data', (data) => console.error('[ollama]', data.toString()));\n      command.on('close', (code) => log.info('Ollama process exited', { code }));\n      command.on('error', (error) => log.error('Ollama error', { error }));\n      const child = yield* Effect.promise(() => command.spawn());\n      yield* Effect.addFinalizer(\n        Effect.fn(function* () {\n          yield* Effect.promise(() => child.kill());\n        }),\n      );\n      log.info('Running ollama', { pid: child.pid });\n\n      return {\n        endpoint: OLLAMA_HOST,\n      };\n    }),\n  );\n}\n\nconst OllamaSidecarModelResolver: Layer.Layer<AiModelResolver.AiModelResolver, never, OllamaSidecar> =\n  Layer.unwrapEffect(\n    Effect.gen(function* () {\n      const { endpoint } = yield* OllamaSidecar;\n      return OllamaResolver.make({\n        endpoint,\n        transformClient: HttpClient.withTracerPropagation(false),\n      });\n    }),\n  ).pipe(Layer.provide(FetchHttpClient.layer));\n"],
-  "mappings": ";;;AAIA,YAAYA,qBAAqB;AACjC,YAAYC,gBAAgB;AAC5B,SAASC,eAAe;AACxB,YAAYC,aAAa;AACzB,YAAYC,YAAY;AACxB,YAAYC,WAAW;AACvB,YAAYC,oBAAoB;AAGhC,SAASC,sBAAsB;AAC/B,SAASC,kBAAkB;AAC3B,SAASC,uBAAuB;AAChC,SAASC,WAAW;AAEpB,IAAA,eAAA;kBAOUC;qBAEN,WAAA,WAAA,MAAA,YAAA,MAAA;AACA,QAAMC,UAAqBC,oBAAAA,cACjBC,SAAAA;AASZ,QAAA,eAAA,oBAAA,QAAA,cAAA,KAAA,WAAA,CAAA,OAAA,GAAA,QAAA,KAAA,aAAA,aAAA,CAAA,CAAA,CAAA,CAAA;AAEIC,SAAAA,WAAAA,YAA8BC,gBAAI,iBAAA,2BAAA,KAAA,cAAA,YAAA,CAAA,GAAA,MAAA,kBAAA,MAAA,QAAA,QAAA,CAAA,CAAA;AAMtC,CAAA,CAAA;iDAG4BC,YAAQ,mCAAkB,EAAA,EAAA;qBAAC,aAAA,gBAAA,WAAA,aAAA;UAAU,UAAA,QAAA,QAAA,kBAAA;MAC3DC;;WAEEC;QACF;QACF,gBAAA;MAEA;IACA,CAAA;AAGAC,YAAQC,OAAOC,GAAG,QAAQ,CAACC,SAASC,QAAQC,IAAAA,YAAM,KAAYF,SAAKG,CAAQ,CAAA;YACTC,OAAAA,GAAAA,QAAAA,CAAAA,SAAAA,QAAAA,MAAAA,YAAAA,KAAAA,SAAAA,CAAAA,CAAAA;YAAK,GAAA,SAAA,CAAA,SAAA,IAAA,KAAA,yBAAA;MAC/DL;qBAAmDG,YAAAA,GAAAA,cAAAA,GAAAA,IAAAA,GAAAA,KAAAA,CAAAA,CAAAA;YAAM,GAAA,SAAA,CAAA,UAAA,IAAA,MAAA,gBAAA;MAC3DG;IACN,GAAA,EAAOxB,YAAOyB,YACZzB,GAAAA,cAAU,GAAA,IAAA,GAAA,KAAA,CAAA,CAAA;UACR,QAAOA,OAAe,eAAY0B,MAAI,QAAA,MAAA,CAAA;AACxC,WAAA,oBAAA,UAAA,aAAA;AAEEC,aAAK,eAAA,MAAkB,MAAA,KAAA,CAAA;;AAAiB,QAAA,KAAA,kBAAA;MAE5C,KAAO,MAAA;qBACKC,YAAAA,GAAAA,cAAAA,GAAAA,IAAAA,GAAAA,KAAAA,CAAAA;AACZ,WAAA;MAEF,UAAA;IACJ;EAEA,CAAA,CAAMC;;IAIA,6BAA2B,mBAAA,WAAA,aAAA;QACzBC,EAAAA,SAAAA,IAAAA,OAAAA;SACAC,eAAiBlC,KAAAA;IACnB;IAEE,iBAAeD,iCAAqB,KAAA;;;",
-  "names": ["FetchHttpClient", "HttpClient", "Command", "Context", "Effect", "Layer", "ManagedRuntime", "OllamaResolver", "Capability", "AppCapabilities", "log", "runtime", "sidecarLayer", "effectContext", "runtimeEffect", "OllamaSidecar", "Tag", "sidecar", "env", "OLLAMA_ORIGINS", "command", "stderr", "on", "data", "console", "error", "toString", "code", "child", "addFinalizer", "kill", "info", "OLLAMA_HOST", "OllamaSidecarModelResolver", "endpoint", "transformClient"]
-}

package/dist/types/src/components/NativeSettings/NativeSettings.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NativeSettings.d.ts","sourceRoot":"","sources":["../../../../../src/components/NativeSettings/NativeSettings.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAmC,MAAM,OAAO,CAAC;AAGxD,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAKvD,OAAO,EAAsB,KAAK,QAAQ,EAAe,MAAM,QAAQ,CAAC;AAExE,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAYrF,eAAO,MAAM,cAAc,WAAY,mBAAmB,sBAkCzD,CAAC"}