nextclaw 0.6.11 → 0.6.13

package/dist/cli/index.js

@@ -84,24 +84,120 @@ var RestartCoordinator = class {
   }
 };
 
+// src/cli/restart-sentinel.ts
+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 RESTART_REASON_MAX_CHARS = 240;
+var RESTART_NOTE_MAX_CHARS = 600;
+var RESTART_OUTBOUND_MAX_CHARS = 1200;
+function trimTo(value, maxChars) {
+  const text = value.trim();
+  if (!text) {
+    return "";
+  }
+  if (text.length <= maxChars) {
+    return text;
+  }
+  return `${text.slice(0, Math.max(0, maxChars - 1)).trimEnd()}\u2026`;
+}
+function normalizeLine(value, maxChars) {
+  const trimmed = trimTo(value, maxChars);
+  return trimmed ? trimmed : null;
+}
+function resolveRestartSentinelPath() {
+  return resolve(getDataDir(), "run", RESTART_SENTINEL_FILENAME);
+}
+async function writeRestartSentinel(payload) {
+  const path = resolveRestartSentinelPath();
+  mkdirSync(resolve(path, ".."), { recursive: true });
+  const file = {
+    version: 1,
+    payload
+  };
+  writeFileSync(path, `${JSON.stringify(file, null, 2)}
+`, "utf-8");
+  return path;
+}
+async function consumeRestartSentinel() {
+  const path = resolveRestartSentinelPath();
+  if (!existsSync(path)) {
+    return null;
+  }
+  try {
+    const raw = readFileSync(path, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (!parsed || parsed.version !== 1 || !parsed.payload) {
+      rmSync(path, { force: true });
+      return null;
+    }
+    rmSync(path, { force: true });
+    return parsed;
+  } catch {
+    rmSync(path, { force: true });
+    return null;
+  }
+}
+function summarizeRestartSentinel(payload) {
+  const reason = normalizeLine(payload.stats?.reason ?? "", RESTART_REASON_MAX_CHARS);
+  if (payload.kind === "update.run") {
+    return payload.status === "ok" ? "\u2705 NextClaw update completed and service restarted." : "\u26A0\uFE0F NextClaw update finished with issues.";
+  }
+  if (payload.kind === "config.apply" || payload.kind === "config.patch") {
+    return payload.status === "ok" ? "\u2705 Config applied and service restarted." : "\u26A0\uFE0F Config change restart finished with issues.";
+  }
+  if (reason) {
+    return `Gateway restart complete (${reason}).`;
+  }
+  return "Gateway restart complete.";
+}
+function formatRestartSentinelMessage(payload) {
+  const lines = [summarizeRestartSentinel(payload)];
+  const note = normalizeLine(payload.message ?? "", RESTART_NOTE_MAX_CHARS);
+  if (note) {
+    lines.push(note);
+  }
+  const reason = normalizeLine(payload.stats?.reason ?? "", RESTART_REASON_MAX_CHARS);
+  if (reason && !lines.some((line) => line.includes(reason))) {
+    lines.push(`Reason: ${reason}`);
+  }
+  const message = lines.join("\n").trim();
+  return trimTo(message, RESTART_OUTBOUND_MAX_CHARS);
+}
+function parseSessionKey(sessionKey) {
+  const value = sessionKey?.trim();
+  if (!value) {
+    return null;
+  }
+  const separator = value.indexOf(":");
+  if (separator <= 0 || separator >= value.length - 1) {
+    return null;
+  }
+  return {
+    channel: value.slice(0, separator),
+    chatId: value.slice(separator + 1)
+  };
+}
+
 // src/cli/skills/clawhub.ts
 import { spawnSync } from "child_process";
-import { existsSync } from "fs";
-import { isAbsolute, join, resolve } from "path";
+import { existsSync as existsSync2 } from "fs";
+import { isAbsolute, join, resolve as resolve2 } from "path";
 async function installClawHubSkill(options) {
   const slug = options.slug.trim();
   if (!slug) {
     throw new Error("Skill slug is required.");
   }
-  const workdir = resolve(options.workdir);
-  if (!existsSync(workdir)) {
+  const workdir = resolve2(options.workdir);
+  if (!existsSync2(workdir)) {
     throw new Error(`Workdir does not exist: ${workdir}`);
   }
   const dirName = options.dir?.trim() || "skills";
-  const destinationDir = isAbsolute(dirName) ? resolve(dirName, slug) : resolve(workdir, dirName, slug);
+  const destinationDir = isAbsolute(dirName) ? resolve2(dirName, slug) : resolve2(workdir, dirName, slug);
   const skillFile = join(destinationDir, "SKILL.md");
-  if (!options.force && existsSync(destinationDir)) {
-    if (existsSync(skillFile)) {
+  if (!options.force && existsSync2(destinationDir)) {
+    if (existsSync2(skillFile)) {
       return {
         slug,
         version: options.version,
@@ -156,15 +252,15 @@ function buildClawHubArgs(slug, options) {
 
 // src/cli/update/runner.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import { resolve as resolve3 } from "path";
+import { resolve as resolve4 } from "path";
 
 // src/cli/utils.ts
-import { existsSync as existsSync2, mkdirSync, readFileSync, writeFileSync, rmSync } from "fs";
-import { join as join2, resolve as resolve2 } from "path";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, rmSync as rmSync2 } from "fs";
+import { join as join2, resolve as resolve3 } from "path";
 import { spawn } from "child_process";
 import { isIP } from "net";
 import { fileURLToPath } from "url";
-import { getDataDir, getPackageVersion as getCorePackageVersion } from "@nextclaw/core";
+import { getDataDir as getDataDir2, getPackageVersion as getCorePackageVersion } from "@nextclaw/core";
 function resolveUiConfig(config2, overrides) {
   const base = config2.ui ?? { enabled: false, host: "127.0.0.1", port: 18791, open: false };
   return { ...base, ...overrides ?? {} };
@@ -214,11 +310,11 @@ function buildServeArgs(options) {
 }
 function readServiceState() {
   const path = resolveServiceStatePath();
-  if (!existsSync2(path)) {
+  if (!existsSync3(path)) {
     return null;
   }
   try {
-    const raw = readFileSync(path, "utf-8");
+    const raw = readFileSync2(path, "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -226,20 +322,20 @@ function readServiceState() {
 }
 function writeServiceState(state) {
   const path = resolveServiceStatePath();
-  mkdirSync(resolve2(path, ".."), { recursive: true });
-  writeFileSync(path, JSON.stringify(state, null, 2));
+  mkdirSync2(resolve3(path, ".."), { recursive: true });
+  writeFileSync2(path, JSON.stringify(state, null, 2));
 }
 function clearServiceState() {
   const path = resolveServiceStatePath();
-  if (existsSync2(path)) {
-    rmSync(path, { force: true });
+  if (existsSync3(path)) {
+    rmSync2(path, { force: true });
   }
 }
 function resolveServiceStatePath() {
-  return resolve2(getDataDir(), "run", "service.json");
+  return resolve3(getDataDir2(), "run", "service.json");
 }
 function resolveServiceLogPath() {
-  return resolve2(getDataDir(), "logs", "service.log");
+  return resolve3(getDataDir2(), "logs", "service.log");
 }
 function isProcessRunning(pid) {
   try {
@@ -265,8 +361,8 @@ function resolveUiStaticDir() {
   if (envDir) {
     candidates.push(envDir);
   }
-  const cliDir = resolve2(fileURLToPath(new URL(".", import.meta.url)));
-  const pkgRoot = resolve2(cliDir, "..", "..");
+  const cliDir = resolve3(fileURLToPath(new URL(".", import.meta.url)));
+  const pkgRoot = resolve3(cliDir, "..", "..");
   candidates.push(join2(pkgRoot, "ui-dist"));
   candidates.push(join2(pkgRoot, "ui"));
   candidates.push(join2(pkgRoot, "..", "ui-dist"));
@@ -278,7 +374,7 @@ function resolveUiStaticDir() {
   candidates.push(join2(pkgRoot, "..", "..", "packages", "nextclaw-ui", "dist"));
   candidates.push(join2(pkgRoot, "..", "..", "nextclaw-ui", "dist"));
   for (const dir of candidates) {
-    if (existsSync2(join2(dir, "index.html"))) {
+    if (existsSync3(join2(dir, "index.html"))) {
       return dir;
     }
   }
@@ -305,19 +401,19 @@ function which(binary) {
   const paths = (process.env.PATH ?? "").split(":");
   for (const dir of paths) {
     const full = join2(dir, binary);
-    if (existsSync2(full)) {
+    if (existsSync3(full)) {
       return true;
     }
   }
   return false;
 }
 function resolveVersionFromPackageTree(startDir, expectedName) {
-  let current = resolve2(startDir);
+  let current = resolve3(startDir);
   while (current.length > 0) {
     const pkgPath = join2(current, "package.json");
-    if (existsSync2(pkgPath)) {
+    if (existsSync3(pkgPath)) {
       try {
-        const raw = readFileSync(pkgPath, "utf-8");
+        const raw = readFileSync2(pkgPath, "utf-8");
         const parsed = JSON.parse(raw);
         if (typeof parsed.version === "string") {
           if (!expectedName || parsed.name === expectedName) {
@@ -327,7 +423,7 @@ function resolveVersionFromPackageTree(startDir, expectedName) {
       } catch {
       }
     }
-    const parent = resolve2(current, "..");
+    const parent = resolve3(current, "..");
     if (parent === current) {
       break;
     }
@@ -336,7 +432,7 @@ function resolveVersionFromPackageTree(startDir, expectedName) {
   return null;
 }
 function getPackageVersion() {
-  const cliDir = resolve2(fileURLToPath(new URL(".", import.meta.url)));
+  const cliDir = resolve3(fileURLToPath(new URL(".", import.meta.url)));
   return resolveVersionFromPackageTree(cliDir, "nextclaw") ?? resolveVersionFromPackageTree(cliDir) ?? getCorePackageVersion();
 }
 function printAgentResponse(response) {
@@ -375,7 +471,7 @@ function runSelfUpdate(options = {}) {
     return { ok: result.status === 0, code: result.status };
   };
   if (updateCommand) {
-    const cwd = options.cwd ? resolve3(options.cwd) : process.cwd();
+    const cwd = options.cwd ? resolve4(options.cwd) : process.cwd();
     const ok = runStep("sh", ["-c", updateCommand], cwd);
     if (!ok.ok) {
       return { ok: false, error: "update command failed", strategy: "command", steps };
@@ -413,8 +509,8 @@ import {
   expandHome
 } from "@nextclaw/core";
 import { createInterface } from "readline";
-import { existsSync as existsSync3 } from "fs";
-import { resolve as resolve4 } from "path";
+import { existsSync as existsSync4 } from "fs";
+import { resolve as resolve5 } from "path";
 function loadPluginRegistry(config2, workspaceDir) {
   return loadOpenClawPlugins({
     config: config2,
@@ -691,7 +787,7 @@ var PluginCommands = class {
       process.exit(1);
     }
     const install = config2.plugins.installs?.[pluginId];
-    const isLinked = install?.source === "path" && (!install.installPath || !install.sourcePath || resolve4(install.installPath) === resolve4(install.sourcePath));
+    const isLinked = install?.source === "path" && (!install.installPath || !install.sourcePath || resolve5(install.installPath) === resolve5(install.sourcePath));
     const preview = [];
     if (hasEntry) {
       preview.push("config entry");
@@ -770,9 +866,9 @@ var PluginCommands = class {
       process.exit(1);
     }
     const normalized = fileSpec && fileSpec.ok ? fileSpec.path : pathOrSpec;
-    const resolved = resolve4(expandHome(normalized));
+    const resolved = resolve5(expandHome(normalized));
     const config2 = loadConfig();
-    if (existsSync3(resolved)) {
+    if (existsSync4(resolved)) {
       if (opts.link) {
         const probe = await installPluginFromPath({ path: resolved, dryRun: true });
         if (!probe.ok) {
@@ -1331,11 +1427,11 @@ var ChannelCommands = class {
 };
 
 // src/cli/commands/cron.ts
-import { CronService, getDataDir as getDataDir2 } from "@nextclaw/core";
+import { CronService, getDataDir as getDataDir3 } from "@nextclaw/core";
 import { join as join3 } from "path";
 var CronCommands = class {
   cronList(opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const storePath = join3(getDataDir3(), "cron", "jobs.json");
     const service = new CronService(storePath);
     const jobs = service.listJobs(Boolean(opts.all));
     if (!jobs.length) {
@@ -1355,7 +1451,7 @@ var CronCommands = class {
     }
   }
   cronAdd(opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const storePath = join3(getDataDir3(), "cron", "jobs.json");
     const service = new CronService(storePath);
     let schedule = null;
     if (opts.every) {
@@ -1380,7 +1476,7 @@ var CronCommands = class {
     console.log(`\u2713 Added job '${job.name}' (${job.id})`);
   }
   cronRemove(jobId) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const storePath = join3(getDataDir3(), "cron", "jobs.json");
     const service = new CronService(storePath);
     if (service.removeJob(jobId)) {
       console.log(`\u2713 Removed job ${jobId}`);
@@ -1389,7 +1485,7 @@ var CronCommands = class {
     }
   }
   cronEnable(jobId, opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const storePath = join3(getDataDir3(), "cron", "jobs.json");
     const service = new CronService(storePath);
     const job = service.enableJob(jobId, !opts.disable);
     if (job) {
@@ -1399,7 +1495,7 @@ var CronCommands = class {
     }
   }
   async cronRun(jobId, opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const storePath = join3(getDataDir3(), "cron", "jobs.json");
     const service = new CronService(storePath);
     const ok = await service.runJob(jobId, Boolean(opts.force));
     console.log(ok ? "\u2713 Job executed" : `Failed to run job ${jobId}`);
@@ -1408,12 +1504,12 @@ var CronCommands = class {
 
 // src/cli/commands/diagnostics.ts
 import { createServer as createNetServer } from "net";
-import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
-import { resolve as resolve5 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
+import { resolve as resolve6 } from "path";
 import {
   APP_NAME,
   getConfigPath,
-  getDataDir as getDataDir3,
+  getDataDir as getDataDir4,
   getWorkspacePath as getWorkspacePath3,
   loadConfig as loadConfig4,
   PROVIDERS as PROVIDERS3
@@ -1579,7 +1675,7 @@ var DiagnosticsCommands = class {
     const configPath = getConfigPath();
     const config2 = loadConfig4();
     const workspacePath = getWorkspacePath3(config2.agents.defaults.workspace);
-    const serviceStatePath = resolve5(getDataDir3(), "run", "service.json");
+    const serviceStatePath = resolve6(getDataDir4(), "run", "service.json");
     const fixActions = [];
     let serviceState = readServiceState();
     if (params.fix && serviceState && !isProcessRunning(serviceState.pid)) {
@@ -1618,11 +1714,11 @@ var DiagnosticsCommands = class {
     });
     const issues = [];
     const recommendations = [];
-    if (!existsSync4(configPath)) {
+    if (!existsSync5(configPath)) {
       issues.push("Config file is missing.");
       recommendations.push(`Run ${APP_NAME} init to create config files.`);
     }
-    if (!existsSync4(workspacePath)) {
+    if (!existsSync5(workspacePath)) {
       issues.push("Workspace directory does not exist.");
       recommendations.push(`Run ${APP_NAME} init to create workspace templates.`);
     }
@@ -1650,13 +1746,13 @@ var DiagnosticsCommands = class {
     return {
       generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
       configPath,
-      configExists: existsSync4(configPath),
+      configExists: existsSync5(configPath),
       workspacePath,
-      workspaceExists: existsSync4(workspacePath),
+      workspaceExists: existsSync5(workspacePath),
       model: config2.agents.defaults.model,
       providers,
       serviceStatePath,
-      serviceStateExists: existsSync4(serviceStatePath),
+      serviceStateExists: existsSync5(serviceStatePath),
       fixActions,
       process: {
         managedByState,
@@ -1706,11 +1802,11 @@ var DiagnosticsCommands = class {
     }
   }
   readLogTail(path, maxLines = 25) {
-    if (!existsSync4(path)) {
+    if (!existsSync5(path)) {
       return [];
     }
     try {
-      const lines = readFileSync2(path, "utf-8").split(/\r?\n/).filter(Boolean);
+      const lines = readFileSync3(path, "utf-8").split(/\r?\n/).filter(Boolean);
       if (lines.length <= maxLines) {
         return lines;
       }
@@ -1781,124 +1877,6 @@ import {
   ConfigSchema,
   redactConfigObject
 } from "@nextclaw/core";
-
-// src/cli/restart-sentinel.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync3, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
-import { resolve as resolve6 } from "path";
-import { getDataDir as getDataDir4 } 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;
-function trimTo(value, maxChars) {
-  const text = value.trim();
-  if (!text) {
-    return "";
-  }
-  if (text.length <= maxChars) {
-    return text;
-  }
-  return `${text.slice(0, Math.max(0, maxChars - 1)).trimEnd()}\u2026`;
-}
-function normalizeLine(value, maxChars) {
-  const trimmed = trimTo(value, maxChars);
-  return trimmed ? trimmed : null;
-}
-function resolveRestartSentinelPath() {
-  return resolve6(getDataDir4(), "run", RESTART_SENTINEL_FILENAME);
-}
-async function writeRestartSentinel(payload) {
-  const path = resolveRestartSentinelPath();
-  mkdirSync2(resolve6(path, ".."), { recursive: true });
-  const file = {
-    version: 1,
-    payload
-  };
-  writeFileSync2(path, `${JSON.stringify(file, null, 2)}
-`, "utf-8");
-  return path;
-}
-async function consumeRestartSentinel() {
-  const path = resolveRestartSentinelPath();
-  if (!existsSync5(path)) {
-    return null;
-  }
-  try {
-    const raw = readFileSync3(path, "utf-8");
-    const parsed = JSON.parse(raw);
-    if (!parsed || parsed.version !== 1 || !parsed.payload) {
-      rmSync2(path, { force: true });
-      return null;
-    }
-    rmSync2(path, { force: true });
-    return parsed;
-  } catch {
-    rmSync2(path, { force: true });
-    return null;
-  }
-}
-function summarizeRestartSentinel(payload) {
-  const reason = normalizeLine(payload.stats?.reason ?? "", RESTART_REASON_MAX_CHARS);
-  if (payload.kind === "update.run") {
-    return payload.status === "ok" ? "\u2705 NextClaw update completed and service restarted." : "\u26A0\uFE0F NextClaw update finished with issues.";
-  }
-  if (payload.kind === "config.apply" || payload.kind === "config.patch") {
-    return payload.status === "ok" ? "\u2705 Config applied and service restarted." : "\u26A0\uFE0F Config change restart finished with issues.";
-  }
-  if (reason) {
-    return `Gateway restart complete (${reason}).`;
-  }
-  return "Gateway restart complete.";
-}
-function formatRestartSentinelMessage(payload) {
-  const lines = [summarizeRestartSentinel(payload)];
-  const note = normalizeLine(payload.message ?? "", RESTART_NOTE_MAX_CHARS);
-  if (note) {
-    lines.push(note);
-  }
-  const reason = normalizeLine(payload.stats?.reason ?? "", RESTART_REASON_MAX_CHARS);
-  if (reason && !lines.some((line) => line.includes(reason))) {
-    lines.push(`Reason: ${reason}`);
-  }
-  const message = lines.join("\n").trim();
-  return trimTo(message, RESTART_OUTBOUND_MAX_CHARS);
-}
-function parseSessionKey(sessionKey) {
-  const value = sessionKey?.trim();
-  if (!value) {
-    return null;
-  }
-  const separator = value.indexOf(":");
-  if (separator <= 0 || separator >= value.length - 1) {
-    return null;
-  }
-  return {
-    channel: value.slice(0, separator),
-    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/gateway/controller.ts
 var hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
 var readConfigSnapshot = (getConfigPath4) => {
   const path = getConfigPath4();
@@ -2028,6 +2006,12 @@ var GatewayControllerImpl = class {
     return this.deps.reloader.reloadConfig(reason);
   }
   async restart(options) {
+    await this.writeRestartSentinelPayload({
+      kind: "restart",
+      status: "ok",
+      sessionKey: options?.sessionKey,
+      reason: options?.reason ?? "gateway.restart"
+    });
     await this.requestRestart(options);
     return "Restart scheduled";
   }
@@ -2499,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);
@@ -2513,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;
@@ -2542,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();
@@ -2586,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) {
@@ -2599,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();
@@ -3231,6 +3202,27 @@ var CliRuntime = class {
     }
     console.warn(result.message);
   }
+  async writeRestartSentinelFromExecContext(reason) {
+    const sessionKeyRaw = process.env.NEXTCLAW_RUNTIME_SESSION_KEY;
+    const sessionKey = typeof sessionKeyRaw === "string" ? sessionKeyRaw.trim() : "";
+    if (!sessionKey) {
+      return;
+    }
+    try {
+      await writeRestartSentinel({
+        kind: "restart",
+        status: "ok",
+        ts: Date.now(),
+        sessionKey,
+        stats: {
+          reason: reason || "cli.restart",
+          strategy: "exec-tool"
+        }
+      });
+    } catch (error) {
+      console.warn(`Warning: failed to write restart sentinel from exec context: ${String(error)}`);
+    }
+  }
   async onboard() {
     console.warn(`Warning: ${APP_NAME4} onboard is deprecated. Use "${APP_NAME4} init" instead.`);
     await this.init({ source: "onboard" });
@@ -3316,6 +3308,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     });
   }
   async restart(opts) {
+    await this.writeRestartSentinelFromExecContext("cli.restart");
     const state = readServiceState();
     if (state && isProcessRunning(state.pid)) {
       console.log(`Restarting ${APP_NAME4}...`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.6.11",
+  "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.9",
+    "@nextclaw/core": "^0.6.11",
     "@nextclaw/server": "^0.4.2",
     "@nextclaw/openclaw-compat": "^0.1.5"
   },