@dxos/assistant 0.8.4-main.fd6878d → 0.8.4-main.fffef41

package/src/session/toolkit.ts

@@ -0,0 +1,48 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import type * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
+import type * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+
+import { type AiToolNotFoundError, ToolExecutionService, type ToolId, ToolResolverService } from '@dxos/ai';
+import { type Blueprint } from '@dxos/blueprints';
+import { isTruthy } from '@dxos/util';
+
+export type ToolkitParams<Tools extends Record<string, Tool.Any>> = {
+  toolkit?: Toolkit.Toolkit<Tools>;
+  toolIds?: ToolId[];
+  blueprints?: Blueprint.Blueprint[];
+};
+
+/**
+ * Build a combined toolkit from the blueprint tools and the provided toolkit.
+ */
+export const createToolkit = <Tools extends Record<string, Tool.Any> = {}>({
+  toolkit: toolkitParam,
+  toolIds = [],
+  blueprints = [],
+}: ToolkitParams<Tools>): Effect.Effect<
+  Toolkit.WithHandler<any>,
+  AiToolNotFoundError,
+  ToolResolverService | ToolExecutionService | Tool.HandlersFor<Tools>
+> =>
+  Effect.gen(function* () {
+    const blueprintToolkit = yield* ToolResolverService.resolveToolkit([
+      ...blueprints.flatMap(({ tools }) => tools),
+      ...toolIds,
+    ]);
+
+    const blueprintToolkitHandler: Context.Context<Tool.HandlersFor<any>> = yield* blueprintToolkit.toContext(
+      ToolExecutionService.handlersFor(blueprintToolkit),
+    );
+
+    const toolkit = Toolkit.merge(...[toolkitParam, blueprintToolkit].filter(isTruthy));
+    return yield* toolkit.pipe(Effect.provide(blueprintToolkitHandler)) as any as Effect.Effect<
+      Toolkit.WithHandler<any>,
+      never,
+      Tool.HandlersFor<Tools>
+    >;
+  });

package/src/session/version-pin.ts

@@ -2,12 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
-import { type ObjectVersion } from '@dxos/echo-db';
-import { getVersion } from '@dxos/echo-db';
-import { type AnyEchoObject, ObjectId } from '@dxos/echo-schema';
-import { type ContentBlock } from '@dxos/schema';
+import { type AnyEchoObject, ObjectId } from '@dxos/echo/internal';
+import { type ObjectVersion, getVersion } from '@dxos/echo-db';
+import { type ContentBlock } from '@dxos/types';
 
 // TODO(dmaretskyi): Extract.
 const ObjectVersionSchema = Schema.Unknown as Schema.Schema<ObjectVersion>;

package/src/templates/{format.tpl → instructions/format.tpl}

@@ -23,6 +23,7 @@ The <typename> element is the type of the object.
 It is very important to respond in the correct format.
 You response must be valid Markdown.
 In some cases you should respond with well-formed XML tags along with the content.
+Code snippets should use 2-space indents.
 
 {{#if cot}}
 Before responding, explain your reasoning and include your detailed chain-of-thought enclosed in a <cot> tag.
@@ -42,8 +43,9 @@ You can reply with a block reference for objects if you have the DXN. For exampl
 
 ### Suggestions
 
-Each suggestion must in the form of a proposed action enclosed in a <suggest> tag.
-Example: <suggest>Show on a map</suggest>
+Each suggestion must in the form of a proposed action enclosed in a <suggestion> tag.
+Example: <suggestion>Show on a map</suggestion>
+Do not use bullets when listing suggestions.
 
 ### Multiple choice questions
 
@@ -53,3 +55,7 @@ Example: <select><option>Yes</option><option>No</option></select>
 ## Toolkit
 
 If the user asks for a list of tools, then just emit a single self-closing <toolkit/> tag instead of listing the tools.
+
+## Context
+
+The current date and time is {{DATETIME}}.

package/src/templates/{system.tpl → instructions/system.tpl}

@@ -1,17 +1,15 @@
 {{! System Prompt }}
 
-You are a helpful assistant called Kai. 
-Your name is Kai and you are powered by different language models.
-You were created by DXOS and operate in Composer and on the DXOS EDGE network.
-In your initial greeting state your name and make some suggestions based on the current context objects.
+- You are a helpful assistant called Kai. 
+- Your name is Kai and you are powered by different language models.
+- You were created by DXOS and operate inside of Composer and on the DXOS EDGE network.
+- In your initial greeting state your name and make some suggestions based on the current context objects.
+- You are an advanced AI assistant capable of creating and managing artifacts from provided data and tools.
+- Your task is to process user commands and questions and decide how best to respond.
+- In general be concise and direct.
+- Follow all instructions carefully.
 
-You are an advanced AI assistant capable of creating and managing artifacts from provided data and tools.
-Your task is to process user commands and questions and decide how best to respond.
-In general be concise and direct.
-
-Follow these guidelines carefully:
-
-Include the following steps:
+## Planning
 
 - Analyze the structure and type of the content in the user's message.
 - Determine if you complete the task using the available blueprint definitions?
@@ -27,7 +25,7 @@ Include the following steps:
 - Call the show tool to show the artifact to the user.
 - Your reasoning must include: whether to use artifacts or not, to create one or query, whether to show the artifact to the user, and how to structure the response.
 
-# Blueprints
+## Blueprints and Artifacts
 
 - Determine if the interaction involves an artifact. Prefer artifacts for tables, lists, spreadsheets, kanbans, games, images, and other structured data.
 - Determine if the user is explicitly talking about creating a new artifact, or wants to use an existing artifact.
@@ -35,13 +33,16 @@ Include the following steps:
 - If you decide to create an artifact, call the associated tool to create the artifact.
 - Artifacts are stored in the database. Tools are used to create and query artifacts.
 - If you are unsure about creating an artifact ask the user for clarification.
-
 - Artifacts are mutable objects that can change over the course of the conversation.
 - Always re-query the artifact using the tool (like query or inspect) to get the latest state of the artifact before answering the user.
 - You must never generate the id of the artifact; only recall the ids that are already in the history.
 - Artifacts are created by requiring the specific artifact using the require_artifact tool and creating it by calling the associated tool.
-
 - You can add suggested actions at the end of your response.
 - Suggested actions should be very concise and start with a verb and be phrased as a command to an agent -- not a question to the user.
 - Suggested actions must be in the form of a user instruction that you can follow.
 - Suggested actions could include actions that create artifacts.
+- After creating an artifact use a tool to add it to the chat context.
+
+## Context
+
+Today is {{DATETIME}}.

package/src/templates/system.ts

@@ -2,31 +2,40 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Template } from '@dxos/blueprints';
+import defaultsDeep from 'lodash.defaultsdeep';
 
-import FORMAT from './format.tpl?raw';
-import SYSTEM from './system.tpl?raw';
+import { type ModelCapabilities } from '@dxos/ai';
+import { Template } from '@dxos/blueprints';
 
-type PromptOptions = {
-  /**
-   * Emit chain-of-thought inside <cot> tag.
-   * Should be `false` for models with built-in reasoning: Claude, deepseek, o1.
-   */
-  cot?: boolean;
+import FORMAT from './instructions/format.tpl?raw';
+import SYSTEM from './instructions/system.tpl?raw';
 
-  /**
-   * Whether to include suggestions in the prompt.
-   */
-  suggestions?: boolean;
+/**
+ * System template variables.
+ */
+export type SystemPromptOptions = ModelCapabilities & {
+  DATETIME: string;
 };
 
 /**
  * Base system prompt.
  * NOTE: This contains protocol instructions that can not be dynamically edited.
  */
-export const createSystemPrompt = (options: PromptOptions) => Template.process<PromptOptions>(FORMAT, options);
+export const createSystemPrompt = (options: Partial<SystemPromptOptions> = {}) =>
+  Template.process<SystemPromptOptions>(
+    FORMAT,
+    defaultsDeep(options, {
+      DATETIME: new Date().toISOString(),
+    }),
+  );
 
 export const templates = {
-  // Editable system prompt.
-  system: Template.make({ source: SYSTEM }),
+  /** Editable system prompt.*/
+  system: Template.make({
+    /**
+     * NOTE: We are forbidden from accessing randomness at model level in cloudflare, so we have to have pre-generated ids.
+     */
+    id: '01K2J2FZWH39F55CS7B26GP1Q3',
+    source: SYSTEM,
+  }),
 };

package/src/{types.ts → types/artifact.ts}

@@ -2,9 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import type * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
-import { type ObjectId } from '@dxos/echo-schema';
+import { type ObjectNotFoundError, type Type } from '@dxos/echo';
+import { type ObjectId } from '@dxos/echo/internal';
+import { DatabaseService } from '@dxos/echo-db';
 import { DXN, LOCAL_SPACE_TAG, type SpaceId } from '@dxos/keys';
 import { trim } from '@dxos/util';
 
@@ -17,10 +20,15 @@ export const createArtifactElement = (id: ObjectId) => `<artifact id=${id} />`;
  * A model-friendly way to reference an object.
  * Supports vairous formats that will be normalized to a DXN.
  */
-// TODO(burdon): Rename ObjectReference?
+// TODO(burdon): Rename RefFromLLM?
 export const ArtifactId: Schema.Schema<string> & {
   toDXN: (reference: ArtifactId, owningSpaceId?: SpaceId) => DXN;
+  resolve: <S extends Type.Obj.Any | Type.Relation.Any>(
+    schema: S,
+    ref: ArtifactId,
+  ) => Effect.Effect<Schema.Schema.Type<S>, ObjectNotFoundError, DatabaseService>;
 } = class extends Schema.String.annotations({
+  // TODO(dmaretskyi): This section gets overriden.
   description: trim`
     The ID of the referenced object. Formats accepted:
     - DXN (dxn:echo:@:XXXXX). DXNs can be prepended with an @ symbol for compatibility with in-text references.
@@ -47,6 +55,17 @@ export const ArtifactId: Schema.Schema<string> & {
       throw new Error(`Unable to parse object reference: ${reference}`);
     }
   }
+
+  /**
+   * Resolves an artifact ID to an object.
+   */
+  static resolve<S extends Type.Obj.Any | Type.Relation.Any>(
+    schema: S,
+    ref: ArtifactId,
+  ): Effect.Effect<Schema.Schema.Type<S>, ObjectNotFoundError, DatabaseService> {
+    const dxn = ArtifactId.toDXN(ref);
+    return DatabaseService.resolve(dxn, schema);
+  }
 };
 
 export type ArtifactId = Schema.Schema.Type<typeof ArtifactId>;

package/src/types/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './artifact';

package/dist/lib/browser/chunk-6WRGDEMH.mjs

@@ -1,89 +0,0 @@
-// src/extraction/extraction-ner-function/named-entity-recognition.ts
-import { pipeline } from "@xenova/transformers";
-import { log } from "@dxos/log";
-var __dxlog_file = "/__w/dxos/dxos/packages/core/assistant/src/extraction/extraction-ner-function/named-entity-recognition.ts";
-var _ner;
-var getNer = () => {
-  if (!_ner) {
-    _ner = pipeline("ner", "Xenova/bert-base-NER").then((ner) => {
-      log.info("NER model is ready", void 0, {
-        F: __dxlog_file,
-        L: 23,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      return ner;
-    });
-  }
-  return _ner;
-};
-var extractFullEntities = async (text) => {
-  const ner = await getNer();
-  const entities = await ner(text);
-  const tokenGroups = createTokenGroups(entities);
-  const combinedEntities = tokenGroups.map(combineNerTokens);
-  return combinedEntities;
-};
-var createTokenGroups = (tokens) => {
-  const tokenGroups = [];
-  const canBeCombined = (prevToken, currentToken) => {
-    const [currentState, currentEntity] = currentToken.entity.split("-");
-    const [prevState, prevEntity] = prevToken.entity.split("-");
-    if (prevEntity !== currentEntity) {
-      return false;
-    }
-    if (prevState === "O") {
-      return false;
-    }
-    if (currentState === "I") {
-      return true;
-    }
-    if ((prevState === "B" || prevState === "I") && currentState === "B") {
-      return currentToken.word.startsWith("#");
-    }
-    return false;
-  };
-  for (const token of tokens) {
-    if (tokenGroups.length === 0) {
-      tokenGroups.push([
-        token
-      ]);
-      continue;
-    }
-    const lastTokenGroup = tokenGroups.at(-1);
-    if (canBeCombined(lastTokenGroup.at(-1), token)) {
-      lastTokenGroup.push(token);
-      continue;
-    }
-    tokenGroups.push([
-      token
-    ]);
-  }
-  return tokenGroups;
-};
-var combineNerTokens = (group) => {
-  const combinedToken = {
-    entity: group.at(0).entity.split("-")[1],
-    score: group.reduce((acc, token) => acc + token.score, 0) / group.length,
-    index: group.at(0).index,
-    word: group.at(0).word,
-    start: group.at(0).start,
-    end: group.at(-1).end
-  };
-  for (const token of group.slice(1)) {
-    if (token.word.startsWith("#")) {
-      combinedToken.word += token.word.replace(/^#+/, "");
-    } else {
-      combinedToken.word += " " + token.word;
-    }
-  }
-  return combinedToken;
-};
-
-export {
-  getNer,
-  extractFullEntities,
-  createTokenGroups,
-  combineNerTokens
-};
-//# sourceMappingURL=chunk-6WRGDEMH.mjs.map

package/dist/lib/browser/chunk-6WRGDEMH.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/extraction/extraction-ner-function/named-entity-recognition.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport {\n  type TokenClassificationOutput,\n  type TokenClassificationPipelineType,\n  type TokenClassificationSingle,\n  pipeline,\n} from '@xenova/transformers';\n\nimport { log } from '@dxos/log';\n\nlet _ner: Promise<TokenClassificationPipelineType>;\n/**\n * Named Entity Recognition pipeline.\n * Initializes the pipeline on first call.\n * @returns The singleton promise that resolves to a token classification pipeline.\n */\nexport const getNer = () => {\n  if (!_ner) {\n    _ner = pipeline('ner', 'Xenova/bert-base-NER').then((ner) => {\n      log.info('NER model is ready');\n      return ner;\n    });\n  }\n  return _ner;\n};\n\n/**\n * Extracts entities from text using the named entity recognition pipeline and does simple grouping of tokens.\n */\nexport const extractFullEntities = async (text: string): Promise<TokenClassificationSingle[]> => {\n  const ner = await getNer();\n  const entities = (await ner(text)) as TokenClassificationOutput;\n  const tokenGroups = createTokenGroups(entities);\n  const combinedEntities = tokenGroups.map(combineNerTokens);\n  return combinedEntities;\n};\n\nexport const createTokenGroups = (tokens: TokenClassificationSingle[]): TokenClassificationSingle[][] => {\n  const tokenGroups: TokenClassificationSingle[][] = [];\n\n  const canBeCombined = (prevToken: TokenClassificationSingle, currentToken: TokenClassificationSingle) => {\n    const [currentState, currentEntity] = currentToken.entity.split('-'); // B, I, O\n    const [prevState, prevEntity] = prevToken.entity.split('-'); // B, I, O\n    if (prevEntity !== currentEntity) {\n      return false;\n    }\n    if (prevState === 'O') {\n      return false;\n    }\n    if (currentState === 'I') {\n      return true;\n    }\n    if ((prevState === 'B' || prevState === 'I') && currentState === 'B') {\n      return currentToken.word.startsWith('#');\n    }\n    return false;\n  };\n\n  for (const token of tokens) {\n    if (tokenGroups.length === 0) {\n      tokenGroups.push([token]);\n      continue;\n    }\n    const lastTokenGroup = tokenGroups.at(-1)!;\n    if (canBeCombined(lastTokenGroup.at(-1)!, token)) {\n      lastTokenGroup.push(token);\n      continue;\n    }\n    tokenGroups.push([token]);\n  }\n\n  return tokenGroups;\n};\n\nexport const combineNerTokens = (group: TokenClassificationSingle[]): TokenClassificationSingle => {\n  const combinedToken: TokenClassificationSingle = {\n    entity: group.at(0)!.entity.split('-')[1],\n    score: group.reduce((acc, token) => acc + token.score, 0) / group.length,\n    index: group.at(0)!.index,\n    word: group.at(0)!.word,\n    start: group.at(0)!.start,\n    end: group.at(-1)!.end,\n  };\n\n  for (const token of group.slice(1)) {\n    if (token.word.startsWith('#')) {\n      combinedToken.word += token.word.replace(/^#+/, '');\n    } else {\n      combinedToken.word += ' ' + token.word;\n    }\n  }\n\n  return combinedToken;\n};\n"],
-  "mappings": ";AAIA,SAIEA,gBACK;AAEP,SAASC,WAAW;;AAEpB,IAAIC;AAMG,IAAMC,SAAS,MAAA;AACpB,MAAI,CAACD,MAAM;AACTA,WAAOF,SAAS,OAAO,sBAAA,EAAwBI,KAAK,CAACC,QAAAA;AACnDJ,UAAIK,KAAK,sBAAA,QAAA;;;;;;AACT,aAAOD;IACT,CAAA;EACF;AACA,SAAOH;AACT;AAKO,IAAMK,sBAAsB,OAAOC,SAAAA;AACxC,QAAMH,MAAM,MAAMF,OAAAA;AAClB,QAAMM,WAAY,MAAMJ,IAAIG,IAAAA;AAC5B,QAAME,cAAcC,kBAAkBF,QAAAA;AACtC,QAAMG,mBAAmBF,YAAYG,IAAIC,gBAAAA;AACzC,SAAOF;AACT;AAEO,IAAMD,oBAAoB,CAACI,WAAAA;AAChC,QAAML,cAA6C,CAAA;AAEnD,QAAMM,gBAAgB,CAACC,WAAsCC,iBAAAA;AAC3D,UAAM,CAACC,cAAcC,aAAAA,IAAiBF,aAAaG,OAAOC,MAAM,GAAA;AAChE,UAAM,CAACC,WAAWC,UAAAA,IAAcP,UAAUI,OAAOC,MAAM,GAAA;AACvD,QAAIE,eAAeJ,eAAe;AAChC,aAAO;IACT;AACA,QAAIG,cAAc,KAAK;AACrB,aAAO;IACT;AACA,QAAIJ,iBAAiB,KAAK;AACxB,aAAO;IACT;AACA,SAAKI,cAAc,OAAOA,cAAc,QAAQJ,iBAAiB,KAAK;AACpE,aAAOD,aAAaO,KAAKC,WAAW,GAAA;IACtC;AACA,WAAO;EACT;AAEA,aAAWC,SAASZ,QAAQ;AAC1B,QAAIL,YAAYkB,WAAW,GAAG;AAC5BlB,kBAAYmB,KAAK;QAACF;OAAM;AACxB;IACF;AACA,UAAMG,iBAAiBpB,YAAYqB,GAAG,EAAC;AACvC,QAAIf,cAAcc,eAAeC,GAAG,EAAC,GAAKJ,KAAAA,GAAQ;AAChDG,qBAAeD,KAAKF,KAAAA;AACpB;IACF;AACAjB,gBAAYmB,KAAK;MAACF;KAAM;EAC1B;AAEA,SAAOjB;AACT;AAEO,IAAMI,mBAAmB,CAACkB,UAAAA;AAC/B,QAAMC,gBAA2C;IAC/CZ,QAAQW,MAAMD,GAAG,CAAA,EAAIV,OAAOC,MAAM,GAAA,EAAK,CAAA;IACvCY,OAAOF,MAAMG,OAAO,CAACC,KAAKT,UAAUS,MAAMT,MAAMO,OAAO,CAAA,IAAKF,MAAMJ;IAClES,OAAOL,MAAMD,GAAG,CAAA,EAAIM;IACpBZ,MAAMO,MAAMD,GAAG,CAAA,EAAIN;IACnBa,OAAON,MAAMD,GAAG,CAAA,EAAIO;IACpBC,KAAKP,MAAMD,GAAG,EAAC,EAAIQ;EACrB;AAEA,aAAWZ,SAASK,MAAMQ,MAAM,CAAA,GAAI;AAClC,QAAIb,MAAMF,KAAKC,WAAW,GAAA,GAAM;AAC9BO,oBAAcR,QAAQE,MAAMF,KAAKgB,QAAQ,OAAO,EAAA;IAClD,OAAO;AACLR,oBAAcR,QAAQ,MAAME,MAAMF;IACpC;EACF;AAEA,SAAOQ;AACT;",
-  "names": ["pipeline", "log", "_ner", "getNer", "then", "ner", "info", "extractFullEntities", "text", "entities", "tokenGroups", "createTokenGroups", "combinedEntities", "map", "combineNerTokens", "tokens", "canBeCombined", "prevToken", "currentToken", "currentState", "currentEntity", "entity", "split", "prevState", "prevEntity", "word", "startsWith", "token", "length", "push", "lastTokenGroup", "at", "group", "combinedToken", "score", "reduce", "acc", "index", "start", "end", "slice", "replace"]
-}