@nextclaw/core 0.4.8 → 0.4.9

package/dist/index.d.ts

@@ -3662,6 +3662,12 @@ type ExtensionRegistry = {
     diagnostics: ExtensionDiagnostic[];
 };
 
+type MessageToolHintsResolver = (params: {
+    sessionKey: string;
+    channel: string;
+    chatId: string;
+    accountId?: string | null;
+}) => string[];
 declare class AgentLoop {
     private options;
     private context;
@@ -3687,6 +3693,7 @@ declare class AgentLoop {
         gatewayController?: GatewayController;
         config?: Config;
         extensionRegistry?: ExtensionRegistry;
+        resolveMessageToolHints?: MessageToolHintsResolver;
     });
     private registerDefaultTools;
     private registerExtensionTools;
@@ -3698,6 +3705,7 @@ declare class AgentLoop {
         sessionKey?: string;
         channel?: string;
         chatId?: string;
+        metadata?: Record<string, unknown>;
     }): Promise<string>;
     private processMessage;
     private processSystemMessage;

package/dist/index.js

@@ -428,9 +428,9 @@ var ContextBuilder = class {
   memory;
   skills;
   contextConfig;
-  buildSystemPrompt(skillNames, sessionKey) {
+  buildSystemPrompt(skillNames, sessionKey, messageToolHints) {
     const parts = [];
-    parts.push(this.getIdentity());
+    parts.push(this.getIdentity(messageToolHints));
     const bootstrap = this.loadBootstrapFiles(sessionKey);
     if (bootstrap) {
       parts.push(`# Workspace Context
@@ -471,7 +471,7 @@ ${skillsSummary}`);
   }
   buildMessages(params) {
     const messages = [];
-    let systemPrompt = this.buildSystemPrompt(params.skillNames, params.sessionKey);
+    let systemPrompt = this.buildSystemPrompt(params.skillNames, params.sessionKey, params.messageToolHints);
     if (params.channel && params.chatId) {
       systemPrompt += `
 
@@ -509,8 +509,13 @@ Session: ${params.sessionKey}`;
     messages.push(msg);
     return messages;
   }
-  getIdentity() {
+  getIdentity(messageToolHints) {
     const now = (/* @__PURE__ */ new Date()).toLocaleString();
+    const sanitizedMessageToolHints = (messageToolHints ?? []).map((hint) => hint.trim()).filter(Boolean);
+    const messageToolHintsBlock = sanitizedMessageToolHints.length ? `
+
+### message tool hints
+${sanitizedMessageToolHints.map((hint) => `- ${hint}`).join("\n")}` : "";
     return `# ${APP_NAME} \u{1F916}
 
 You are a personal assistant running inside ${APP_NAME}.
@@ -554,7 +559,7 @@ Do not use exec/curl for provider messaging; use message/sessions_send instead.
 - Sub-agent orchestration: use subagents(action=list|steer|kill) and spawn.
 - Do not poll subagents list / sessions_list in a loop; only check on-demand.
 - If you use message (action=send) to deliver your user-visible reply, respond with ONLY: NO_REPLY (avoid duplicate replies).
-- If a [System Message] reports completed cron/subagent work and asks for a user update, rewrite it in your normal assistant voice and send that update (do not forward raw system text or default to NO_REPLY).
+- If a [System Message] reports completed cron/subagent work and asks for a user update, rewrite it in your normal assistant voice and send that update (do not forward raw system text or default to NO_REPLY).${messageToolHintsBlock}
 
 ## Reply Tags
 - [[reply_to_current]] replies to the triggering message.
@@ -2712,7 +2717,7 @@ var AgentLoop = class {
       content: params.content,
       timestamp: /* @__PURE__ */ new Date(),
       media: [],
-      metadata: {}
+      metadata: params.metadata ?? {}
     };
     const response = await this.processMessage(msg, params.sessionKey);
     return response?.content ?? "";
@@ -2734,7 +2739,8 @@ var AgentLoop = class {
     }
     session.metadata.last_channel = msg.channel;
     session.metadata.last_to = msg.chatId;
-    const accountId = msg.metadata?.account_id ?? msg.metadata?.accountId;
+    const inboundAccountId = msg.metadata?.account_id ?? msg.metadata?.accountId;
+    const accountId = inboundAccountId && inboundAccountId.trim().length > 0 ? inboundAccountId : typeof session.metadata.last_account_id === "string" && session.metadata.last_account_id.trim().length > 0 ? session.metadata.last_account_id : void 0;
     if (accountId) {
       session.metadata.last_account_id = accountId;
     }
@@ -2750,13 +2756,20 @@ var AgentLoop = class {
     if (cronTool instanceof CronTool) {
       cronTool.setContext(msg.channel, msg.chatId);
     }
+    const messageToolHints = this.options.resolveMessageToolHints?.({
+      sessionKey,
+      channel: msg.channel,
+      chatId: msg.chatId,
+      accountId: accountId ?? null
+    });
     const messages = this.context.buildMessages({
       history: this.sessions.getHistory(session),
       currentMessage: msg.content,
       media: msg.media,
       channel: msg.channel,
       chatId: msg.chatId,
-      sessionKey
+      sessionKey,
+      messageToolHints
     });
     this.sessions.addMessage(session, "user", msg.content);
     let iteration = 0;
@@ -2833,12 +2846,23 @@ var AgentLoop = class {
     if (cronTool instanceof CronTool) {
       cronTool.setContext(originChannel, originChatId);
     }
+    const accountId = msg.metadata?.account_id ?? msg.metadata?.accountId ?? (typeof session.metadata.last_account_id === "string" ? session.metadata.last_account_id : void 0);
+    if (accountId) {
+      session.metadata.last_account_id = accountId;
+    }
+    const messageToolHints = this.options.resolveMessageToolHints?.({
+      sessionKey,
+      channel: originChannel,
+      chatId: originChatId,
+      accountId: accountId ?? null
+    });
     const messages = this.context.buildMessages({
       history: this.sessions.getHistory(session),
       currentMessage: msg.content,
       channel: originChannel,
       chatId: originChatId,
-      sessionKey
+      sessionKey,
+      messageToolHints
     });
     this.sessions.addMessage(session, "user", `[System: ${msg.senderId}] ${msg.content}`);
     let iteration = 0;
@@ -2895,7 +2919,7 @@ var AgentLoop = class {
       content: finalContent,
       replyTo,
       media: [],
-      metadata: {}
+      metadata: msg.metadata ?? {}
     };
   }
 };

package/package.json

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