goblin-agents 1.0.5 → 2.1.1

package/config.js

@@ -7,28 +7,4 @@ module.exports = [
     message: 'Agents version',
     default: 2,
   },
-  {
-    type: 'input',
-    name: 'defaultProfile',
-    message: 'Agents default profile',
-    default: null,
-  },
-  {
-    type: 'input',
-    name: 'defaultSettings',
-    message: 'Agents default setting',
-    default: null,
-  },
-  {
-    type: 'input',
-    name: 'profiles',
-    message: 'Agents profiles for overriding settings',
-    default: {},
-  },
-  {
-    type: 'input',
-    name: 'settings',
-    message: 'Settings by name',
-    default: {},
-  },
 ];

package/lib/llm/aiAgent.js

@@ -13,7 +13,7 @@ const {
 } = require('xcraft-core-stones');
 const {getMutex} = require('xcraft-core-utils/lib/locks.js');
 const LLMProvider = require('./providers.js');
-const {OCR_SYSTEM_PROMPT, getPDFImages} = require('./utils.js');
+const {OCR_SYSTEM_PROMPT, getPDFImages, splitThinkTags} = require('./utils.js');
 
 class MessageShape {
   role = enumeration('assistant', 'user', 'tool');
@@ -98,6 +98,48 @@ function vectorToSqlLiteral(vec) {
   return hex;
 }
 
+/**
+ * Convertit un vecteur float32 normalisé [-1,1]
+ * en int8 [-128,127] et retourne une chaîne hex
+ * pour stockage en SQL.
+ *
+ * @param {Array|Float32Array} vec - vecteur normalisé
+ * @returns {string} - représentation hex
+ */
+function vectorToSqlLiteralInt8(vec) {
+  const dimensions = vec.length;
+  const qvec = new Int8Array(dimensions);
+
+  // Quantization uniforme
+  const step = 2.0 / 255.0;
+  for (let i = 0; i < dimensions; i++) {
+    qvec[i] = Math.round((vec[i] + 1.0) / step - 128);
+  }
+
+  // Vue mémoire en octets non signés
+  const view = new Uint8Array(qvec.buffer, qvec.byteOffset, qvec.byteLength);
+
+  // Conversion en hex
+  let hex = '';
+  for (let i = 0; i < view.length; i++) {
+    const byte = view[i];
+    hex += byte < 16 ? '0' + byte.toString(16) : byte.toString(16);
+  }
+
+  return hex;
+}
+
+function cleanText(text) {
+  if (typeof text !== 'string') {
+    return text;
+  }
+  const {thinks, cleanText} = splitThinkTags(text);
+  for (const think of thinks) {
+    this.log.dbg(`🧐 ${think}`);
+  }
+  return cleanText;
+}
+
 class AiAgentShape {
   id = id('aiAgent');
   version = number;
@@ -114,6 +156,8 @@ class AiAgentShape {
   tools = option(array(object));
   toolServiceId = option(string);
   usability = enumeration('disabled', 'experimental', 'stable', 'deprecated');
+  reasoning = option(boolean);
+  vectorQuality = option(enumeration('f32', 'int8'));
   meta = MetaShape;
 }
 
@@ -123,15 +167,17 @@ class AiAgentState extends Elf.Sculpt(AiAgentShape) {}
 const defaultValues = {
   name: 'agent',
   role: 'assistant',
-  prompt: '',
-  provider: 'ollama',
-  model: 'mistral-small',
+  provider: 'open-ai',
+  model: '',
   options: {},
   host: 'http://127.0.0.1:11434',
   headers: {},
   format: null,
+  toolServiceId: null,
   tools: null,
+  reasoning: false,
   usability: 'disabled',
+  vectorQuality: 'f32',
 };
 
 class AiAgentLogic extends Elf.Archetype {
@@ -149,8 +195,10 @@ class AiAgentLogic extends Elf.Archetype {
     host: defaultValues.host,
     headers: defaultValues.headers,
     format: defaultValues.format,
+    toolServiceId: defaultValues.toolServiceId,
     tools: defaultValues.tools,
     usability: defaultValues.usability,
+    vectorQuality: 'f32',
     meta: {
       status: 'published',
     },
@@ -240,6 +288,11 @@ class AiAgentLogic extends Elf.Archetype {
     state._state.set(path, newValue);
   }
 
+  publish() {
+    const {state} = this;
+    state.meta.status = 'published';
+  }
+
   trash() {
     const {state} = this;
     state.meta.status = 'trashed';
@@ -252,7 +305,7 @@ class AiAgent extends Elf {
 
   _provider;
   _conf;
-  _batchLock = getMutex;
+  _mutex = getMutex;
 
   /**
    * @param {string} id
@@ -300,7 +353,7 @@ class AiAgent extends Elf {
     }
 
     const Instance = LLMProvider.get(this.state.provider);
-    this._provider = new Instance(this.state.host, this.state.headers);
+    this._provider = new Instance(this.state.host, this.state.headers.toJS());
     this._conf = {provider, host, headersStr};
   }
 
@@ -326,20 +379,30 @@ class AiAgent extends Elf {
   }
 
   async gen(prompt) {
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
 
     let options;
     if (this.state.options) {
       options = this.state.options.toJS();
     }
-    return await this._provider.gen({
+    const format = this.state.format
+      ? typeof this.state.format === 'string'
+        ? this.state.format
+        : this.state.format.toJS()
+      : undefined;
+    let res = await this._provider.gen({
       model: this.state.model,
+      reasoning: this.state.reasoning,
       prompt,
       system: this.state.prompt,
-      format: this.state.format?.toJS(),
+      format,
       options,
       stream: false,
     });
+    return cleanText(res);
   }
 
   async reset(contextId, save = false) {
@@ -356,6 +419,9 @@ class AiAgent extends Elf {
   }
 
   async readPDFpages(pdfPath) {
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
 
     const images = await getPDFImages(pdfPath);
@@ -380,6 +446,7 @@ class AiAgent extends Elf {
       ];
       const result = await this._provider.chat({
         model: this.state.model,
+        reasoning: this.state.reasoning,
         messages,
       });
       descriptions.push(result.message.content);
@@ -391,12 +458,20 @@ class AiAgent extends Elf {
     if (!rawText) {
       return null;
     }
+
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
     const vectors = await this._provider.embed({
       model: this.state.model,
       input: rawText,
     });
-    return vectorToSqlLiteral(vectors);
+    let vectorToSql = vectorToSqlLiteral;
+    if (this.state.vectorQuality === 'int8') {
+      vectorToSql = vectorToSqlLiteralInt8;
+    }
+    return vectorToSql(vectors);
   }
 
   async embedInBatch(rawTexts = []) {
@@ -404,30 +479,35 @@ class AiAgent extends Elf {
       return [];
     }
 
-    await this._batchLock.lock(this.id);
-    this.quest.defer(() => this._batchLock.unlock(this.id));
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
 
     await this._loadProvider();
     const res = await this._provider.embedInBatch({
       model: this.state.model,
       input: rawTexts,
     });
-    return res.map((v) => vectorToSqlLiteral(v));
+    let vectorToSql = vectorToSqlLiteral;
+    if (this.state.vectorQuality === 'int8') {
+      vectorToSql = vectorToSqlLiteralInt8;
+    }
+    return res.map((v) => vectorToSql(v));
   }
 
   async set(contextId, messages) {
     this.logic.set(contextId, messages);
   }
 
-  async chat(contextId, question, userDesktopId, sessionId = null) {
+  async chat(contextId, question, userDesktopId) {
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
     const contextMessages = this.state.messages[contextId] || [];
     const messages = [
       {role: 'system', content: this.state.prompt},
       ...Array.from(contextMessages).map((m) => m._state.toJS()), //history
     ];
-    //add new question
-    messages.push({role: 'user', content: question});
 
     let options;
     if (this.state.options) {
@@ -435,39 +515,49 @@ class AiAgent extends Elf {
       options = pState?.options;
     }
 
-    if (!sessionId) {
+    if (question) {
       this.logic.chat(contextId, 'user', question);
-      sessionId = Elf.uuid();
-      this.log.dbg(`🐈 Chat session started : ${sessionId}`);
+      //add new question
+      messages.push({role: 'user', content: question});
     }
 
-    const result = await this._provider.chat({
+    this.log.dbg(`🐈 Chat session started : ${contextId}`);
+
+    const chatCompletionRequest = {
       model: this.state.model,
       messages,
       options,
       format: this.state.format?.toJS(),
       tools: this.state.tools?.toJS(),
-    });
+      reasoning: this.state.reasoning,
+    };
+
+    const result = await this._provider.chat(chatCompletionRequest);
 
     if (this.state.toolServiceId && this.state.tools) {
       const used = await this.callTools(
         contextId,
         result.message,
-        userDesktopId,
-        sessionId
+        userDesktopId
       );
       if (used) {
-        return await this.chat(contextId, question, userDesktopId, sessionId);
+        //leave for a second turn
+        this.log.dbg(`🐈 Chat session ended : ${contextId}`);
+        return true;
       }
     }
 
-    //keep agent response
-    this.logic.chat(contextId, 'assistant', result.message.content);
+    const res = cleanText(result.message.content);
+    if (typeof res === 'string') {
+      //keep agent response
+      this.logic.chat(contextId, 'assistant', cleanText);
+    }
 
-    return result.message.content;
+    this.log.dbg(`🐈 Chat session ended : ${contextId}`);
+    return res;
   }
 
-  async callTools(contextId, message, userDesktopId, sessionId) {
+  async callTools(contextId, message, userDesktopId) {
     const {tool_calls} = message;
     if (!tool_calls || !userDesktopId) {
       return false;
@@ -478,24 +568,34 @@ class AiAgent extends Elf {
         id,
         function: {name},
       } = tool;
+
       let result = '';
+      let toolArguments = {};
+      if (
+        tool.function.arguments &&
+        typeof tool.function.arguments === 'string'
+      ) {
+        toolArguments = JSON.parse(tool.function.arguments);
+      } else if (
+        tool.function.arguments &&
+        typeof tool.function.arguments === 'object'
+      ) {
+        toolArguments = tool.function.arguments;
+      }
       try {
         const payload = {
           id: this.state.toolServiceId,
           desktopId: userDesktopId,
-          ...JSON.parse(tool.function.arguments),
+          contextId,
+          ...toolArguments,
         };
         const toolNamespace = this.state.toolServiceId?.split('@', 1)[0];
         const toolCmd = `${toolNamespace}.${name}`;
-        this.log.dbg(
-          `🔧 Tool call: ${toolCmd}(${JSON.stringify(
-            payload
-          )}) sid: ${sessionId}`
-        );
+        this.log.dbg(`🔧 Tool call: ${toolCmd}(${JSON.stringify(payload)})`);
         result = await this.quest.cmd(toolCmd, payload);
         await this.addToolMessage(contextId, id, name, result);
       } catch (err) {
-        this.log.dbg(`🔧 Tool error : ${err} sid: ${sessionId}`);
+        this.log.dbg(`🔧 Tool error : ${err}`);
       }
     }
     return true;
@@ -509,6 +609,10 @@ class AiAgent extends Elf {
     if (this.state.provider !== 'ollama') {
       throw new Error('Streaming API not impl.');
     }
+
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
 
     const contextMessages = this.state.messages[contextId] || [];
@@ -527,6 +631,7 @@ class AiAgent extends Elf {
     const response = await this._provider.chat({
       model: this.state.model,
       messages,
+      reasoning: this.state.reasoning,
       options,
       stream: true,
     });
@@ -542,6 +647,9 @@ class AiAgent extends Elf {
   }
 
   async resumeExchange(resumePrompt, contextId) {
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
     const contextMessages = this.state.messages[contextId] || [];
 
@@ -559,12 +667,16 @@ class AiAgent extends Elf {
       model: this.state.model,
       prompt,
       system: resumePrompt,
+      reasoning: this.state.reasoning,
       options,
       stream: false,
     });
   }
 
   async react(reactPrompt, contextId, question) {
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
     const feedId = await this.newQuestFeed();
     const contextMessages = this.state.messages[contextId] || [];
@@ -584,6 +696,7 @@ class AiAgent extends Elf {
       model: this.state.model,
       messages,
       options,
+      reasoning: this.state.reasoning,
       format: {
         type: 'object',
         properties: {
@@ -683,6 +796,19 @@ class AiAgent extends Elf {
     ];
   }
 
+  async getToolChatContextHistory(contextId) {
+    const contextMessages = this.state.messages[contextId] || [];
+    return [
+      ...Array.from(contextMessages)
+        .map((m) => m._state.toJS())
+        .filter((m) => {
+          if (m.role === 'tool' && !m.tool_calls) {
+            return m;
+          }
+        }),
+    ];
+  }
+
   async getBaseSettings() {
     const {provider, host, headers, model} = this.state.toJS();
     return {provider, host, headers, model};
@@ -693,6 +819,11 @@ class AiAgent extends Elf {
     await this.persist();
   }
 
+  async publish() {
+    this.logic.publish();
+    await this.persist();
+  }
+
   delete() {}
 }
 

package/lib/llm/providers.js

@@ -49,7 +49,15 @@ class OllamaProvider extends LLMProvider {
   }
 
   async chat(chatRequest) {
-    const {model, messages, options, format, tools, stream} = chatRequest;
+    const {
+      model,
+      messages,
+      options,
+      format,
+      tools,
+      stream,
+      reasoning,
+    } = chatRequest;
     const useFormat = !!format;
     const chat = await this.#ollama.chat({
       model,
@@ -58,6 +66,7 @@ class OllamaProvider extends LLMProvider {
       format,
       tools,
       stream,
+      think: reasoning,
     });
     if (useFormat) {
       chat.message.content = JSON.parse(chat.message.content);
@@ -68,7 +77,15 @@ class OllamaProvider extends LLMProvider {
   }
 
   async gen(genRequest) {
-    const {model, system, prompt, format, options, stream} = genRequest;
+    const {
+      model,
+      system,
+      prompt,
+      format,
+      options,
+      stream,
+      reasoning,
+    } = genRequest;
     const useFormat = !!format;
     const gen = await this.#ollama.generate({
       model,
@@ -77,6 +94,7 @@ class OllamaProvider extends LLMProvider {
       format,
       options,
       stream,
+      think: reasoning,
     });
     if (useFormat) {
       return JSON.parse(gen.response);
@@ -120,6 +138,7 @@ class OpenAIProvider extends LLMProvider {
   }
 
   async chat(chatRequest) {
+    delete chatRequest.reasoning; //not yet supported
     if (chatRequest.options) {
       chatRequest = {...chatRequest, ...chatRequest.options};
       delete chatRequest.options;
@@ -145,6 +164,7 @@ class OpenAIProvider extends LLMProvider {
           },
         },
       };
+
       delete chatRequest.format;
     }
     const query = `${this.#baseUrl}/chat/completions`;

package/lib/llm/utils.js

@@ -90,7 +90,7 @@ const splitLongText = (text, maxLength, baseId) => {
   return segments;
 };
 
-const html2chunks = async (html, chunkSize = 300, chunkOverlap = 0) => {
+const html2chunks = async (html, chunkSize = 300, chunkOverlap = 50) => {
   const textSplitter = RecursiveCharacterTextSplitter.fromLanguage('html', {
     chunkSize,
     chunkOverlap,
@@ -236,45 +236,65 @@ function groupSentences(text, maxSize) {
   return chunks;
 }
 
+/**
+ * Construit un prompt à partir d'une liste d'articles, avec gestion du format et de la limite de tokens.
+ *
+ * @param {ArticleShape[]} articles - Liste des articles sources utilisés pour générer le prompt.
+ * @param {"text"|"json"} [format="text"] - Format de sortie attendu :
+ *   - `"text"` → prompt en texte brut
+ *   - `"json"` → prompt structuré en JSON
+ * @param {number} [maxTotalTokens] - Nombre maximal de tokens autorisés dans le prompt.
+ *   Si non défini, aucun contrôle n'est appliqué.
+ * @param {function} [dbg=() => null] - Fonction de débogage optionnelle appelée
+ *   avec des informations intermédiaires (signature `(info: any) => void`).
+ * @returns {string} - Le prompt généré, soit en texte brut (string),
+ *   soit en objet JSON stringifié selon le format choisi.
+ */
 function buildPromptFromArticlesMulti(
-  initialQuestion,
-  questionsWithArticles,
-  maxTotalTokens
+  articles,
+  format = 'text',
+  maxTotalTokens,
+  dbg = () => null
 ) {
-  let prompt = '[CONTEXT]\n\n';
-  let currentTokenCount = estimateTokenCount(prompt);
-
   const buffer = 16000; // Réserve de tokens pour l'instruction + réponse
-  const maxTokensPerQuestion = Math.floor(
-    (maxTotalTokens - buffer) / questionsWithArticles.length
-  );
-
-  for (const {articles} of questionsWithArticles) {
-    let section = '';
-    let sectionTokenCount = estimateTokenCount(section);
-    for (const article of articles) {
-      const {title, sourceId, description} = article;
-      const articleBlock = `\n# ${title} \n## Lien: ${sourceId}\n\n${description}\n`;
-      const tokensForArticle = estimateTokenCount(articleBlock);
-
-      if (sectionTokenCount + tokensForArticle > maxTokensPerQuestion) {
-        break;
-      }
-
-      section += articleBlock;
-      sectionTokenCount += tokensForArticle;
+  const maxTokens = Math.floor(maxTotalTokens - buffer);
+
+  let sections = [];
+  let sectionTokenCount = 0;
+  for (const article of articles) {
+    const {kind, title, sourceId, description, finalScore} = article;
+
+    let articleBlock = '';
+    if (format === 'json') {
+      articleBlock = JSON.stringify({
+        kind,
+        title,
+        url: sourceId.startsWith('http') ? sourceId : null,
+        finalScore,
+        description,
+      });
+    } else {
+      articleBlock += `# ${title}\n\n`;
+      articleBlock += `**score :** ${finalScore}\n\n`;
+      articleBlock += `\`\`\`html\n${description}\n\`\`\`\n\n`;
     }
 
-    if (currentTokenCount + sectionTokenCount > maxTotalTokens - buffer) {
+    dbg(articleBlock);
+    const tokensForArticle = estimateTokenCount(articleBlock);
+
+    if (sectionTokenCount + tokensForArticle > maxTokens) {
+      dbg('MAX TOKEN REACHED');
       break;
     }
 
-    prompt += section;
-    currentTokenCount += sectionTokenCount;
+    sections.push(articleBlock);
+    sectionTokenCount += tokensForArticle;
   }
-  const questionContext = '[QUESTION]\n\n' + initialQuestion;
-  prompt += questionContext;
-  return prompt.trim();
+
+  if (format === 'json') {
+    return `[${sections.join(',')}]`;
+  }
+  return sections.join('---\n\n');
 }
 
 /**
@@ -302,12 +322,17 @@ function chunkArray(array, size) {
  * @returns {Promise<object>} A map of embeddings structured as:
  *    { [contentId]: { [key]: { chunk, embedding } } }
  */
-async function embedChunksInBatch(agent, allChunks, batchSize = 50) {
+async function embedChunksInBatch(
+  agent,
+  allChunks,
+  batchSize = 50,
+  prefix = 'passage: '
+) {
   const embeddingsByContent = {};
 
   for (let start = 0; start < allChunks.length; start += batchSize) {
     const currentBatch = allChunks.slice(start, start + batchSize);
-    const inputTexts = currentBatch.map(({chunk}) => chunk);
+    const inputTexts = currentBatch.map(({chunk}) => `${prefix}${chunk}`);
     const embeddedVectors = await agent.embedInBatch(inputTexts);
 
     for (let i = 0; i < embeddedVectors.length; i++) {
@@ -328,6 +353,26 @@ async function embedChunksInBatch(agent, allChunks, batchSize = 50) {
   return embeddingsByContent;
 }
 
+function splitThinkTags(input) {
+  const thinkRegex = /<think>([\s\S]*?)<\/think>/g;
+  let match;
+  const thinks = [];
+  let cleanText = input;
+
+  // Extraire toutes les sections <think>...</think>
+  while ((match = thinkRegex.exec(input)) !== null) {
+    thinks.push(match[1].trim());
+  }
+
+  // Supprimer les balises et leur contenu du texte
+  cleanText = cleanText.replace(thinkRegex, '').trim();
+
+  return {
+    thinks, // Tableau avec le contenu des balises <think>
+    cleanText, // Texte sans balises <think>
+  };
+}
+
 module.exports = {
   chunkArray,
   embedChunksInBatch,
@@ -342,4 +387,5 @@ module.exports = {
   sliceText,
   groupSentences,
   buildPromptFromArticlesMulti,
+  splitThinkTags,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-agents",
-  "version": "1.0.5",
+  "version": "2.1.1",
   "description": "AI Agents framework",
   "author": "Epsitec SA",
   "contributors": [