nextclaw 0.6.12 → 0.6.13

package/dist/cli/index.js

@@ -89,7 +89,6 @@ import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";
 import { resolve } from "path";
 import { getDataDir } from "@nextclaw/core";
 var RESTART_SENTINEL_FILENAME = "restart-sentinel.json";
-var PENDING_SYSTEM_EVENTS_KEY = "pending_system_events";
 var RESTART_REASON_MAX_CHARS = 240;
 var RESTART_NOTE_MAX_CHARS = 600;
 var RESTART_OUTBOUND_MAX_CHARS = 1200;
@@ -180,25 +179,6 @@ function parseSessionKey(sessionKey) {
     chatId: value.slice(separator + 1)
   };
 }
-function enqueuePendingSystemEvent(sessionManager, sessionKey, message) {
-  const text = message.trim();
-  if (!text) {
-    return;
-  }
-  const session = sessionManager.getOrCreate(sessionKey);
-  const queueRaw = session.metadata[PENDING_SYSTEM_EVENTS_KEY];
-  const queue = Array.isArray(queueRaw) ? queueRaw.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean) : [];
-  if (queue.at(-1) === text) {
-    return;
-  }
-  queue.push(text);
-  if (queue.length > 20) {
-    queue.splice(0, queue.length - 20);
-  }
-  session.metadata[PENDING_SYSTEM_EVENTS_KEY] = queue;
-  session.updatedAt = /* @__PURE__ */ new Date();
-  sessionManager.save(session);
-}
 
 // src/cli/skills/clawhub.ts
 import { spawnSync } from "child_process";
@@ -2503,7 +2483,7 @@ var ServiceCommands = class {
         }
       }
       await reloader.getChannels().startAll();
-      await this.wakeFromRestartSentinel({ channels: reloader.getChannels(), sessionManager });
+      await this.wakeFromRestartSentinel({ bus, sessionManager });
       await agent.run();
     } finally {
       await stopPluginChannelGateways(pluginGatewayHandles);
@@ -2517,9 +2497,6 @@ var ServiceCommands = class {
     const trimmed = value.trim();
     return trimmed || void 0;
   }
-  async sleep(ms) {
-    await new Promise((resolve10) => setTimeout(resolve10, ms));
-  }
   resolveMostRecentRoutableSessionKey(sessionManager) {
     const sessions = sessionManager.listSessions();
     let best = null;
@@ -2546,42 +2523,27 @@ var ServiceCommands = class {
     }
     return best?.key;
   }
-  async sendRestartSentinelNotice(params) {
-    const outboundBase = {
-      channel: params.channel,
-      chatId: params.chatId,
-      content: params.content,
-      media: [],
-      metadata: params.metadata
-    };
-    const variants = params.replyTo ? [
-      { ...outboundBase, replyTo: params.replyTo },
-      { ...outboundBase }
-    ] : [{ ...outboundBase }];
-    for (let variantIndex = 0; variantIndex < variants.length; variantIndex += 1) {
-      const outbound = variants[variantIndex];
-      const isLastVariant = variantIndex === variants.length - 1;
-      for (let attempt = 1; attempt <= 3; attempt += 1) {
-        try {
-          const delivered = await params.channels.deliver(outbound);
-          if (delivered) {
-            return true;
-          }
-          return false;
-        } catch (error) {
-          if (attempt < 3) {
-            await this.sleep(attempt * 500);
-            continue;
-          }
-          if (isLastVariant) {
-            console.warn(
-              `Warning: restart sentinel notify failed for ${params.channel}:${params.chatId} (attempt ${attempt}): ${String(error)}`
-            );
-          }
-        }
-      }
+  buildRestartWakePrompt(params) {
+    const lines = [
+      "System event: the gateway has restarted successfully.",
+      "Please send one short confirmation to the user that you are back online.",
+      "Do not call any tools.",
+      "Use the same language as the user's recent conversation.",
+      `Reference summary: ${params.summary}`
+    ];
+    const reason = this.normalizeOptionalString(params.reason);
+    if (reason) {
+      lines.push(`Restart reason: ${reason}`);
     }
-    return false;
+    const note = this.normalizeOptionalString(params.note);
+    if (note) {
+      lines.push(`Extra note: ${note}`);
+    }
+    const replyTo = this.normalizeOptionalString(params.replyTo);
+    if (replyTo) {
+      lines.push(`Reply target message id: ${replyTo}. If suitable, include [[reply_to:${replyTo}]].`);
+    }
+    return lines.join("\n");
   }
   async wakeFromRestartSentinel(params) {
     const sentinel = await consumeRestartSentinel();
@@ -2590,7 +2552,7 @@ var ServiceCommands = class {
     }
     await new Promise((resolve10) => setTimeout(resolve10, 750));
     const payload = sentinel.payload;
-    const message = formatRestartSentinelMessage(payload);
+    const summary = formatRestartSentinelMessage(payload);
     const sentinelSessionKey = this.normalizeOptionalString(payload.sessionKey);
     const fallbackSessionKey = sentinelSessionKey ? void 0 : this.resolveMostRecentRoutableSessionKey(params.sessionManager);
     if (!sentinelSessionKey && fallbackSessionKey) {
@@ -2603,26 +2565,31 @@ var ServiceCommands = class {
     const chatId = this.normalizeOptionalString(context?.chatId) ?? parsedSession?.chatId ?? this.normalizeOptionalString((params.sessionManager.getIfExists(sessionKey)?.metadata ?? {}).last_to);
     const replyTo = this.normalizeOptionalString(context?.replyTo);
     const accountId = this.normalizeOptionalString(context?.accountId);
-    const metadataRaw = context?.metadata;
-    const metadata = metadataRaw && typeof metadataRaw === "object" && !Array.isArray(metadataRaw) ? { ...metadataRaw } : {};
-    if (accountId && !this.normalizeOptionalString(metadata.accountId)) {
-      metadata.accountId = accountId;
-    }
     if (!channel || !chatId) {
-      enqueuePendingSystemEvent(params.sessionManager, sessionKey, message);
+      console.warn(`Warning: restart sentinel cannot resolve route for session ${sessionKey}.`);
       return;
     }
-    const delivered = await this.sendRestartSentinelNotice({
-      channels: params.channels,
-      channel,
-      chatId,
-      content: message,
-      ...replyTo ? { replyTo } : {},
+    const prompt2 = this.buildRestartWakePrompt({
+      summary,
+      reason: this.normalizeOptionalString(payload.stats?.reason),
+      note: this.normalizeOptionalString(payload.message),
+      ...replyTo ? { replyTo } : {}
+    });
+    const metadata = {
+      source: "restart-sentinel",
+      restart_summary: summary,
+      ...replyTo ? { reply_to: replyTo } : {},
+      ...accountId ? { account_id: accountId, accountId } : {}
+    };
+    await params.bus.publishInbound({
+      channel: "system",
+      senderId: "restart-sentinel",
+      chatId: `${channel}:${chatId}`,
+      content: prompt2,
+      timestamp: /* @__PURE__ */ new Date(),
+      attachments: [],
       metadata
     });
-    if (!delivered) {
-      enqueuePendingSystemEvent(params.sessionManager, sessionKey, message);
-    }
   }
   async runForeground(options) {
     const config2 = loadConfig5();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -38,7 +38,7 @@
   "dependencies": {
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
-    "@nextclaw/core": "^0.6.10",
+    "@nextclaw/core": "^0.6.11",
     "@nextclaw/server": "^0.4.2",
     "@nextclaw/openclaw-compat": "^0.1.5"
   },