@ai-setting/roy-agent-core 1.5.89 → 1.5.90

package/dist/shared/@ai-setting/{roy-agent-core-fvfc7f6v.js → roy-agent-core-2c8eraxq.js}

@@ -6,7 +6,7 @@ import {
 import {
   MemorySessionStore,
   SQLiteSessionStore
-} from "./roy-agent-core-q7sqeax6.js";
+} from "./roy-agent-core-zky9jse4.js";
 import {
   envKeyToConfigKey
 } from "./roy-agent-core-qxhq8ven.js";
@@ -66,8 +66,38 @@ init_search_query_parser();
 import path from "path";
 import { z } from "zod";
 var logger = createLogger("session");
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function isBusyError(err) {
+  if (err == null)
+    return false;
+  const e = err;
+  if (typeof e.code === "string") {
+    if (/^SQLITE_(BUSY|LOCKED)$/i.test(e.code))
+      return true;
+  }
+  if (typeof e.errno === "number" && (e.errno === 5 || e.errno === 6)) {
+    return true;
+  }
+  const msg = e.message ?? "";
+  return /SQLiteError:\s+(database is locked|database table is locked)/i.test(msg);
+}
+
+class AddMessageLockExhaustedError extends Error {
+  kind = "lock_exhausted";
+  attempts;
+  cause;
+  constructor(attempts, cause) {
+    super(`Failed to add message after ${attempts} attempts: ${String(cause)}`);
+    this.name = "AddMessageLockExhaustedError";
+    this.attempts = attempts;
+    this.cause = cause;
+  }
+}
 
 class SessionComponent extends BaseComponent {
+  static BACKOFFS_MS = [50, 100, 200];
   name = "session";
   version = "1.1.0";
   config;
@@ -323,14 +353,38 @@ class SessionComponent extends BaseComponent {
   async addMessage(sessionId, message) {
     const contentPreview = typeof message.content === "string" ? message.content.substring(0, 100) : JSON.stringify(message.content).substring(0, 100);
     logger.info(`[SessionComponent.addMessage] sessionId=${sessionId}, role=${message.role}, content="${contentPreview}"`);
-    try {
-      const messageId = await this.store?.addMessage(sessionId, message);
-      logger.info(`[SessionComponent.addMessage] Success: messageId=${messageId}`);
-      return messageId;
-    } catch (error) {
-      logger.error(`[SessionComponent] Failed to add message: ${error}`);
-      return;
+    return this.addMessageWithRetry(sessionId, message);
+  }
+  async addMessageWithRetry(sessionId, message) {
+    const MAX_ATTEMPTS = SessionComponent.BACKOFFS_MS.length;
+    for (let attempt = 0;attempt < MAX_ATTEMPTS; attempt++) {
+      try {
+        const messageId = await this.store?.addMessage(sessionId, message);
+        if (attempt > 0) {
+          logger.info(`[SessionComponent.addMessage] Recovered after ${attempt + 1} attempts: messageId=${messageId}`);
+        } else {
+          logger.info(`[SessionComponent.addMessage] Success: messageId=${messageId}`);
+        }
+        return messageId;
+      } catch (error) {
+        if (!isBusyError(error)) {
+          logger.error(`[SessionComponent] Failed to add message (non-busy): ${error}`);
+          return;
+        }
+        const isLastAttempt = attempt === MAX_ATTEMPTS - 1;
+        if (isLastAttempt) {
+          logger.error(`[SessionComponent] Failed to add message after ${MAX_ATTEMPTS} attempts (busy): ${error}`);
+          throw new AddMessageLockExhaustedError(MAX_ATTEMPTS, error);
+        }
+        const backoffMs = SessionComponent.BACKOFFS_MS[attempt];
+        logger.warn(`[SessionComponent] SQLITE_BUSY on attempt ${attempt + 1}/${MAX_ATTEMPTS}, retrying in ${backoffMs}ms: ${error}`);
+        await sleep(backoffMs);
+      }
     }
+    return;
+  }
+  async addMessages(sessionId, messages) {
+    return this.store?.addMessages(sessionId, messages) ?? [];
   }
   async getMessages(sessionId, options) {
     const messages = await this.store?.getMessages(sessionId, options?.offset, options?.limit);

package/dist/shared/@ai-setting/{roy-agent-core-h2d1s8yd.js → roy-agent-core-5ykms33a.js}

@@ -1,6 +1,6 @@
 import {
   invoke
-} from "./roy-agent-core-r0m0at3x.js";
+} from "./roy-agent-core-0r4ndyn9.js";
 import {
   ContextError,
   ErrorCodes

package/dist/shared/@ai-setting/{roy-agent-core-fgpnv7dt.js → roy-agent-core-8zjntsbb.js}

@@ -1,6 +1,6 @@
 import {
   withTimeout
-} from "./roy-agent-core-r0m0at3x.js";
+} from "./roy-agent-core-0r4ndyn9.js";
 import {
   truncateOutputInline
 } from "./roy-agent-core-hxsbegfc.js";
@@ -16,7 +16,7 @@ import {
 } from "./roy-agent-core-ctdhjv68.js";
 import {
   SessionMessageConverter
-} from "./roy-agent-core-c1j7ev4e.js";
+} from "./roy-agent-core-txwf64pd.js";
 import {
   safeParseToolArgs
 } from "./roy-agent-core-ce10b0ez.js";
@@ -115,23 +115,53 @@ function toLLMMessage(msg) {
       toolName = toolResult?.toolName;
     } else {
       const toolCallParts = msg.content.filter((part) => part.type === "tool-call");
-      const contentParts = msg.content.filter((part) => part.type === "text").map((part) => part.text || "");
-      content = contentParts.join(`
+      const hasMultimodalPart = msg.content.some((part) => part.type === "image" || part.type === "file");
+      if (hasMultimodalPart) {
+        const llmContentParts = [];
+        for (const part of msg.content) {
+          if (part.type === "text") {
+            llmContentParts.push({ type: "text", text: part.text || "" });
+          } else if (part.type === "image") {
+            llmContentParts.push({ type: "image", image: part.image });
+          } else if (part.type === "file") {
+            llmContentParts.push({
+              type: "file",
+              file: part.data ?? part.file,
+              mediaType: part.mediaType || "application/octet-stream"
+            });
+          }
+        }
+        if (msg.role === "assistant" && toolCallParts.length > 0) {
+          for (const part of toolCallParts) {
+            const argsString = typeof part.input === "string" ? part.input : JSON.stringify(part.input || {});
+            toolCalls = (toolCalls ?? []).concat([{
+              id: part.toolCallId,
+              name: part.toolName || "unknown",
+              arguments: argsString,
+              function: { name: part.toolName || "unknown", arguments: argsString }
+            }]);
+          }
+        }
+        content = llmContentParts;
+      } else {
+        const contentParts = msg.content.filter((part) => part.type === "text").map((part) => part.text || "");
+        content = contentParts.join(`
 `);
-      if (msg.role === "assistant" && toolCallParts.length > 0) {
-        toolCalls = toolCallParts.map((part) => {
-          const argsString = typeof part.input === "string" ? part.input : JSON.stringify(part.input || {});
-          const toolName2 = part.toolName || "unknown";
-          return {
-            id: part.toolCallId,
-            name: toolName2,
-            arguments: argsString,
-            function: {
+        if (msg.role === "assistant" && toolCallParts.length > 0) {
+          toolCalls = toolCallParts.map((part) => {
+            const argsString = typeof part.input === "string" ? part.input : JSON.stringify(part.input || {});
+            const toolName2 = part.toolName || "unknown";
+            return {
+              id: part.toolCallId,
               name: toolName2,
-              arguments: argsString
-            }
-          };
-        });
+              arguments: argsString,
+              function: {
+                name: toolName2,
+                arguments: argsString
+              }
+            };
+          });
+        }
       }
     }
   } else {
@@ -550,7 +580,8 @@ class AgentComponent extends BaseComponent {
       throw new Error(`Agent not found: ${agentName}`);
     }
     const runId = `${agentName}:${++this.runCounter}`;
-    logger.info(`Starting agent run: ${agentName} (runId=${runId})`, { query: query.substring(0, 100) });
+    const querySummary = typeof query === "string" ? query.substring(0, 100) : query.filter((p) => p.type === "text").map((p) => p.text).join(" ").substring(0, 100) || "[multimodal query]";
+    logger.info(`Starting agent run: ${agentName} (runId=${runId})`, { query: querySummary });
     agent.status = "running";
     this.aborted.set(runId, false);
     const abortController = new AbortController;
@@ -559,24 +590,25 @@ class AgentComponent extends BaseComponent {
       this.doomLoopCaches.set(runId, new Map);
     }
     await this.resolveSystemPrompt(agent, agentName);
+    let resolvedSystemPrompt;
     if (agent.config.systemPrompt) {
-      const sp = agent.config.systemPrompt;
-      if (sp.includes("{{workspace_dir}}")) {
+      resolvedSystemPrompt = agent.config.systemPrompt;
+      if (resolvedSystemPrompt.includes("{{workspace_dir}}")) {
         const workspaceDir = this.env?.getComponent?.("config")?.get?.("workspace_dir") || process.cwd();
-        agent.config.systemPrompt = agent.config.systemPrompt.replaceAll("{{workspace_dir}}", String(workspaceDir));
+        resolvedSystemPrompt = resolvedSystemPrompt.replaceAll("{{workspace_dir}}", String(workspaceDir));
       }
-      if (sp.includes("{{memory}}")) {
+      if (resolvedSystemPrompt.includes("{{memory}}")) {
         try {
           const memoryComponent = this.env?.getComponent?.("memory");
           if (memoryComponent && typeof memoryComponent.recallMemory === "function") {
             const memoryContent = await memoryComponent.recallMemory();
-            agent.config.systemPrompt = agent.config.systemPrompt.replace("{{memory}}", memoryContent || "(No memory)");
+            resolvedSystemPrompt = resolvedSystemPrompt.replaceAll("{{memory}}", memoryContent || "(No memory)");
           } else {
-            agent.config.systemPrompt = agent.config.systemPrompt.replace("{{memory}}", "(Memory component not available)");
+            resolvedSystemPrompt = resolvedSystemPrompt.replaceAll("{{memory}}", "(Memory component not available)");
           }
         } catch (err) {
           logger.warn(`[AgentComponent._run] Failed to replace {{memory}}: ${err}`);
-          agent.config.systemPrompt = agent.config.systemPrompt.replace("{{memory}}", "(Failed to load memory)");
+          resolvedSystemPrompt = resolvedSystemPrompt.replaceAll("{{memory}}", "(Failed to load memory)");
         }
       }
     }
@@ -597,7 +629,7 @@ class AgentComponent extends BaseComponent {
       maxIterations: agent.config.maxIterations,
       messages: [],
       tools: this.getAvailableTools(agent, effectiveContext),
-      systemPrompt: agent.config.systemPrompt || "You are a helpful assistant.",
+      systemPrompt: resolvedSystemPrompt ?? agent.config.systemPrompt ?? "You are a helpful assistant.",
       context: effectiveContext
     };
     let historyMessageCount = 0;
@@ -969,6 +1001,7 @@ class AgentComponent extends BaseComponent {
       }
       this.aborted.delete(runId);
       this.abortControllers.delete(runId);
+      this.doomLoopCaches.delete(runId);
       if (result.error) {
         this.pushEnvEvent({
           type: "agent.error",
@@ -1292,6 +1325,7 @@ ${additionInfo}`
         logger.warn("SessionComponent not found, skipping session recording");
         return;
       }
+      const filtered2 = [];
       for (const msg of allMessages) {
         if (msg.role === "system") {
           continue;
@@ -1304,10 +1338,19 @@ ${additionInfo}`
             continue;
           }
         }
-        await sessionComponent.addMessage(sessionId, this.messageConverter.fromModelMessage(msg, { sessionID: sessionId }));
+        filtered2.push(this.messageConverter.fromModelMessage(msg, { sessionID: sessionId }));
       }
+      if (filtered2.length === 0) {
+        return;
+      }
+      await sessionComponent.addMessages(sessionId, filtered2);
     } catch (err) {
-      logger.warn(`Failed to record session messages: ${err}`);
+      const kind = err && typeof err === "object" && "kind" in err ? err.kind : undefined;
+      if (kind === "lock_exhausted") {
+        logger.error(`[recordSessionMessages] DROPPED ${filtered?.length ?? "?"} message(s) — SQLITE_BUSY retry exhausted after ${err.attempts ?? "?"} attempts. Session ${sessionId} is now inconsistent with LLM context. Original: ${err}`);
+      } else {
+        logger.error(`[recordSessionMessages] Failed to record session messages for ${sessionId}: ${err}`);
+      }
     }
   }
   isEmptyMessage(content) {

package/dist/shared/@ai-setting/{roy-agent-core-vneyghpg.js → roy-agent-core-ddq5hcp5.js}

@@ -6,7 +6,7 @@ import {
   isBuiltInEventSourceType,
   isValidEventSourceType,
   validateEventSourceConfig
-} from "./roy-agent-core-qhhxx2x2.js";
+} from "./roy-agent-core-ds5f75pg.js";
 import"./roy-agent-core-fs0mn2jk.js";
 export {
   validateEventSourceConfig,

package/dist/shared/@ai-setting/{roy-agent-core-qhhxx2x2.js → roy-agent-core-ds5f75pg.js}

@@ -1,7 +1,8 @@
 // src/env/event-source/types.ts
 var BUILT_IN_EVENT_SOURCE_TYPES = {
   LARK_CLI: "lark-cli",
-  TIMER: "timer"
+  TIMER: "timer",
+  BOUNTY_IM: "bounty-im"
 };
 var BUILT_IN_EVENT_SOURCE_TYPE_LIST = Object.values(BUILT_IN_EVENT_SOURCE_TYPES);
 

package/dist/shared/@ai-setting/{roy-agent-core-3f6k060j.js → roy-agent-core-j0107ww1.js}

@@ -19,7 +19,7 @@ import {
   init_skill_node,
   init_tool_node,
   init_workflow_node
-} from "./roy-agent-core-hc20420t.js";
+} from "./roy-agent-core-z240ts1r.js";
 import {
   WorkflowError,
   createWorkflowEvent,