@dxos/plugin-native 0.8.4-main.1da679c → 0.8.4-main.1f223c7

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.
Files changed (13) hide show
  1. package/dist/lib/browser/index.mjs +3 -3
  2. package/dist/lib/browser/meta.json +1 -1
  3. package/dist/lib/browser/{ollama-FEWAW35N.mjs → ollama-7VZCJLY5.mjs} +9 -8
  4. package/dist/lib/browser/ollama-7VZCJLY5.mjs.map +7 -0
  5. package/dist/lib/browser/{updater-NS5MWZOK.mjs → updater-MNSUJ5ER.mjs} +3 -3
  6. package/dist/lib/browser/{updater-NS5MWZOK.mjs.map → updater-MNSUJ5ER.mjs.map} +1 -1
  7. package/dist/lib/browser/{window-6G542FZL.mjs → window-5EBHZJJ4.mjs} +3 -3
  8. package/dist/lib/browser/{window-6G542FZL.mjs.map → window-5EBHZJJ4.mjs.map} +1 -1
  9. package/dist/types/src/capabilities/ollama.d.ts.map +1 -1
  10. package/dist/types/tsconfig.tsbuildinfo +1 -1
  11. package/package.json +10 -10
  12. package/src/capabilities/ollama.ts +3 -2
  13. package/dist/lib/browser/ollama-FEWAW35N.mjs.map +0 -7
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/plugin-native",
3
- "version": "0.8.4-main.1da679c",
3
+ "version": "0.8.4-main.1f223c7",
4
4
  "description": "Composer plugin that runs when on a native device.",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -31,21 +31,21 @@
31
31
  "@tauri-apps/plugin-shell": "^2.3.0",
32
32
  "@tauri-apps/plugin-updater": "^2.9.0",
33
33
  "effect": "3.17.7",
34
- "@dxos/ai": "0.8.4-main.1da679c",
35
- "@dxos/app-framework": "0.8.4-main.1da679c",
36
- "@dxos/log": "0.8.4-main.1da679c",
37
- "@dxos/plugin-help": "0.8.4-main.1da679c",
38
- "@dxos/plugin-assistant": "0.8.4-main.1da679c",
39
- "@dxos/plugin-navtree": "0.8.4-main.1da679c",
40
- "@dxos/util": "0.8.4-main.1da679c"
34
+ "@dxos/ai": "0.8.4-main.1f223c7",
35
+ "@dxos/log": "0.8.4-main.1f223c7",
36
+ "@dxos/app-framework": "0.8.4-main.1f223c7",
37
+ "@dxos/plugin-assistant": "0.8.4-main.1f223c7",
38
+ "@dxos/plugin-help": "0.8.4-main.1f223c7",
39
+ "@dxos/plugin-navtree": "0.8.4-main.1f223c7",
40
+ "@dxos/util": "0.8.4-main.1f223c7"
41
41
  },
42
42
  "devDependencies": {
43
43
  "vite": "7.1.1",
44
- "@dxos/react-ui": "0.8.4-main.1da679c"
44
+ "@dxos/react-ui": "0.8.4-main.1f223c7"
45
45
  },
46
46
  "peerDependencies": {
47
47
  "effect": "^3.13.3",
48
- "@dxos/react-ui": "0.8.4-main.1da679c"
48
+ "@dxos/react-ui": "0.8.4-main.1f223c7"
49
49
  },
50
50
  "publishConfig": {
51
51
  "access": "public"
package/src/capabilities/ollama.ts CHANGED
@@ -7,8 +7,9 @@ import { Command } from '@tauri-apps/plugin-shell';
7
7
  import { Context, Effect, Layer, ManagedRuntime } from 'effect';
8
8
 
9
9
  import { AiServiceRouter } from '@dxos/ai';
10
- import { Capabilities, type Capability, type PluginContext, contributes } from '@dxos/app-framework';
10
+ import { type Capability, type PluginContext, contributes } from '@dxos/app-framework';
11
11
  import { log } from '@dxos/log';
12
+ import { AssistantCapabilities } from '@dxos/plugin-assistant';
12
13
 
13
14
  // Running ollama on non-standard port.
14
15
  const OLLAMA_HOST = 'http://localhost:21434';
@@ -22,7 +23,7 @@ export default (_context: PluginContext): Capability<any> => {
22
23
  );
23
24
 
24
25
  return contributes(
25
- Capabilities.AiModelResolver,
26
+ AssistantCapabilities.AiModelResolver,
26
27
  OllamaSidecarModelResolver.pipe(Layer.provide(sidecarLayer)),
27
28
  async () => {
28
29
  await runtime.dispose();
package/dist/lib/browser/ollama-FEWAW35N.mjs.map DELETED
@@ -1,7 +0,0 @@
1
- {
2
- "version": 3,
3
- "sources": ["../../../src/capabilities/ollama.ts"],
4
- "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { FetchHttpClient, HttpClient } from '@effect/platform';\nimport { Command } from '@tauri-apps/plugin-shell';\nimport { Context, Effect, Layer, ManagedRuntime } from 'effect';\n\nimport { AiServiceRouter } from '@dxos/ai';\nimport { Capabilities, type Capability, type PluginContext, contributes } from '@dxos/app-framework';\nimport { log } from '@dxos/log';\n\n// Running ollama on non-standard port.\nconst OLLAMA_HOST = 'http://localhost:21434';\n\nexport default (_context: PluginContext): Capability<any> => {\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 contributes(\n Capabilities.AiModelResolver,\n OllamaSidecarModelResolver.pipe(Layer.provide(sidecarLayer)),\n async () => {\n await 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 command.stdout.on('data', (data) => console.log('[ollama]', data.toString()));\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<AiServiceRouter.AiModelResolver, never, OllamaSidecar> =\n Layer.unwrapEffect(\n Effect.gen(function* () {\n const { endpoint } = yield* OllamaSidecar;\n return AiServiceRouter.OllamaResolver({\n host: endpoint,\n transformClient: HttpClient.withTracerPropagation(false),\n });\n }),\n ).pipe(Layer.provide(FetchHttpClient.layer));\n"],
5
- "mappings": ";AAIA,SAASA,iBAAiBC,kBAAkB;AAC5C,SAASC,eAAe;AACxB,SAASC,SAASC,QAAQC,OAAOC,sBAAsB;AAEvD,SAASC,uBAAuB;AAChC,SAASC,cAAmDC,mBAAmB;AAC/E,SAASC,WAAW;;;;;;;;;;;;;;;AAGpB,IAAMC,cAAc;AAEpB,IAAA,kBAAe,CAACC,aAAAA;AACd,QAAMC,UAAUP,eAAeQ,KAAKC,cAAcC,SAAS;AAG3D,QAAMC,eAAeZ,MAAMa,cACzBL,QAAQM,cAAcC,KAAKhB,OAAOiB,IAAI,CAACC,OAAOA,GAAGC,QAAQH,KAAKjB,QAAQqB,KAAKT,aAAAA,CAAAA,CAAAA,CAAAA,CAAAA;AAG7E,SAAON,YACLD,aAAaiB,iBACbC,2BAA2BN,KAAKf,MAAMsB,QAAQV,YAAAA,CAAAA,GAC9C,YAAA;AACE,UAAMJ,QAAQe,QAAO;EACvB,CAAA;AAEJ;IAE4BzB;AAA5B,IAAMY,gBAAN,eAA4BZ,eAAAA,QAAQ0B,IAAI,mCAAA,EAAA,GAKtC;AA6BF;AA5BE,iBANId,eAMGC,aAAYX,MAAMyB,OACvBf,eACAX,OAAO2B,IAAI,aAAA;AACT,QAAMC,UAAU9B,QAAQ+B,QAAQ,kBAAkB;IAAC;KAAU;IAC3DC,KAAK;MACHvB;MACAwB,gBAAgB;IAClB;EACF,CAAA;AAGAH,UAAQI,OAAOC,GAAG,QAAQ,CAACC,SAASC,QAAQ7B,IAAI,YAAY4B,KAAKE,SAAQ,CAAA,CAAA;AACzER,UAAQS,OAAOJ,GAAG,QAAQ,CAACC,SAASC,QAAQG,MAAM,YAAYJ,KAAKE,SAAQ,CAAA,CAAA;AAC3ER,UAAQK,GAAG,SAAS,CAACM,SAASjC,IAAIkC,KAAK,yBAAyB;IAAED;EAAK,GAAA;;;;;;AACvEX,UAAQK,GAAG,SAAS,CAACK,UAAUhC,IAAIgC,MAAM,gBAAgB;IAAEA;EAAM,GAAA;;;;;;AACjE,QAAMG,QAAQ,OAAOzC,OAAO0C,QAAQ,MAAMd,QAAQe,MAAK,CAAA;AACvD,SAAO3C,OAAO4C,aACZ5C,OAAO6C,GAAG,aAAA;AACR,WAAO7C,OAAO0C,QAAQ,MAAMD,MAAMK,KAAI,CAAA;EACxC,CAAA,CAAA;AAEFxC,MAAIkC,KAAK,kBAAkB;IAAEO,KAAKN,MAAMM;EAAI,GAAA;;;;;;AAE5C,SAAO;IACLC,UAAUzC;EACZ;AACF,CAAA,CAAA,CAAA;AAIJ,IAAMe,6BACJrB,MAAMgD,aACJjD,OAAO2B,IAAI,aAAA;AACT,QAAM,EAAEqB,SAAQ,IAAK,OAAOrC;AAC5B,SAAOR,gBAAgB+C,eAAe;IACpCC,MAAMH;IACNI,iBAAiBvD,WAAWwD,sBAAsB,KAAA;EACpD,CAAA;AACF,CAAA,CAAA,EACArC,KAAKf,MAAMsB,QAAQ3B,gBAAgB0D,KAAK,CAAA;",
6
- "names": ["FetchHttpClient", "HttpClient", "Command", "Context", "Effect", "Layer", "ManagedRuntime", "AiServiceRouter", "Capabilities", "contributes", "log", "OLLAMA_HOST", "_context", "runtime", "make", "OllamaSidecar", "layerLive", "sidecarLayer", "effectContext", "runtimeEffect", "pipe", "map", "rt", "context", "pick", "AiModelResolver", "OllamaSidecarModelResolver", "provide", "dispose", "Tag", "scoped", "gen", "command", "sidecar", "env", "OLLAMA_ORIGINS", "stdout", "on", "data", "console", "toString", "stderr", "error", "code", "info", "child", "promise", "spawn", "addFinalizer", "fn", "kill", "pid", "endpoint", "unwrapEffect", "OllamaResolver", "host", "transformClient", "withTracerPropagation", "layer"]
7
- }