@axiom-lattice/core 2.1.41 → 2.1.43

package/dist/index.mjs

@@ -6471,36 +6471,35 @@ var InMemoryThreadMessageQueueStore = class {
   }
   async addMessageAtHead(threadId, content, type = "system") {
     const threadMessages = this.getMessagesForThread(threadId);
-    threadMessages.forEach((msg) => {
-      msg.sequence += 1;
-    });
     let tenantId = "default";
     let assistantId = "";
     if (threadMessages.length > 0) {
       tenantId = threadMessages[0].tenantId || "default";
       assistantId = threadMessages[0].assistantId || "";
     }
+    const nextSequence = threadMessages.length;
     const message = {
       id: this.generateId(),
       content,
       type,
-      sequence: 0,
+      sequence: nextSequence,
       createdAt: /* @__PURE__ */ new Date(),
       status: "pending",
       tenantId,
       assistantId,
-      priority: 0
+      priority: 100
+      // High priority for head messages (STEER/Command)
     };
-    threadMessages.unshift(message);
+    threadMessages.push(message);
     return message;
   }
   async getPendingMessages(threadId) {
     const threadMessages = this.getMessagesForThread(threadId);
-    return threadMessages.filter((msg) => msg.status === "pending" || !msg.status).sort((a, b) => a.sequence - b.sequence).map(({ status, tenantId, assistantId, ...message }) => message);
+    return threadMessages.filter((msg) => msg.status === "pending" || !msg.status).sort((a, b) => (b.priority || 0) - (a.priority || 0) || a.sequence - b.sequence).map(({ status, tenantId, assistantId, ...message }) => message);
   }
   async getProcessingMessages(threadId) {
     const threadMessages = this.getMessagesForThread(threadId);
-    return threadMessages.filter((msg) => msg.status === "processing").sort((a, b) => a.sequence - b.sequence).map(({ status, tenantId, assistantId, ...message }) => message);
+    return threadMessages.filter((msg) => msg.status === "processing").sort((a, b) => (b.priority || 0) - (a.priority || 0) || a.sequence - b.sequence).map(({ status, tenantId, assistantId, ...message }) => message);
   }
   async getQueueSize(threadId) {
     const pending = await this.getPendingMessages(threadId);
@@ -6509,11 +6508,11 @@ var InMemoryThreadMessageQueueStore = class {
   async getThreadsWithPendingMessages() {
     const result = [];
     for (const [threadId, messages] of this.messages.entries()) {
-      const pendingMessages = messages.filter(
-        (msg) => msg.status === "pending" || !msg.status
+      const pendingOrProcessingMessages = messages.filter(
+        (msg) => msg.status === "pending" || msg.status === "processing" || !msg.status
       );
-      if (pendingMessages.length > 0) {
-        const firstMessage = pendingMessages[0];
+      if (pendingOrProcessingMessages.length > 0) {
+        const firstMessage = pendingOrProcessingMessages[0];
         result.push({
           tenantId: firstMessage.tenantId || "default",
           assistantId: firstMessage.assistantId || "",
@@ -6563,6 +6562,20 @@ var InMemoryThreadMessageQueueStore = class {
       this.messages.set(threadId, filtered);
     }
   }
+  async resetProcessingToPending(threadId) {
+    const messages = this.messages.get(threadId);
+    if (!messages) {
+      return 0;
+    }
+    let count = 0;
+    for (const msg of messages) {
+      if (msg.status === "processing") {
+        msg.status = "pending";
+        count++;
+      }
+    }
+    return count;
+  }
 };
 
 // src/store_lattice/StoreLatticeManager.ts
@@ -9897,7 +9910,7 @@ import {
   ToolMessage as ToolMessage3,
   humanInTheLoopMiddleware
 } from "langchain";
-import { Command as Command2, getCurrentTaskInput as getCurrentTaskInput2 } from "@langchain/langgraph";
+import { Command as Command2, getCurrentTaskInput as getCurrentTaskInput2, GraphInterrupt as GraphInterrupt3 } from "@langchain/langgraph";
 import { HumanMessage } from "@langchain/core/messages";
 
 // src/agent_worker/agent_worker_graph.ts
@@ -10595,6 +10608,9 @@ function createTaskTool(options) {
         }
         return returnCommandWithStateUpdate(result, config.toolCall.id);
       } catch (error) {
+        if (error instanceof GraphInterrupt3) {
+          throw error;
+        }
         return new Command2({
           update: {
             messages: [
@@ -10788,13 +10804,13 @@ var StoreBackend = class {
    * @returns List of all items matching the search criteria
    */
   async searchStorePaginated(store, namespace, options = {}) {
-    const { query, filter, pageSize = 100 } = options;
+    const { query, filter: filter2, pageSize = 100 } = options;
     const allItems = [];
     let offset = 0;
     while (true) {
       const pageItems = await store.search(namespace, {
         query,
-        filter,
+        filter: filter2,
         limit: pageSize,
         offset
       });
@@ -13948,7 +13964,7 @@ var AgentParamsBuilder = class {
    * @param options build options
    * @returns Agent build parameters
    */
-  buildParams(agentLattice, options) {
+  async buildParams(agentLattice, options) {
     const skills = isDeepAgentConfig2(agentLattice.config) ? agentLattice.config.skillCategories : void 0;
     const toolKeys = options?.overrideTools || getToolsFromConfig2(agentLattice.config);
     const tools = toolKeys.map((toolKey) => {
@@ -13968,8 +13984,8 @@ var AgentParamsBuilder = class {
       throw new Error(`Model "${modelKey}" does not exist`);
     }
     const subAgentKeys = getSubAgentsFromConfig2(agentLattice.config);
-    const subAgents = subAgentKeys.map((agentKey) => {
-      const subAgentLattice = this.getAgentLatticeFunc(agentKey);
+    const subAgents = await Promise.all(subAgentKeys.map(async (agentKey) => {
+      const subAgentLattice = await this.getAgentLatticeFunc(agentKey);
       if (!subAgentLattice) {
         throw new Error(`SubAgent "${agentKey}" does not exist`);
       }
@@ -13978,7 +13994,7 @@ var AgentParamsBuilder = class {
         config: subAgentLattice.config,
         client: subAgentLattice.client
       };
-    });
+    }));
     let internalSubAgents = [];
     if (isDeepAgentConfig2(agentLattice.config)) {
       internalSubAgents = agentLattice.config.internalSubAgents?.map((i) => ({
@@ -14056,7 +14072,7 @@ var AgentLatticeManager = class _AgentLatticeManager extends BaseLatticeManager
       }
       const config = assistantToConfig(assistant);
       const agentLattice = {
-        config,
+        config: { ...config, tenantId },
         client: void 0
       };
       return agentLattice;
@@ -14363,13 +14379,13 @@ var AgentLatticeManager = class _AgentLatticeManager extends BaseLatticeManager
    * @param options 构建选项
    * @returns 返回Agent构建参数
    */
-  buildAgentParams(agentLattice, options) {
+  async buildAgentParams(agentLattice, options) {
     const tenantId = agentLattice.config.tenantId || "default";
-    const paramsBuilder = new AgentParamsBuilder((key) => {
-      this.initializeClient(tenantId, key);
+    const paramsBuilder = new AgentParamsBuilder(async (key) => {
+      await this.initializeClientAsync(tenantId, key);
       return this.getAgentLatticeWithTenant(tenantId, key);
     });
-    const params = paramsBuilder.buildParams(agentLattice, options);
+    const params = await paramsBuilder.buildParams(agentLattice, options);
     return {
       ...params,
       tenantId
@@ -14390,7 +14406,7 @@ var AgentLatticeManager = class _AgentLatticeManager extends BaseLatticeManager
     };
     const factory = AgentGraphBuilderFactory.getInstance();
     const builder = factory.getBuilder(resolvedConfig.type);
-    const params = this.buildAgentParams(resolvedLattice, options);
+    const params = await this.buildAgentParams(resolvedLattice, options);
     return await builder.build(resolvedLattice, params);
   }
   /**
@@ -14468,11 +14484,14 @@ var ChunkBuffer = class {
 };
 
 // src/chunk_buffer_lattice/InMemoryChunkBuffer.ts
+import { MessageChunkTypes } from "@axiom-lattice/protocols";
 import {
   ReplaySubject,
   observeOn,
   asyncScheduler
 } from "rxjs";
+import { eachValueFrom } from "rxjs-for-await";
+import { filter, takeWhile } from "rxjs/operators";
 var InMemoryChunkBuffer = class extends ChunkBuffer {
   constructor(config) {
     super();
@@ -14557,7 +14576,7 @@ var InMemoryChunkBuffer = class extends ChunkBuffer {
     let chunk;
     if (typeof arg2 === "string" && arg3 !== void 0) {
       chunk = {
-        type: "message_chunk",
+        type: MessageChunkTypes.AI,
         data: {
           id: arg2,
           content: arg3
@@ -14573,7 +14592,6 @@ var InMemoryChunkBuffer = class extends ChunkBuffer {
     buffer2.status = "active" /* ACTIVE */;
   }
   async completeThread(threadId) {
-    console.log("completeThread");
     const buffer2 = this.getBufferIfValid(threadId);
     if (buffer2) {
       buffer2.status = "completed" /* COMPLETED */;
@@ -14672,75 +14690,27 @@ var InMemoryChunkBuffer = class extends ChunkBuffer {
       buffer2.updatedAt = Date.now();
     }
   }
-  async *getNewChunksSinceContentIterator(threadId, messageId, knownContent) {
+  async *getNewChunksSinceContentIterator(threadId, messageId, knownContent, stopTypes) {
     const buffer2 = this.getBufferIfValid(threadId);
     if (!buffer2) return;
-    let accumulatedContent = "";
-    const queue = [];
-    let resolveNext = null;
-    let errorNext = null;
-    let isCompleted = false;
-    let pendingError = null;
-    const subscription = buffer2.chunks$.pipe(observeOn(asyncScheduler)).subscribe({
-      next: (chunk) => {
-        queue.push(chunk);
-        if (resolveNext) {
-          const resolve3 = resolveNext;
-          resolveNext = null;
-          resolve3();
-        }
-      },
-      error: (err) => {
-        pendingError = err;
-        if (errorNext) {
-          const reject = errorNext;
-          errorNext = null;
-          reject(err);
-        } else if (resolveNext) {
-          const resolve3 = resolveNext;
-          resolveNext = null;
-          resolve3();
-        }
-      },
-      complete: () => {
-        isCompleted = true;
-        if (resolveNext) {
-          const resolve3 = resolveNext;
-          resolveNext = null;
-          resolve3();
-        }
-      }
-    });
+    const defaultStopTypes = [
+      MessageChunkTypes.MESSAGE_COMPLETED,
+      MessageChunkTypes.THREAD_IDLE
+    ];
+    const typesToStop = stopTypes ?? defaultStopTypes;
     let startYieldChunk = false;
-    try {
-      while (true) {
-        if (pendingError) {
-          throw pendingError;
-        }
-        if (queue.length === 0) {
-          if (isCompleted) break;
-          await new Promise((resolve3, reject) => {
-            resolveNext = resolve3;
-            errorNext = reject;
-          });
-        }
-        if (pendingError) {
-          throw pendingError;
-        }
-        while (queue.length > 0) {
-          const chunk = queue.shift();
-          if (!chunk) continue;
-          if (chunk.data?.id === messageId) {
-            startYieldChunk = true;
-          }
-          if (startYieldChunk) {
-            yield chunk;
-          }
-        }
-      }
-    } finally {
-      subscription.unsubscribe();
-    }
+    console.log("start from messageId", messageId);
+    const filtered$ = buffer2.chunks$.pipe(
+      observeOn(asyncScheduler),
+      // 1. 从指定 messageId 开始
+      filter((chunk) => {
+        if (chunk.data?.id === messageId) startYieldChunk = true;
+        return startYieldChunk;
+      }),
+      // 2. 包含指定的停止类型，但收到后停止
+      takeWhile((chunk) => !typesToStop.includes(chunk.type), true)
+    );
+    yield* eachValueFrom(filtered$);
   }
   getStats() {
     let activeCount = 0;
@@ -16864,7 +16834,7 @@ var Agent = class {
       command,
       custom_run_config
     }, signal) => {
-      const runnable_agent = await getAgentClient(this.tenant_id, this.assistant_id);
+      const runnable_agent = await getAgentClientAsync(this.tenant_id, this.assistant_id);
       const agentLattice = agentLatticeManager.getAgentLatticeWithTenant(this.tenant_id, this.assistant_id);
       const { messages, ...rest } = input;
       const lifecycleManager = this;
@@ -16946,9 +16916,7 @@ var Agent = class {
               };
             }
             if (data) {
-              if (data.type !== "interrupt") {
-                await lifecycleManager.addChunk(data);
-              }
+              lifecycleManager.addChunk(data);
             }
           }
         } catch (error) {
@@ -16965,8 +16933,8 @@ var Agent = class {
       while (!signal?.aborted) {
         const pendings = await this.getPendingMessages();
         if (pendings.length === 0) {
-          await this.tryToCompleteThread();
           const state = await this.getCurrentState();
+          const runStatus = await this.getRunStatus();
           const pendingCount = await this.getQueueStore().getQueueSize(this.thread_id);
           this.publish("thread:idle", {
             type: "thread:idle",
@@ -16974,6 +16942,15 @@ var Agent = class {
             pendingCount,
             state
           });
+          if (runStatus === "idle" /* IDLE */) {
+            this.addChunk({
+              type: "thread_idle",
+              data: {
+                id: this.thread_id,
+                content: ""
+              }
+            });
+          }
           break;
         }
         const firstMessage = pendings[0];
@@ -16994,22 +16971,49 @@ var Agent = class {
             const input = {
               messages: [new HumanMessage2({ id: p.content.id, content: p.content.message })]
             };
+            const queueMessageData = p.content.queueMessage || {};
             try {
               await this.agentStreamExecutor({
                 input,
-                command: p.content.command
+                command: queueMessageData.command || p.content.command,
+                custom_run_config: queueMessageData.custom_run_config
               }, signal);
               await this.queueStore?.markCompleted(p.id);
+              const runStatus = await this.getRunStatus();
               const state = await this.getCurrentState();
-              this.publish("message:completed", {
-                type: "message:completed",
-                messageId: p.content.id,
-                timestamp: /* @__PURE__ */ new Date(),
-                duration: Date.now() - startTime,
-                state
-              });
+              if (runStatus === "interrupted" /* INTERRUPTED */) {
+                this.publish("message:interrupted", {
+                  type: "message:interrupted",
+                  messageId: p.content.id,
+                  timestamp: /* @__PURE__ */ new Date(),
+                  duration: Date.now() - startTime,
+                  state
+                });
+              } else {
+                this.addChunk({
+                  type: "message_completed",
+                  data: {
+                    id: p.content.id,
+                    content: ""
+                  }
+                });
+                this.publish("message:completed", {
+                  type: "message:completed",
+                  messageId: p.content.id,
+                  timestamp: /* @__PURE__ */ new Date(),
+                  duration: Date.now() - startTime,
+                  state
+                });
+              }
             } catch (error) {
               console.error(`STEER/Command message ${p.id} execution failed:`, error);
+              this.addChunk({
+                type: "message_failed",
+                data: {
+                  id: p.content.id,
+                  content: error instanceof Error ? error.message : String(error)
+                }
+              });
               this.publish("message:failed", {
                 type: "message:failed",
                 messageId: p.content.id,
@@ -17036,22 +17040,51 @@ var Agent = class {
                 queueMode: "collect" /* COLLECT */
               });
             });
+            const firstQueueMessage = remainingPendings[0]?.content?.queueMessage || {};
             try {
-              await this.agentStreamExecutor({ input: { messages: userMessages } }, signal);
+              await this.agentStreamExecutor({
+                input: { messages: userMessages },
+                custom_run_config: firstQueueMessage.custom_run_config
+              }, signal);
+              const runStatus = await this.getRunStatus();
               const state = await this.getCurrentState();
               for (const p of remainingPendings) {
                 await this.queueStore?.markCompleted(p.id);
-                this.publish("message:completed", {
-                  type: "message:completed",
-                  messageId: p.content.id,
-                  timestamp: /* @__PURE__ */ new Date(),
-                  duration: Date.now() - startTime,
-                  state
-                });
+                if (runStatus === "interrupted" /* INTERRUPTED */) {
+                  this.publish("message:interrupted", {
+                    type: "message:interrupted",
+                    messageId: p.content.id,
+                    timestamp: /* @__PURE__ */ new Date(),
+                    duration: Date.now() - startTime,
+                    state
+                  });
+                } else {
+                  this.addChunk({
+                    type: "message_completed",
+                    data: {
+                      id: p.content.id,
+                      content: ""
+                    }
+                  });
+                  this.publish("message:completed", {
+                    type: "message:completed",
+                    messageId: p.content.id,
+                    timestamp: /* @__PURE__ */ new Date(),
+                    duration: Date.now() - startTime,
+                    state
+                  });
+                }
               }
             } catch (error) {
               console.error(`COLLECT mode execution failed:`, error);
               for (const p of remainingPendings) {
+                this.addChunk({
+                  type: "message_failed",
+                  data: {
+                    id: p.content.id,
+                    content: error instanceof Error ? error.message : String(error)
+                  }
+                });
                 this.publish("message:failed", {
                   type: "message:failed",
                   messageId: p.content.id,
@@ -17074,19 +17107,48 @@ var Agent = class {
                 timestamp: /* @__PURE__ */ new Date(),
                 queueMode: "followup" /* FOLLOWUP */
               });
+              const queueMessageData = p.content.queueMessage || {};
               try {
-                await this.agentStreamExecutor({ input: { messages: [message] } }, signal);
+                await this.agentStreamExecutor({
+                  input: { messages: [message] },
+                  custom_run_config: queueMessageData.custom_run_config
+                }, signal);
                 await this.queueStore?.markCompleted(p.id);
+                const runStatus = await this.getRunStatus();
                 const state = await this.getCurrentState();
-                this.publish("message:completed", {
-                  type: "message:completed",
-                  messageId: p.content.id,
-                  timestamp: /* @__PURE__ */ new Date(),
-                  duration: Date.now() - startTime,
-                  state
-                });
+                if (runStatus === "interrupted" /* INTERRUPTED */) {
+                  this.publish("message:interrupted", {
+                    type: "message:interrupted",
+                    messageId: p.content.id,
+                    timestamp: /* @__PURE__ */ new Date(),
+                    duration: Date.now() - startTime,
+                    state
+                  });
+                } else {
+                  this.addChunk({
+                    type: "message_completed",
+                    data: {
+                      id: p.content.id,
+                      content: ""
+                    }
+                  });
+                  this.publish("message:completed", {
+                    type: "message:completed",
+                    messageId: p.content.id,
+                    timestamp: /* @__PURE__ */ new Date(),
+                    duration: Date.now() - startTime,
+                    state
+                  });
+                }
               } catch (error) {
                 console.error(`FOLLOWUP mode message ${p.id} execution failed:`, error);
+                this.addChunk({
+                  type: "message_failed",
+                  data: {
+                    id: p.content.id,
+                    content: error instanceof Error ? error.message : String(error)
+                  }
+                });
                 this.publish("message:failed", {
                   type: "message:failed",
                   messageId: p.content.id,
@@ -17116,11 +17178,12 @@ var Agent = class {
   addChunk(content) {
     return this.chunkBuffer.addChunk(this.thread_id, content);
   }
-  chunkStream(message_id, known_content = "") {
+  chunkStream(message_id, stopTypes) {
     const stream = this.chunkBuffer.getNewChunksSinceContentIterator(
       this.thread_id,
       message_id,
-      known_content
+      "",
+      stopTypes
     );
     return {
       [Symbol.asyncIterator]: async function* () {
@@ -17175,11 +17238,6 @@ var Agent = class {
     const store = this.getQueueStore();
     return await store.getPendingMessages(this.thread_id);
   }
-  async tryToCompleteThread() {
-    setTimeout(async () => {
-      await this.chunkBuffer.completeThread(this.thread_id);
-    }, 100);
-  }
   getQueueStore() {
     if (!this.queueStore) {
       try {
@@ -17235,11 +17293,14 @@ var Agent = class {
     }
     const content = {
       message: queueMessage.input.message,
-      id: messageId
+      id: messageId,
+      // Store complete queue message data for recovery
+      queueMessage: {
+        input: queueMessage.input,
+        command: queueMessage.command,
+        custom_run_config: queueMessage.custom_run_config
+      }
     };
-    if (queueMessage.command) {
-      content.command = queueMessage.command;
-    }
     if (isHighPriority) {
       await store.addMessageAtHead(this.thread_id, content, "human");
     } else {
@@ -17267,7 +17328,7 @@ var Agent = class {
   }
   /**
    * Start queue processor if not already running
-   * Private method used internally by addMessage
+   * Public method to allow external triggering (e.g., from recovery)
    */
   async startQueueProcessorIfNeeded() {
     const store = this.getQueueStore();
@@ -17355,6 +17416,30 @@ var Agent = class {
     }
     return "idle" /* IDLE */;
   }
+  /**
+   * Resume task processing after server restart
+   * Resets any stuck processing messages to pending and starts queue processing
+   * Note: Does not rely on LangGraph state as it may be stale after crash/restart
+   */
+  async resumeTask() {
+    try {
+      await agentLatticeManager.initializeClientAsync(this.tenant_id, this.assistant_id);
+    } catch (error) {
+      console.error(`[Agent] Failed to initialize agent lattice for ${this.assistant_id} (tenant: ${this.tenant_id}):`, error);
+      throw error;
+    }
+    const runStatus = await this.getRunStatus();
+    if (runStatus === "interrupted" /* INTERRUPTED */) {
+      console.log(`[Agent] Skipping resume for ${this.assistant_id} (tenant: ${this.tenant_id}) - agent is in interrupted state`);
+      return;
+    }
+    const store = this.getQueueStore();
+    const resetCount = await store.resetProcessingToPending(this.thread_id);
+    if (resetCount > 0) {
+      console.log(`[Agent] Reset ${resetCount} processing messages to pending for thread ${this.thread_id}`);
+    }
+    await this.startQueueProcessorIfNeeded();
+  }
   /**
    * Abort the current agent execution
    * This will cancel any ongoing invoke or stream operations
@@ -17398,6 +17483,7 @@ var Agent = class {
    */
   publish(eventName, data) {
     const namespacedEvent = `${eventName}:${this.tenant_id}:${this.thread_id}`;
+    console.log(namespacedEvent);
     event_bus_default.publish(namespacedEvent, data);
   }
 };
@@ -17463,6 +17549,57 @@ var AgentInstanceManager = class _AgentInstanceManager {
     });
     this.agents.clear();
   }
+  /**
+   * Restore agent instances for threads with pending messages after server restart
+   * Queries the message queue store for threads with pending/processing messages
+   * and recreates agent instances to resume processing
+   */
+  async restore() {
+    const stats = { restored: 0, errors: 0 };
+    try {
+      const queueStoreLattice = storeLatticeManager.getStoreLattice("default", "threadMessageQueue");
+      const queueStore = queueStoreLattice.store;
+      const threadsWithPending = await queueStore.getThreadsWithPendingMessages();
+      if (threadsWithPending.length === 0) {
+        console.log("[AgentInstanceManager] No threads with pending messages found");
+        return stats;
+      }
+      console.log(`[AgentInstanceManager] Found ${threadsWithPending.length} threads with pending messages, restoring...`);
+      for (const threadInfo of threadsWithPending) {
+        try {
+          await this.restoreThread(threadInfo, queueStore);
+          stats.restored++;
+        } catch (error) {
+          console.error(`[AgentInstanceManager] Failed to restore thread ${threadInfo.threadId}:`, error);
+          stats.errors++;
+        }
+      }
+      console.log(`[AgentInstanceManager] Restore complete: ${stats.restored} restored, ${stats.errors} errors`);
+      return stats;
+    } catch (error) {
+      console.error("[AgentInstanceManager] Restore failed:", error);
+      throw error;
+    }
+  }
+  /**
+   * Restore a single thread
+   * Delegates actual recovery logic to Agent.resumeTask()
+   */
+  async restoreThread(threadInfo, queueStore) {
+    const { tenantId, assistantId, threadId } = threadInfo;
+    const threadParams = {
+      tenant_id: tenantId,
+      assistant_id: assistantId,
+      thread_id: threadId,
+      workspace_id: "default",
+      // TODO: Get from thread store
+      project_id: "default"
+      // TODO: Get from thread store
+    };
+    const agent = this.getAgent(threadParams);
+    await agent.resumeTask();
+    console.log(`[AgentInstanceManager] Restored thread ${threadId}`);
+  }
 };
 var agentInstanceManager = AgentInstanceManager.getInstance();