feat: add explicit bot restart control

Author: MackDing

README.md

@@ -138,6 +138,7 @@ General:
 - `/skill off <name>` - disable a skill for the current chat
 - `/sh <command>` - run a safe allowlisted Linux command in the current project (disabled by default)
 - `/sh --confirm <command>` - confirm a dangerous command when writable mode is enabled
+- `/restart` - restart the bot process explicitly from Telegram
 - `/interrupt` - send `Ctrl+C` to current PTY session
 - `/stop` - terminate current PTY session
 - `/cron_now` - trigger daily summary immediately

src/bot/handlers.js

@@ -55,7 +55,8 @@ export function registerHandlers({
   shellManager,
   skills,
   skillRegistry,
-  scheduler
+  scheduler,
+  adminActions
 }) {
   bot.start(async (ctx) => {
     await sendChunkedMarkdown(
@@ -94,6 +95,7 @@ export function registerHandlers({
         "/skill off <name> - 禁用 skill",
         "/sh <command> - 运行受限 Linux 命令 (默认关闭)",
         "/sh --confirm <command> - 确认执行高风险命令",
+        "/restart - 重启 bot 进程",
         "/interrupt - 向 Codex CLI 发送 Ctrl+C",
         "/stop - 终止当前 chat 的 PTY 会话",
         "/cron_now - 立即触发一次日报推送",
@@ -265,17 +267,29 @@ export function registerHandlers({
     }
 
     try {
+      const actionResult = /^on$/i.test(action)
+        ? skillRegistry.enable(ctx.chat.id, rawName)
+        : skillRegistry.disable(ctx.chat.id, rawName);
       if (/^on$/i.test(action)) {
-        skillRegistry.enable(ctx.chat.id, rawName);
-      } else {
-        skillRegistry.disable(ctx.chat.id, rawName);
+        await sendChunkedMarkdown(
+          ctx,
+          [
+            actionResult.changed
+              ? `skill ${rawName} 已启用。`
+              : `skill ${rawName} 已处于启用状态。`,
+            ...formatSkillLines(actionResult.skills)
+          ].join("\n")
+        );
+        return;
       }
 
       await sendChunkedMarkdown(
         ctx,
         [
-          `skill ${rawName} 已${/^on$/i.test(action) ? "启用" : "禁用"}。`,
-          ...formatSkillLines(skillRegistry.list(ctx.chat.id))
+          actionResult.changed
+            ? `skill ${rawName} 已禁用。`
+            : `skill ${rawName} 已处于禁用状态。`,
+          ...formatSkillLines(actionResult.skills)
         ].join("\n")
       );
     } catch (error) {
@@ -293,6 +307,16 @@ export function registerHandlers({
     );
   });
 
+  bot.command("restart", async (ctx) => {
+    if (!adminActions?.restart) {
+      await sendChunkedMarkdown(ctx, "当前环境未启用 bot 重启控制。");
+      return;
+    }
+
+    await sendChunkedMarkdown(ctx, "正在重启 bot 进程...");
+    await adminActions.restart();
+  });
+
   bot.command("exec", async (ctx) => {
     const task = extractCommandPayload(ctx.message.text, "exec");
     if (!task) {
@@ -527,6 +551,10 @@ export function registerHandlers({
   bot.on("text", async (ctx) => {
     const text = ctx.message.text?.trim() || "";
     if (!text) return;
+    if (/^(重启\s*bot|重启机器人|restart bot)$/i.test(text)) {
+      await sendChunkedMarkdown(ctx, "请使用 /restart，而不是把它当作普通消息发送。");
+      return;
+    }
     if (/^\/\s+\S+/.test(text)) {
       await sendChunkedMarkdown(
         ctx,

src/index.js

@@ -1,3 +1,5 @@
+import { spawn } from "node:child_process";
+import process from "node:process";
 import { Telegraf } from "telegraf";
 import { loadConfig } from "./config.js";
 import { RuntimeStateStore } from "./runtimeStateStore.js";
@@ -28,6 +30,28 @@ async function saveRuntimeState() {
   });
 }
 
+async function restartBotProcess() {
+  await saveRuntimeState();
+
+  const bootstrapScript = [
+    "const { spawn } = require('node:child_process');",
+    "setTimeout(() => {",
+    `  const child = spawn(process.execPath, ['src/index.js'], { cwd: ${JSON.stringify(process.cwd())}, env: process.env, detached: true, stdio: 'ignore' });`,
+    "  child.unref();",
+    "}, 1500);"
+  ].join("\n");
+
+  const launcher = spawn(process.execPath, ["-e", bootstrapScript], {
+    cwd: process.cwd(),
+    env: process.env,
+    detached: true,
+    stdio: "ignore"
+  });
+  launcher.unref();
+
+  await shutdown("RESTART");
+}
+
 bot.use(createAuthMiddleware(config));
 
 const runtimeState = await stateStore.load();
@@ -76,7 +100,10 @@ registerHandlers({
   shellManager,
   skills,
   skillRegistry,
-  scheduler
+  scheduler,
+  adminActions: {
+    restart: restartBotProcess
+  }
 });
 
 bot.catch(async (error, ctx) => {

src/orchestrator/mcpClient.js

@@ -146,21 +146,34 @@ export class McpClient {
       throw new Error(`Unknown MCP server: ${serverName}`);
     }
 
+    if (this.disabledServers.has(serverName)) {
+      const current = this.listServers().find((server) => server.name === serverName) || null;
+      return current ? { ...current, changed: false } : null;
+    }
+
     this.disabledServers.add(serverName);
     await this.disconnectServer(serverName);
     this.onChange?.(this.exportState());
-    return this.listServers().find((server) => server.name === serverName) || null;
+    const current = this.listServers().find((server) => server.name === serverName) || null;
+    return current ? { ...current, changed: true } : null;
   }
 
   async enableServer(serverName) {
     if (!this.hasServer(serverName)) {
       throw new Error(`Unknown MCP server: ${serverName}`);
     }
 
+    if (!this.disabledServers.has(serverName) && this.isServerConnected(serverName)) {
+      const current = this.listServers().find((server) => server.name === serverName) || null;
+      return current ? { ...current, changed: false } : null;
+    }
+
+    const changed = this.disabledServers.has(serverName);
     this.disabledServers.delete(serverName);
     await this.connectServerByName(serverName);
     this.onChange?.(this.exportState());
-    return this.listServers().find((server) => server.name === serverName) || null;
+    const current = this.listServers().find((server) => server.name === serverName) || null;
+    return current ? { ...current, changed } : null;
   }
 
   exportState() {

src/orchestrator/skillRegistry.js

@@ -47,17 +47,29 @@ export class SkillRegistry {
   enable(chatId, name) {
     const normalized = this.ensureKnownSkill(name);
     const state = this.ensureChatState(chatId);
+    const changed = !state.enabledSkills.has(normalized);
     state.enabledSkills.add(normalized);
-    this.onChange?.(this.exportState());
-    return this.list(chatId);
+    if (changed) {
+      this.onChange?.(this.exportState());
+    }
+    return {
+      changed,
+      skills: this.list(chatId)
+    };
   }
 
   disable(chatId, name) {
     const normalized = this.ensureKnownSkill(name);
     const state = this.ensureChatState(chatId);
+    const changed = state.enabledSkills.has(normalized);
     state.enabledSkills.delete(normalized);
-    this.onChange?.(this.exportState());
-    return this.list(chatId);
+    if (changed) {
+      this.onChange?.(this.exportState());
+    }
+    return {
+      changed,
+      skills: this.list(chatId)
+    };
   }
 
   exportState() {

src/orchestrator/skills/mcpSkill.js

@@ -109,7 +109,9 @@ export class McpSkill {
 
       const result = await this.mcpClient.enableServer(serverName);
       return {
-        text: `${result.name} 已启用。connected: ${result.connected ? "yes" : "no"}`
+        text: result.changed
+          ? `${result.name} 已启用。connected: ${result.connected ? "yes" : "no"}`
+          : `${result.name} 已处于启用状态。connected: ${result.connected ? "yes" : "no"}`
       };
     }
 
@@ -121,7 +123,9 @@ export class McpSkill {
 
       const result = await this.mcpClient.disableServer(serverName);
       return {
-        text: `${result.name} 已禁用。connected: ${result.connected ? "yes" : "no"}`
+        text: result.changed
+          ? `${result.name} 已禁用。connected: ${result.connected ? "yes" : "no"}`
+          : `${result.name} 已处于禁用状态。connected: ${result.connected ? "yes" : "no"}`
       };
     }
 

tests/mcpClient.test.js

@@ -55,11 +55,13 @@ test("mcp client disable and enable update runtime state", async () => {
     });
   };
 
-  await client.disableServer("context7");
+  const disabled = await client.disableServer("context7");
+  assert.equal(disabled.changed, true);
   assert.equal(client.isServerEnabled("context7"), false);
   assert.equal(client.isServerConnected("context7"), false);
 
-  await client.enableServer("context7");
+  const enabled = await client.enableServer("context7");
+  assert.equal(enabled.changed, true);
   assert.equal(client.isServerEnabled("context7"), true);
   assert.equal(client.isServerConnected("context7"), true);
   assert.equal(connectCalls, 1);
@@ -105,3 +107,23 @@ test("mcp client exports and restores disabled server state", () => {
   assert.equal(client.isServerEnabled("sequential-thinking"), false);
   assert.equal(client.isServerEnabled("context7"), true);
 });
+
+test("mcp client reports idempotent enable and disable operations", async () => {
+  const client = createClient();
+  client.connectServer = async (server) => {
+    client.connections.set(server.name, {
+      transport: {
+        close: async () => {}
+      }
+    });
+  };
+  client.connections.set("context7", {
+    transport: {
+      close: async () => {}
+    }
+  });
+
+  assert.equal((await client.enableServer("context7")).changed, false);
+  assert.equal((await client.disableServer("context7")).changed, true);
+  assert.equal((await client.disableServer("context7")).changed, false);
+});

tests/mcpSkill.test.js

@@ -55,3 +55,28 @@ test("mcp skill returns expanded help text when no subcommand is provided", asyn
   assert.match(result.text, /\/mcp list/);
   assert.match(result.text, /\/mcp status \[server\]/);
 });
+
+test("mcp skill returns idempotent enable feedback", async () => {
+  const skill = new McpSkill({
+    mcpClient: {
+      hasServers: () => true,
+      listServers: () => [],
+      reconnectServer: async () => null,
+      enableServer: async (name) => ({
+        name,
+        enabled: true,
+        connected: true,
+        changed: false
+      }),
+      disableServer: async () => null,
+      listTools: async () => [],
+      callTool: async () => ""
+    }
+  });
+
+  const result = await skill.execute({
+    text: "/mcp enable context7"
+  });
+
+  assert.match(result.text, /已处于启用状态/);
+});

tests/skillRegistry.test.js

@@ -20,12 +20,14 @@ test("skill registry toggles skills per chat without affecting other chats", ()
     mcp: {}
   });
 
-  registry.disable(1, "github");
+  const disabled = registry.disable(1, "github");
 
+  assert.equal(disabled.changed, true);
   assert.equal(registry.isEnabled(1, "github"), false);
   assert.equal(registry.isEnabled(2, "github"), true);
 
-  registry.enable(1, "github");
+  const enabled = registry.enable(1, "github");
+  assert.equal(enabled.changed, true);
   assert.equal(registry.isEnabled(1, "github"), true);
 });
 
@@ -54,3 +56,14 @@ test("skill registry exports and restores chat state", () => {
   assert.equal(restored.isEnabled(1, "github"), false);
   assert.equal(restored.isEnabled(1, "mcp"), true);
 });
+
+test("skill registry reports idempotent enable and disable operations", () => {
+  const registry = new SkillRegistry({
+    github: {},
+    mcp: {}
+  });
+
+  assert.equal(registry.enable(1, "github").changed, false);
+  assert.equal(registry.disable(1, "github").changed, true);
+  assert.equal(registry.disable(1, "github").changed, false);
+});