@dxos/assistant 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef
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/extraction/index.mjs +4 -21
- package/dist/lib/neutral/extraction/index.mjs.map +3 -3
- package/dist/lib/neutral/index.mjs +1259 -79
- package/dist/lib/neutral/index.mjs.map +4 -4
- package/dist/lib/neutral/meta.json +1 -1
- package/dist/types/src/conversation/context.d.ts +9 -12
- package/dist/types/src/conversation/context.d.ts.map +1 -1
- package/dist/types/src/conversation/index.d.ts +1 -1
- package/dist/types/src/conversation/index.d.ts.map +1 -1
- package/dist/types/src/conversation/session.d.ts +78 -0
- package/dist/types/src/conversation/session.d.ts.map +1 -0
- package/dist/types/src/diff.d.ts.map +1 -1
- package/dist/types/src/errors.d.ts +12 -12
- package/dist/types/src/errors.d.ts.map +1 -1
- package/dist/types/src/execution-graph.d.ts.map +1 -1
- package/dist/types/src/extraction/extraction-ner-function/named-entity-recognition.d.ts.map +1 -1
- package/dist/types/src/extraction/extraction.d.ts +461 -455
- package/dist/types/src/extraction/extraction.d.ts.map +1 -1
- package/dist/types/src/extraction/quotes.d.ts.map +1 -1
- package/dist/types/src/functions/services.d.ts +7 -29
- package/dist/types/src/functions/services.d.ts.map +1 -1
- package/dist/types/src/index.d.ts +0 -1
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/session/artifact-diff.d.ts.map +1 -1
- package/dist/types/src/session/error-handling.d.ts.map +1 -1
- package/dist/types/src/session/format.d.ts +6 -3
- package/dist/types/src/session/format.d.ts.map +1 -1
- package/dist/types/src/session/index.d.ts +1 -1
- package/dist/types/src/session/{session.d.ts → request.d.ts} +25 -33
- package/dist/types/src/session/request.d.ts.map +1 -0
- package/dist/types/src/session/toolkit.d.ts +5 -7
- package/dist/types/src/session/toolkit.d.ts.map +1 -1
- package/dist/types/src/templates/system.d.ts +1 -1
- package/dist/types/src/templates/system.d.ts.map +1 -1
- package/dist/types/src/tracing.d.ts +64 -95
- package/dist/types/src/tracing.d.ts.map +1 -1
- package/dist/types/src/types/artifact.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +21 -38
- package/src/conversation/context.ts +1 -1
- package/src/conversation/index.ts +1 -1
- package/src/conversation/session.ts +334 -0
- package/src/execution-graph.ts +15 -5
- package/src/extraction/extraction.ts +1 -1
- package/src/functions/services.ts +12 -127
- package/src/functions.conversations.json +1 -1
- package/src/index.ts +0 -1
- package/src/session/format.ts +14 -9
- package/src/session/index.ts +1 -1
- package/src/session/request.conversations.json +1 -0
- package/src/session/{session.ts → request.ts} +44 -51
- package/src/session/toolkit.ts +18 -15
- package/src/templates/instructions/system.tpl +11 -0
- package/src/templates/system.ts +1 -1
- package/src/tracing.ts +13 -69
- package/dist/lib/neutral/chunk-J5LGTIGS.mjs +0 -10
- package/dist/lib/neutral/chunk-J5LGTIGS.mjs.map +0 -7
- package/dist/lib/neutral/chunk-UAWIXKF6.mjs +0 -1875
- package/dist/lib/neutral/chunk-UAWIXKF6.mjs.map +0 -7
- package/dist/lib/neutral/testing/index.mjs +0 -114
- package/dist/lib/neutral/testing/index.mjs.map +0 -7
- package/dist/types/src/conversation/conversation.d.ts +0 -68
- package/dist/types/src/conversation/conversation.d.ts.map +0 -1
- package/dist/types/src/conversation/conversation.test.d.ts +0 -2
- package/dist/types/src/conversation/conversation.test.d.ts.map +0 -1
- package/dist/types/src/functions.test.d.ts +0 -2
- package/dist/types/src/functions.test.d.ts.map +0 -1
- package/dist/types/src/service/AgentService.d.ts +0 -61
- package/dist/types/src/service/AgentService.d.ts.map +0 -1
- package/dist/types/src/service/AgentService.test.d.ts +0 -2
- package/dist/types/src/service/AgentService.test.d.ts.map +0 -1
- package/dist/types/src/service/agent-process.d.ts +0 -17
- package/dist/types/src/service/agent-process.d.ts.map +0 -1
- package/dist/types/src/service/index.d.ts +0 -3
- package/dist/types/src/service/index.d.ts.map +0 -1
- package/dist/types/src/session/format.test.d.ts +0 -2
- package/dist/types/src/session/format.test.d.ts.map +0 -1
- package/dist/types/src/session/session.d.ts.map +0 -1
- package/dist/types/src/session/session.test.d.ts +0 -2
- package/dist/types/src/session/session.test.d.ts.map +0 -1
- package/dist/types/src/testing/index.d.ts +0 -2
- package/dist/types/src/testing/index.d.ts.map +0 -1
- package/dist/types/src/testing/layer.d.ts +0 -35
- package/dist/types/src/testing/layer.d.ts.map +0 -1
- package/src/conversation/conversation.test.ts +0 -58
- package/src/conversation/conversation.ts +0 -275
- package/src/functions.test.ts +0 -82
- package/src/service/AgentService.conversations.json +0 -1
- package/src/service/AgentService.test.ts +0 -169
- package/src/service/AgentService.ts +0 -165
- package/src/service/agent-process.ts +0 -359
- package/src/service/index.ts +0 -6
- package/src/session/format.test.ts +0 -132
- package/src/session/session.conversations.json +0 -1
- package/src/session/session.test.ts +0 -190
- package/src/testing/index.ts +0 -5
- package/src/testing/layer.ts +0 -259
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extraction.d.ts","sourceRoot":"","sources":["../../../../src/extraction/extraction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"extraction.d.ts","sourceRoot":"","sources":["../../../../src/extraction/extraction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAIjC,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAS1B,CAAC;AACH,MAAM,WAAW,eAAgB,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,eAAe,CAAC;CAAG;AAEtF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG3B,CAAC;AACH,MAAM,WAAW,gBAAiB,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC;CAAG;AAExF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,KAAK,EAAE,eAAe,CAAC;IACvB,QAAQ,EAAE,SAAS,CAAC,UAAU,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;IAElE,OAAO,CAAC,EAAE;QACR;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB;;;;WAIG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;KACzB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,SAAS,CAAC,UAAU,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;AAEzF;;;GAGG;AACH,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAQtC,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAQhC,CAAC;AAEH;;GAEG;AAEH,eAAO,MAAM,wBAAwB,WAAkB,6BAA6B,KAAG,OAAO,CAAC,gBAAgB,CAqB9G,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quotes.d.ts","sourceRoot":"","sources":["../../../../src/extraction/quotes.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,QAAQ,EAAiB,MAAM,YAAY,CAAC;AAK1D,eAAO,MAAM,gBAAgB;;;;;EAe3B,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE3E,eAAO,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"quotes.d.ts","sourceRoot":"","sources":["../../../../src/extraction/quotes.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,QAAQ,EAAiB,MAAM,YAAY,CAAC;AAK1D,eAAO,MAAM,gBAAgB;;;;;EAe3B,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE3E,eAAO,MAAM,UAAU,WAAkB,MAAM,EAAE,MAAM,QAAQ,CAAC,QAAQ,KAAG,OAAO,CAAC,gBAAgB,CASlG,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,gBAAgB,SAAU,MAAM,UAAU,gBAAgB,WAYtE,CAAC"}
|
|
@@ -3,37 +3,15 @@ import * as Effect from 'effect/Effect';
|
|
|
3
3
|
import * as Layer from 'effect/Layer';
|
|
4
4
|
import * as Option from 'effect/Option';
|
|
5
5
|
import { ToolExecutionService, ToolResolverService } from '@dxos/ai';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import { Operation, OperationRegistry } from '@dxos/operation';
|
|
9
|
-
/**
|
|
10
|
-
* Constructs a `ToolResolverService` whose `resolve(id)` looks up tools in the following order:
|
|
11
|
-
* 1. Toolkit: return an existing tool from the provided `toolkit` if one is present under `id`.
|
|
12
|
-
* 2. Operations in DB: query by `key=id`; if found, deserialize and project to a tool.
|
|
13
|
-
* 3. Registered operations: fall back to a matching `Operation.Definition` from the handler set.
|
|
14
|
-
*
|
|
15
|
-
* If none of the above yield a match, the effect fails with `AiToolNotFoundError`.
|
|
16
|
-
*
|
|
17
|
-
* Requires `Database.Service` in the environment.
|
|
18
|
-
*
|
|
19
|
-
* @deprecated Moving to operation-based services.
|
|
20
|
-
*/
|
|
21
|
-
export declare const makeToolResolverFromFunctions: () => Layer.Layer<ToolResolverService, never, GenericToolkit.GenericToolkitProvider | FunctionInvocationService>;
|
|
22
|
-
/**
|
|
23
|
-
* @deprecated Moving to operation-based services.
|
|
24
|
-
*/
|
|
25
|
-
export declare const makeToolExecutionServiceFromFunctions: () => Layer.Layer<ToolExecutionService, never, FunctionInvocationService | GenericToolkit.GenericToolkitProvider>;
|
|
6
|
+
import { OpaqueToolkit } from '@dxos/ai';
|
|
7
|
+
import { Operation, OperationRegistry } from '@dxos/compute';
|
|
26
8
|
export declare const makeToolResolverFromOperations: <R = never>({ toolkit: extraToolkit, }?: {
|
|
27
|
-
toolkit?:
|
|
28
|
-
}) => Layer.Layer<ToolResolverService, never,
|
|
9
|
+
toolkit?: OpaqueToolkit.OpaqueToolkit<never, never, R>;
|
|
10
|
+
}) => Layer.Layer<ToolResolverService, never, OpaqueToolkit.OpaqueToolkitProvider | OperationRegistry.Service | R>;
|
|
29
11
|
export declare const makeToolExecutionService: <E, R>(opts: {
|
|
30
12
|
invoke: (tool: Tool.Any, input: unknown) => Effect.Effect<unknown>;
|
|
31
|
-
}) => Layer.Layer<ToolExecutionService, never,
|
|
32
|
-
export declare const makeToolExecutionServiceFromOperationInvoker: () => Layer.Layer<ToolExecutionService, never, Operation.Service |
|
|
33
|
-
|
|
34
|
-
* @deprecated Bridge beetwen deprecated function invocataion service and operation services until we remove function invocation service.
|
|
35
|
-
*/
|
|
36
|
-
export declare const functionInvocationServiceFromOperations: Layer.Layer<FunctionInvocationService, never, OperationRegistry.Service | Operation.Service>;
|
|
37
|
-
export declare const ToolExecutionServices: Layer.Layer<ToolExecutionService | ToolResolverService, never, FunctionInvocationService | GenericToolkit.GenericToolkitProvider>;
|
|
13
|
+
}) => Layer.Layer<ToolExecutionService, never, OpaqueToolkit.OpaqueToolkitProvider>;
|
|
14
|
+
export declare const makeToolExecutionServiceFromOperationInvoker: () => Layer.Layer<ToolExecutionService, never, Operation.Service | OpaqueToolkit.OpaqueToolkitProvider>;
|
|
15
|
+
export declare const ToolExecutionServices: Layer.Layer<ToolExecutionService | ToolResolverService, never, OpaqueToolkit.OpaqueToolkitProvider | Operation.Service | OperationRegistry.Service>;
|
|
38
16
|
export declare const getOperationFromTool: (tool: Tool.Any) => Option.Option<Operation.Definition.Any>;
|
|
39
17
|
//# sourceMappingURL=services.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../../src/functions/services.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,EAAuB,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC1F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../../src/functions/services.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,EAAuB,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAO7D,eAAO,MAAM,8BAA8B,GAAI,CAAC,GAAG,KAAK,+BAErD;IAAE,OAAO,CAAC,EAAE,aAAa,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;CAAE,KAAQ,KAAK,CAAC,KAAK,CAC9E,mBAAmB,EACnB,KAAK,EACL,aAAa,CAAC,qBAAqB,GAAG,iBAAiB,CAAC,OAAO,GAAG,CAAC,CA6BpE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,CAAC,EAAE,CAAC,QAAQ;IACnD,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;CACpE,KAAG,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,EAAE,aAAa,CAAC,qBAAqB,CAkC7E,CAAC;AAEJ,eAAO,MAAM,4CAA4C,QAAO,KAAK,CAAC,KAAK,CACzE,oBAAoB,EACpB,KAAK,EACL,SAAS,CAAC,OAAO,GAAG,aAAa,CAAC,qBAAqB,CAgBxD,CAAC;AAEF,eAAO,MAAM,qBAAqB,qJAGjC,CAAC;AAOF,eAAO,MAAM,oBAAoB,SAAU,IAAI,CAAC,GAAG,KAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAE3F,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifact-diff.d.ts","sourceRoot":"","sources":["../../../../src/session/artifact-diff.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;;AAE3C;;;;;;;GAOG;AAEH,qBAAa,oBAAqB,SAAQ,yBAGvC;CAAG;AAEN,yBAAiB,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"artifact-diff.d.ts","sourceRoot":"","sources":["../../../../src/session/artifact-diff.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;;AAE3C;;;;;;;GAOG;AAEH,qBAAa,oBAAqB,SAAQ,yBAGvC;CAAG;AAEN,yBAAiB,oBAAoB,CAAC,CAAC;IACrC,KAAY,OAAO,GAAG;QACpB,OAAO,EAAE,CACP,SAAS,EAAE;YACT,EAAE,EAAE,QAAQ,CAAC;YACb,WAAW,EAAE,aAAa,CAAC;SAC5B,EAAE,KACA,OAAO,CACV,GAAG,CACD,QAAQ,EACR;YACE,OAAO,EAAE,aAAa,CAAC;YACvB,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CACF,CACF,CAAC;KACH,CAAC;CACH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-handling.d.ts","sourceRoot":"","sources":["../../../../src/session/error-handling.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAE9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAcxC,eAAO,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"error-handling.d.ts","sourceRoot":"","sources":["../../../../src/session/error-handling.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAE9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAcxC,eAAO,MAAM,UAAU,QAAS,OAAO,CAAC,OAAO,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAoB1B,CAAC"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import * as Effect from 'effect/Effect';
|
|
2
|
+
import { type FunctionNotFoundError, type Operation, type OperationRegistry } from '@dxos/compute';
|
|
3
|
+
import { type Database } from '@dxos/echo';
|
|
4
|
+
import type { ObjectNotFoundError } from '@dxos/echo/Err';
|
|
2
5
|
import { Message } from '@dxos/types';
|
|
3
|
-
import { type
|
|
6
|
+
import { type AiRequestRunError, type AiRequestRunProps } from './request';
|
|
4
7
|
/**
|
|
5
8
|
* Formats the system prompt.
|
|
6
9
|
*/
|
|
7
|
-
export declare const formatSystemPrompt: ({ system, blueprints, objects, }: Pick<
|
|
10
|
+
export declare const formatSystemPrompt: ({ system, blueprints, objects, }: Pick<AiRequestRunProps, 'system' | 'blueprints' | 'objects'>) => Effect.Effect<string, FunctionNotFoundError | ObjectNotFoundError, Database.Service | OperationRegistry.Service | Operation.Service>;
|
|
8
11
|
/**
|
|
9
12
|
* Formats the user prompt.
|
|
10
13
|
*/
|
|
11
|
-
export declare const formatUserPrompt: ({ prompt, history, }: Pick<
|
|
14
|
+
export declare const formatUserPrompt: ({ prompt, history, }: Pick<AiRequestRunProps, 'prompt' | 'history'>) => Effect.Effect<Message.Message, AiRequestRunError>;
|
|
12
15
|
//# sourceMappingURL=format.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../src/session/format.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../src/session/format.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAAY,MAAM,eAAe,CAAC;AAC7G,OAAO,EAAE,KAAK,QAAQ,EAAO,MAAM,YAAY,CAAC;AAEhD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAG1D,OAAO,EAAqB,OAAO,EAAE,MAAM,aAAa,CAAC;AAKzD,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE3E;;GAEG;AAEH,eAAO,MAAM,kBAAkB,qCAI5B,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS,CAAC,KAAG,MAAM,CAAC,MAAM,CAC7E,MAAM,EACN,qBAAqB,GAAG,mBAAmB,EAC3C,QAAQ,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAuClB,CAAC;AAEjD;;GAEG;AAGH,eAAO,MAAM,gBAAgB,yBAG1B,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,SAAS,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAoCrD,CAAC"}
|
|
@@ -1,23 +1,15 @@
|
|
|
1
1
|
import type * as AiError from '@effect/ai/AiError';
|
|
2
2
|
import * as LanguageModel from '@effect/ai/LanguageModel';
|
|
3
|
-
import type * as Tool from '@effect/ai/Tool';
|
|
4
|
-
import type * as Toolkit from '@effect/ai/Toolkit';
|
|
5
3
|
import * as Effect from 'effect/Effect';
|
|
6
|
-
import { type AiToolNotFoundError, type PromptPreprocessingError, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
|
|
7
|
-
import { type Blueprint } from '@dxos/
|
|
8
|
-
import { Obj } from '@dxos/echo';
|
|
9
|
-
import {
|
|
10
|
-
import { Message } from '@dxos/types';
|
|
4
|
+
import { type AiToolNotFoundError, type OpaqueToolkit, type PromptPreprocessingError, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
|
|
5
|
+
import { type Blueprint, Trace, Operation, OperationRegistry } from '@dxos/compute';
|
|
6
|
+
import { Database, Obj } from '@dxos/echo';
|
|
7
|
+
import { ContentBlock, Message } from '@dxos/types';
|
|
11
8
|
import { type AiAssistantError } from '../errors';
|
|
12
9
|
import { GenerationObserver } from './observer';
|
|
13
|
-
export type
|
|
14
|
-
export type
|
|
15
|
-
|
|
16
|
-
* @deprecated Retained for backward compatibility with tool handlers that use TracingService.emitStatus().
|
|
17
|
-
* New code should use Trace.TraceService instead.
|
|
18
|
-
*/
|
|
19
|
-
| TracingService;
|
|
20
|
-
export type AiSessionOptions = {
|
|
10
|
+
export type AiRequestRunError = AiError.AiError | PromptPreprocessingError | AiToolNotFoundError | AiAssistantError;
|
|
11
|
+
export type AiRequestRunRequirements = LanguageModel.LanguageModel | ToolExecutionService | ToolResolverService | Database.Service | Operation.Service | OperationRegistry.Service | Trace.TraceService;
|
|
12
|
+
export type AiRequestOptions = {
|
|
21
13
|
/**
|
|
22
14
|
* Summarize before executing the prompt if the existing history exceeds this threshold.
|
|
23
15
|
*/
|
|
@@ -29,26 +21,26 @@ export type AiSessionOptions = {
|
|
|
29
21
|
*/
|
|
30
22
|
onOutput?: (message: Message.Message) => Effect.Effect<void, never, never>;
|
|
31
23
|
};
|
|
32
|
-
export type
|
|
33
|
-
prompt: string;
|
|
24
|
+
export type AiRequestRunProps<R = never> = {
|
|
25
|
+
prompt: string | ContentBlock.Any[];
|
|
34
26
|
system?: string;
|
|
35
27
|
history?: Message.Message[];
|
|
36
28
|
objects?: Obj.Unknown[];
|
|
37
29
|
blueprints?: readonly Blueprint.Blueprint[];
|
|
38
|
-
toolkit?:
|
|
30
|
+
toolkit?: OpaqueToolkit.OpaqueToolkit<R>;
|
|
39
31
|
};
|
|
40
|
-
export type
|
|
41
|
-
prompt: string;
|
|
32
|
+
export type AiRequestBeginProps = {
|
|
33
|
+
prompt: string | ContentBlock.Any[];
|
|
42
34
|
system?: string;
|
|
43
35
|
history?: Message.Message[];
|
|
44
36
|
objects?: Obj.Unknown[];
|
|
45
37
|
blueprints?: readonly Blueprint.Blueprint[];
|
|
46
38
|
};
|
|
47
|
-
export type
|
|
39
|
+
export type AiRequestTurnProps<R = never> = {
|
|
48
40
|
system: string;
|
|
49
|
-
toolkit?:
|
|
41
|
+
toolkit?: OpaqueToolkit.OpaqueToolkit<R>;
|
|
50
42
|
};
|
|
51
|
-
export type
|
|
43
|
+
export type AiRequestTurnResult = {
|
|
52
44
|
messages: Message.Message[];
|
|
53
45
|
done: boolean;
|
|
54
46
|
};
|
|
@@ -62,7 +54,7 @@ export type AiSessionTurnResult = {
|
|
|
62
54
|
* Could be run locally in the app or remotely.
|
|
63
55
|
* Could be personal or shared.
|
|
64
56
|
*/
|
|
65
|
-
export declare class
|
|
57
|
+
export declare class AiRequest {
|
|
66
58
|
private readonly _options;
|
|
67
59
|
/** Prevents concurrent execution of session. */
|
|
68
60
|
private readonly _semaphore;
|
|
@@ -75,17 +67,17 @@ export declare class AiSession {
|
|
|
75
67
|
private _started;
|
|
76
68
|
private _ended;
|
|
77
69
|
private _toolCalls;
|
|
78
|
-
constructor(_options?:
|
|
70
|
+
constructor(_options?: AiRequestOptions);
|
|
79
71
|
get duration(): number;
|
|
80
72
|
get toolCalls(): number;
|
|
81
73
|
get pending(): readonly Message.Message[];
|
|
82
74
|
private _submitMessage;
|
|
83
75
|
getToolCalls: () => {
|
|
84
76
|
block: {
|
|
85
|
-
readonly name: string;
|
|
86
77
|
readonly _tag: "toolCall";
|
|
87
78
|
readonly pending?: boolean | undefined;
|
|
88
79
|
readonly toolCallId: string;
|
|
80
|
+
readonly name: string;
|
|
89
81
|
readonly input: string;
|
|
90
82
|
readonly providerExecuted: boolean;
|
|
91
83
|
};
|
|
@@ -95,18 +87,18 @@ export declare class AiSession {
|
|
|
95
87
|
* Initialize a session: set up history, perform summarization if needed, and submit the user prompt.
|
|
96
88
|
* Must be called before `runTurn()`.
|
|
97
89
|
*/
|
|
98
|
-
begin: ({ prompt, system, history, blueprints, objects, }:
|
|
90
|
+
begin: ({ prompt, system, history, blueprints, objects, }: AiRequestBeginProps) => Effect.Effect<void, AiRequestRunError, AiRequestRunRequirements>;
|
|
99
91
|
/**
|
|
100
92
|
* Execute a single turn: one LLM generation followed by tool execution.
|
|
101
93
|
* The toolkit and system prompt can be updated between turns to reflect context changes (e.g. dynamically enabled blueprints).
|
|
102
94
|
*/
|
|
103
|
-
runAgentTurn: <
|
|
104
|
-
runTools: <
|
|
105
|
-
toolkit?:
|
|
106
|
-
}) => Effect.Effect<void,
|
|
95
|
+
runAgentTurn: <const R = never>({ system, toolkit: opaqueToolkit, }: AiRequestTurnProps<R>) => Effect.Effect<AiRequestTurnResult, AiRequestRunError, AiRequestRunRequirements | R>;
|
|
96
|
+
runTools: <const R = never>({ toolkit: opaqueToolkit, }: {
|
|
97
|
+
toolkit?: OpaqueToolkit.OpaqueToolkit<R>;
|
|
98
|
+
}) => Effect.Effect<void, AiRequestRunError, AiRequestRunRequirements | R>;
|
|
107
99
|
/**
|
|
108
100
|
* Run a full conversation turn loop. Equivalent to calling `begin()` then `runTurn()` in a loop.
|
|
109
101
|
*/
|
|
110
|
-
run: <
|
|
102
|
+
run: <const R = never>({ prompt, system: systemTemplate, history, objects, blueprints, toolkit, }: AiRequestRunProps<R>) => Effect.Effect<Message.Message[], AiRequestRunError, AiRequestRunRequirements | R>;
|
|
111
103
|
}
|
|
112
|
-
//# sourceMappingURL=
|
|
104
|
+
//# sourceMappingURL=request.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../src/session/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,16 @@
|
|
|
1
|
-
import type * as Tool from '@effect/ai/Tool';
|
|
2
|
-
import * as Toolkit from '@effect/ai/Toolkit';
|
|
3
1
|
import * as Effect from 'effect/Effect';
|
|
4
|
-
import { type AiToolNotFoundError,
|
|
5
|
-
import { type Blueprint } from '@dxos/
|
|
2
|
+
import { type AiToolNotFoundError, OpaqueToolkit, ToolExecutionService, ToolResolverService } from '@dxos/ai';
|
|
3
|
+
import { type Blueprint } from '@dxos/compute';
|
|
6
4
|
export type CreateToolkitProps = {
|
|
7
|
-
toolkit?:
|
|
5
|
+
toolkit?: OpaqueToolkit.Any;
|
|
8
6
|
blueprints?: readonly Blueprint.Blueprint[];
|
|
9
7
|
/**
|
|
10
8
|
* Self-contained with handlers toolkits.
|
|
11
9
|
*/
|
|
12
|
-
|
|
10
|
+
opaqueToolkits?: readonly OpaqueToolkit.Any[];
|
|
13
11
|
};
|
|
14
12
|
/**
|
|
15
13
|
* Build a combined toolkit from the blueprint tools and the provided toolkit.
|
|
16
14
|
*/
|
|
17
|
-
export declare const createToolkit: ({ toolkit: toolkitProp, blueprints,
|
|
15
|
+
export declare const createToolkit: ({ toolkit: toolkitProp, blueprints, opaqueToolkits, }: CreateToolkitProps) => Effect.Effect<OpaqueToolkit.OpaqueToolkit, AiToolNotFoundError, ToolResolverService | ToolExecutionService>;
|
|
18
16
|
//# sourceMappingURL=toolkit.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolkit.d.ts","sourceRoot":"","sources":["../../../../src/session/toolkit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"toolkit.d.ts","sourceRoot":"","sources":["../../../../src/session/toolkit.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,KAAK,mBAAmB,EAAE,aAAa,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC9G,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAG/C,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,SAAS,CAAC,SAAS,EAAE,CAAC;IAC5C;;OAEG;IACH,cAAc,CAAC,EAAE,SAAS,aAAa,CAAC,GAAG,EAAE,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,0DAIvB,kBAAkB,KAAG,MAAM,CAAC,MAAM,CACnC,aAAa,CAAC,aAAa,EAC3B,mBAAmB,EACnB,mBAAmB,GAAG,oBAAoB,CAeuE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../../../src/templates/system.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../../../src/templates/system.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAKzC;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,GAAG;IACpD,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,aAAa,OAAO,CAAC,mBAAmB,CAAC,WAMrE,CAAC;AAOJ,eAAO,MAAM,SAAS;IACpB,MAAM;CAIP,CAAC"}
|