@dxos/plugin-native 0.9.0 → 0.9.1-staging.ee54ba693a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/neutral/NativePlugin.mjs +2 -2
- package/dist/lib/neutral/NativePlugin.mjs.map +4 -4
- package/dist/lib/neutral/{NativeSettings-CLYG5TJH.mjs → NativeSettings-33K63AVG.mjs} +16 -9
- package/dist/lib/neutral/NativeSettings-33K63AVG.mjs.map +7 -0
- package/dist/lib/neutral/capabilities/index.mjs +4 -4
- package/dist/lib/neutral/chunk-WU6IZ56J.mjs +43 -0
- package/dist/lib/neutral/chunk-WU6IZ56J.mjs.map +7 -0
- package/dist/lib/neutral/{components → containers}/index.mjs +2 -2
- package/dist/lib/neutral/{components → containers}/index.mjs.map +1 -1
- package/dist/lib/neutral/index.mjs +1 -1
- package/dist/lib/neutral/meta.json +1 -1
- package/dist/lib/neutral/meta.mjs +1 -1
- package/dist/lib/neutral/ollama-HZEXAT2P.mjs +312 -0
- package/dist/lib/neutral/ollama-HZEXAT2P.mjs.map +7 -0
- package/dist/lib/neutral/plugin.mjs +1 -1
- package/dist/lib/neutral/{react-surface-ETNGHN4X.mjs → react-surface-YST5DQA3.mjs} +3 -3
- package/dist/lib/neutral/{react-surface-ETNGHN4X.mjs.map → react-surface-YST5DQA3.mjs.map} +3 -3
- package/dist/lib/neutral/{settings-HF6TQNU4.mjs → settings-S5MFUI42.mjs} +3 -3
- package/dist/lib/neutral/{settings-HF6TQNU4.mjs.map → settings-S5MFUI42.mjs.map} +3 -3
- package/dist/lib/neutral/translations.mjs +1 -2
- package/dist/lib/neutral/translations.mjs.map +3 -3
- package/dist/lib/neutral/types/index.mjs +2 -2
- package/dist/lib/neutral/types/index.mjs.map +3 -3
- package/dist/lib/neutral/{updater-JEBXWSSK.mjs → updater-5ETKR4S3.mjs} +6 -6
- package/dist/lib/neutral/{updater-JEBXWSSK.mjs.map → updater-5ETKR4S3.mjs.map} +2 -2
- package/dist/types/dx.config.d.ts +28 -0
- package/dist/types/dx.config.d.ts.map +1 -0
- package/dist/types/src/capabilities/index.d.ts +5 -5
- package/dist/types/src/capabilities/index.d.ts.map +1 -1
- package/dist/types/src/capabilities/ollama.d.ts +3 -2
- package/dist/types/src/capabilities/ollama.d.ts.map +1 -1
- package/dist/types/src/capabilities/react-surface.d.ts +2 -2
- package/dist/types/src/capabilities/react-surface.d.ts.map +1 -1
- package/dist/types/src/capabilities/settings.d.ts +1 -3
- package/dist/types/src/capabilities/settings.d.ts.map +1 -1
- package/dist/types/src/capabilities/spotlight-listener.d.ts +1 -1
- package/dist/types/src/capabilities/updater.d.ts +1 -2
- package/dist/types/src/capabilities/updater.d.ts.map +1 -1
- package/dist/types/src/{components → containers}/NativeSettings/NativeSettings.d.ts +1 -1
- package/dist/types/src/containers/NativeSettings/NativeSettings.d.ts.map +1 -0
- package/dist/types/src/{components → containers}/NativeSettings/index.d.ts.map +1 -1
- package/dist/types/src/{components → containers}/index.d.ts.map +1 -1
- package/dist/types/src/meta.d.ts +32 -2
- package/dist/types/src/meta.d.ts.map +1 -1
- package/dist/types/src/translations.d.ts +0 -1
- package/dist/types/src/translations.d.ts.map +1 -1
- package/dist/types/src/types/NativeCapabilities.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/dx.config.ts +32 -0
- package/package.json +25 -24
- package/src/NativePlugin.tsx +1 -1
- package/src/capabilities/ollama.ts +281 -16
- package/src/capabilities/react-surface.tsx +2 -2
- package/src/capabilities/settings.ts +2 -2
- package/src/capabilities/updater.ts +5 -5
- package/src/{components → containers}/NativeSettings/NativeSettings.tsx +15 -10
- package/src/meta.ts +3 -25
- package/src/translations.ts +1 -2
- package/src/types/NativeCapabilities.ts +6 -2
- package/dist/lib/neutral/NativeSettings-CLYG5TJH.mjs.map +0 -7
- package/dist/lib/neutral/chunk-75E24KAJ.mjs +0 -34
- package/dist/lib/neutral/chunk-75E24KAJ.mjs.map +0 -7
- package/dist/lib/neutral/ollama-BHWFTROM.mjs +0 -62
- package/dist/lib/neutral/ollama-BHWFTROM.mjs.map +0 -7
- package/dist/types/src/components/NativeSettings/NativeSettings.d.ts.map +0 -1
- /package/dist/types/src/{components → containers}/NativeSettings/index.d.ts +0 -0
- /package/dist/types/src/{components → containers}/index.d.ts +0 -0
- /package/src/{components → containers}/NativeSettings/index.ts +0 -0
- /package/src/{components → containers}/index.ts +0 -0
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"version": 3,
|
|
3
|
-
"sources": ["../../../src/components/NativeSettings/NativeSettings.tsx"],
|
|
4
|
-
"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.id);\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"],
|
|
5
|
-
"mappings": "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",
|
|
6
|
-
"names": ["useAtomValue", "formatDistanceToNow", "Match", "React", "useState", "useCapability", "Button", "useTranslation", "Settings", "SettingsForm", "meta", "NativeCapabilities", "NativeSettings", "_props", "t", "id", "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"]
|
|
7
|
-
}
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
// src/meta.ts
|
|
2
|
-
import { Plugin } from "@dxos/app-framework";
|
|
3
|
-
import { DXN } from "@dxos/keys";
|
|
4
|
-
import { trim } from "@dxos/util";
|
|
5
|
-
var meta = Plugin.makeMeta({
|
|
6
|
-
key: DXN.make("org.dxos.plugin.native"),
|
|
7
|
-
name: "App",
|
|
8
|
-
author: "DXOS",
|
|
9
|
-
spec: "PLUGIN.mdl",
|
|
10
|
-
description: trim`
|
|
11
|
-
Tauri-based native platform integration for DXOS Composer on macOS, Linux, and Windows.
|
|
12
|
-
|
|
13
|
-
Provides Spotlight window integration that forwards spotlight:invoke Tauri events to
|
|
14
|
-
Composer operations, letting the OS-level launcher open spaces and switch workspaces
|
|
15
|
-
without the main window being focused first.
|
|
16
|
-
|
|
17
|
-
Manages over-the-air application updates via the Tauri updater plugin, automatically
|
|
18
|
-
checking for new releases in the background, streaming download progress, and surfacing
|
|
19
|
-
a toast notification with a one-click Relaunch action when an update is ready.
|
|
20
|
-
|
|
21
|
-
Spawns an Ollama sidecar process on localhost for local AI model inference, registering
|
|
22
|
-
it as an AiModelResolver so Assistant features can resolve model requests without any
|
|
23
|
-
external server dependency.
|
|
24
|
-
`,
|
|
25
|
-
icon: "ph--app-window--regular",
|
|
26
|
-
tags: [
|
|
27
|
-
"system"
|
|
28
|
-
]
|
|
29
|
-
});
|
|
30
|
-
|
|
31
|
-
export {
|
|
32
|
-
meta
|
|
33
|
-
};
|
|
34
|
-
//# sourceMappingURL=chunk-75E24KAJ.mjs.map
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"version": 3,
|
|
3
|
-
"sources": ["../../../src/meta.ts"],
|
|
4
|
-
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { Plugin } from '@dxos/app-framework';\nimport { DXN } from '@dxos/keys';\nimport { trim } from '@dxos/util';\n\n// TODO(wittjosiah): Rename plugin (package + id) from `native` to `app` to match the user-facing name.\nexport const meta = Plugin.makeMeta({\n key: DXN.make('org.dxos.plugin.native'),\n name: 'App',\n author: 'DXOS',\n spec: 'PLUGIN.mdl',\n description: trim`\n Tauri-based native platform integration for DXOS Composer on macOS, Linux, and Windows.\n\n Provides Spotlight window integration that forwards spotlight:invoke Tauri events to\n Composer operations, letting the OS-level launcher open spaces and switch workspaces\n without the main window being focused first.\n\n Manages over-the-air application updates via the Tauri updater plugin, automatically\n checking for new releases in the background, streaming download progress, and surfacing\n a toast notification with a one-click Relaunch action when an update is ready.\n\n Spawns an Ollama sidecar process on localhost for local AI model inference, registering\n it as an AiModelResolver so Assistant features can resolve model requests without any\n external server dependency.\n `,\n icon: 'ph--app-window--regular',\n tags: ['system'],\n});\n"],
|
|
5
|
-
"mappings": ";AAIA,SAASA,cAAc;AACvB,SAASC,WAAW;AACpB,SAASC,YAAY;AAGd,IAAMC,OAAOH,OAAOI,SAAS;EAClCC,KAAKJ,IAAIK,KAAK,wBAAA;EACdC,MAAM;EACNC,QAAQ;EACRC,MAAM;EACNC,aAAaR;;;;;;;;;;;;;;;EAebS,MAAM;EACNC,MAAM;IAAC;;AACT,CAAA;",
|
|
6
|
-
"names": ["Plugin", "DXN", "trim", "meta", "makeMeta", "key", "make", "name", "author", "spec", "description", "icon", "tags"]
|
|
7
|
-
}
|
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
import "./chunk-J5LGTIGS.mjs";
|
|
2
|
-
|
|
3
|
-
// src/capabilities/ollama.ts
|
|
4
|
-
import * as FetchHttpClient from "@effect/platform/FetchHttpClient";
|
|
5
|
-
import * as HttpClient from "@effect/platform/HttpClient";
|
|
6
|
-
import { Command } from "@tauri-apps/plugin-shell";
|
|
7
|
-
import * as Context from "effect/Context";
|
|
8
|
-
import * as Effect from "effect/Effect";
|
|
9
|
-
import * as Layer from "effect/Layer";
|
|
10
|
-
import * as ManagedRuntime from "effect/ManagedRuntime";
|
|
11
|
-
import { OllamaResolver } from "@dxos/ai/resolvers";
|
|
12
|
-
import { Capability } from "@dxos/app-framework";
|
|
13
|
-
import { AppCapabilities } from "@dxos/app-toolkit";
|
|
14
|
-
import { log } from "@dxos/log";
|
|
15
|
-
var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-native/src/capabilities/ollama.ts";
|
|
16
|
-
var OLLAMA_HOST = "http://localhost:21434";
|
|
17
|
-
var ollama_default = Capability.makeModule(() => Effect.sync(() => {
|
|
18
|
-
const runtime = ManagedRuntime.make(OllamaSidecar.layerLive);
|
|
19
|
-
const sidecarLayer = Layer.effectContext(runtime.runtimeEffect.pipe(Effect.map((rt) => rt.context.pipe(Context.pick(OllamaSidecar)))));
|
|
20
|
-
return Capability.contributes(AppCapabilities.AiModelResolver, OllamaSidecarModelResolver.pipe(Layer.provide(sidecarLayer)), () => Effect.tryPromise(() => runtime.dispose()));
|
|
21
|
-
}));
|
|
22
|
-
var OllamaSidecar = class _OllamaSidecar extends Context.Tag("@dxos/plugin-native/OllamaSidecar")() {
|
|
23
|
-
static layerLive = Layer.scoped(_OllamaSidecar, Effect.gen(function* () {
|
|
24
|
-
const command = Command.sidecar("sidecar/ollama", [
|
|
25
|
-
"serve"
|
|
26
|
-
], {
|
|
27
|
-
env: {
|
|
28
|
-
OLLAMA_HOST,
|
|
29
|
-
OLLAMA_ORIGINS: "*"
|
|
30
|
-
}
|
|
31
|
-
});
|
|
32
|
-
command.stdout.on("data", (data) => console.log("[ollama]", data.toString()));
|
|
33
|
-
command.stderr.on("data", (data) => console.error("[ollama]", data.toString()));
|
|
34
|
-
command.on("close", (code) => log.info("Ollama process exited", {
|
|
35
|
-
code
|
|
36
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 38, S: this }));
|
|
37
|
-
command.on("error", (error) => log.error("Ollama error", {
|
|
38
|
-
error
|
|
39
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 41, S: this }));
|
|
40
|
-
const child = yield* Effect.promise(() => command.spawn());
|
|
41
|
-
yield* Effect.addFinalizer(Effect.fn(function* () {
|
|
42
|
-
yield* Effect.promise(() => child.kill());
|
|
43
|
-
}));
|
|
44
|
-
log.info("Running ollama", {
|
|
45
|
-
pid: child.pid
|
|
46
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 48, S: this });
|
|
47
|
-
return {
|
|
48
|
-
endpoint: OLLAMA_HOST
|
|
49
|
-
};
|
|
50
|
-
}));
|
|
51
|
-
};
|
|
52
|
-
var OllamaSidecarModelResolver = Layer.unwrapEffect(Effect.gen(function* () {
|
|
53
|
-
const { endpoint } = yield* OllamaSidecar;
|
|
54
|
-
return OllamaResolver.make({
|
|
55
|
-
endpoint,
|
|
56
|
-
transformClient: HttpClient.withTracerPropagation(false)
|
|
57
|
-
});
|
|
58
|
-
})).pipe(Layer.provide(FetchHttpClient.layer));
|
|
59
|
-
export {
|
|
60
|
-
ollama_default as default
|
|
61
|
-
};
|
|
62
|
-
//# sourceMappingURL=ollama-BHWFTROM.mjs.map
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"version": 3,
|
|
3
|
-
"sources": ["../../../src/capabilities/ollama.ts"],
|
|
4
|
-
"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"],
|
|
5
|
-
"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;;;",
|
|
6
|
-
"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"]
|
|
7
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"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"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|