nextclaw-core 0.4.2 → 0.4.4

package/dist/index.d.ts

@@ -148,7 +148,7 @@ declare class SessionManager {
     getOrCreate(key: string): Session;
     getIfExists(key: string): Session | null;
     addMessage(session: Session, role: string, content: string, extra?: Record<string, unknown>): void;
-    getHistory(session: Session, maxMessages?: number): Array<Record<string, string>>;
+    getHistory(session: Session, maxMessages?: number): Array<Record<string, unknown>>;
     clear(session: Session): void;
     private load;
     save(session: Session): void;

package/dist/index.js

@@ -982,16 +982,17 @@ var ExecTool = class extends Tool {
       "\\brm\\s+-[rf]{1,2}\\b",
       "\\bdel\\s+/[fq]\\b",
       "\\brmdir\\s+/s\\b",
-      "\\b(format|mkfs|diskpart)\\b",
       "\\bdd\\s+if=",
       ">\\s*/dev/sd",
       "\\b(shutdown|reboot|poweroff)\\b",
       ":\\(\\)\\s*\\{.*\\};\\s*:"
     ]).map((pattern) => new RegExp(pattern, "i"));
     this.allowPatterns = (options.allowPatterns ?? []).map((pattern) => new RegExp(pattern, "i"));
+    this.dangerousCommands = ["format", "diskpart", "mkfs"];
   }
   denyPatterns;
   allowPatterns;
+  dangerousCommands;
   get name() {
     return "exec";
   }
@@ -1037,6 +1038,9 @@ ${stderr}`);
   }
   guardCommand(command, cwd) {
     const normalized = command.trim().toLowerCase();
+    if (this.isDangerousCommand(normalized)) {
+      return "Error: Command blocked by safety guard (dangerous pattern detected)";
+    }
     for (const pattern of this.denyPatterns) {
       if (pattern.test(normalized)) {
         return "Error: Command blocked by safety guard (dangerous pattern detected)";
@@ -1062,6 +1066,26 @@ ${stderr}`);
     }
     return null;
   }
+  isDangerousCommand(command) {
+    const segments = command.split(/\s*(?:\|\||&&|;|\|)\s*/);
+    for (const segment2 of segments) {
+      const match = segment2.trim().match(/^(?:sudo\s+)?([^\s]+)/i);
+      if (!match) {
+        continue;
+      }
+      const token = match[1]?.toLowerCase() ?? "";
+      if (!token) {
+        continue;
+      }
+      if (this.dangerousCommands.includes(token)) {
+        return true;
+      }
+      if (token.startsWith("mkfs")) {
+        return true;
+      }
+    }
+    return false;
+  }
 };
 function truncateOutput(result, maxLen = 1e4) {
   if (result.length <= maxLen) {
@@ -2296,7 +2320,25 @@ var SessionManager = class {
   }
   getHistory(session, maxMessages = 50) {
     const recent = session.messages.length > maxMessages ? session.messages.slice(-maxMessages) : session.messages;
-    return recent.map((msg) => ({ role: msg.role, content: msg.content }));
+    return recent.map((msg) => {
+      const entry = {
+        role: msg.role,
+        content: msg.content
+      };
+      if (typeof msg.name === "string") {
+        entry.name = msg.name;
+      }
+      if (typeof msg.tool_call_id === "string") {
+        entry.tool_call_id = msg.tool_call_id;
+      }
+      if (Array.isArray(msg.tool_calls)) {
+        entry.tool_calls = msg.tool_calls;
+      }
+      if (typeof msg.reasoning_content === "string" && msg.reasoning_content) {
+        entry.reasoning_content = msg.reasoning_content;
+      }
+      return entry;
+    });
   }
   clear(session) {
     session.messages = [];
@@ -2536,6 +2578,7 @@ var AgentLoop = class {
       chatId: msg.chatId,
       sessionKey
     });
+    this.sessions.addMessage(session, "user", msg.content);
     let iteration = 0;
     let finalContent = null;
     const maxIterations = this.options.maxIterations ?? 20;
@@ -2556,9 +2599,17 @@ var AgentLoop = class {
           }
         }));
         this.context.addAssistantMessage(messages, response.content, toolCallDicts, response.reasoningContent ?? null);
+        this.sessions.addMessage(session, "assistant", response.content ?? "", {
+          tool_calls: toolCallDicts,
+          reasoning_content: response.reasoningContent ?? null
+        });
         for (const call of response.toolCalls) {
           const result = await this.tools.execute(call.name, call.arguments);
           this.context.addToolResult(messages, call.id, call.name, result);
+          this.sessions.addMessage(session, "tool", result, {
+            tool_call_id: call.id,
+            name: call.name
+          });
         }
       } else {
         finalContent = response.content;
@@ -2571,11 +2622,9 @@ var AgentLoop = class {
     const { content: cleanedContent, replyTo } = parseReplyTags(finalContent, messageId);
     finalContent = cleanedContent;
     if (isSilentReplyText(finalContent, SILENT_REPLY_TOKEN)) {
-      this.sessions.addMessage(session, "user", msg.content);
       this.sessions.save(session);
       return null;
     }
-    this.sessions.addMessage(session, "user", msg.content);
     this.sessions.addMessage(session, "assistant", finalContent);
     this.sessions.save(session);
     return {
@@ -2610,6 +2659,7 @@ var AgentLoop = class {
       chatId: originChatId,
       sessionKey
     });
+    this.sessions.addMessage(session, "user", `[System: ${msg.senderId}] ${msg.content}`);
     let iteration = 0;
     let finalContent = null;
     const maxIterations = this.options.maxIterations ?? 20;
@@ -2630,9 +2680,17 @@ var AgentLoop = class {
           }
         }));
         this.context.addAssistantMessage(messages, response.content, toolCallDicts, response.reasoningContent ?? null);
+        this.sessions.addMessage(session, "assistant", response.content ?? "", {
+          tool_calls: toolCallDicts,
+          reasoning_content: response.reasoningContent ?? null
+        });
         for (const call of response.toolCalls) {
           const result = await this.tools.execute(call.name, call.arguments);
           this.context.addToolResult(messages, call.id, call.name, result);
+          this.sessions.addMessage(session, "tool", result, {
+            tool_call_id: call.id,
+            name: call.name
+          });
         }
       } else {
         finalContent = response.content;
@@ -2645,9 +2703,9 @@ var AgentLoop = class {
     const { content: cleanedContent, replyTo } = parseReplyTags(finalContent, void 0);
     finalContent = cleanedContent;
     if (isSilentReplyText(finalContent, SILENT_REPLY_TOKEN)) {
+      this.sessions.save(session);
       return null;
     }
-    this.sessions.addMessage(session, "user", `[System: ${msg.senderId}] ${msg.content}`);
     this.sessions.addMessage(session, "assistant", finalContent);
     this.sessions.save(session);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw-core",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "private": false,
   "description": "Nextclaw runtime core (agent, channels, providers, config).",
   "type": "module",