create-openclaw-bot 5.8.2 → 5.8.4

package/dist/server/local-server.js

@@ -13,7 +13,7 @@ function loadSharedModule(modulePath, globalName) {
   if (loaded && Object.keys(loaded).length > 0) return loaded;
   return globalThis[globalName] || loaded || {};
 }
-const { buildWorkspaceFileMap } = loadSharedModule('../setup/shared/workspace-gen.js', '__openclawWorkspace');
+const { buildWorkspaceFileMap, buildCronjobSkillMd, buildInfographicGeneratorSkillMd, buildInfographicGeneratorJs } = loadSharedModule('../setup/shared/workspace-gen.js', '__openclawWorkspace');
 const { buildOpenclawJson, buildEnvFileContent, buildExecApprovalsJson } = loadSharedModule('../setup/shared/bot-config-gen.js', '__openclawBotConfig');
 const { buildDockerArtifacts } = loadSharedModule('../setup/shared/docker-gen.js', '__openclawDockerGen');
 const { OPENCLAW_NPM_SPEC, NINE_ROUTER_NPM_SPEC, build9RouterProviderConfig, get9RouterBaseUrl } = loadSharedModule('../setup/shared/common-gen.js', '__openclawCommon');
@@ -27,6 +27,7 @@ const STATE_FILE = '.openclaw-setup-state.json';
 const DEFAULT_MODEL = 'smart-route';
 const logClients = new Set();
 let zaloLoginInFlight = false;
+let activeServerInstance = null;
 const state = {
   installing: false,
   installed: false,
@@ -74,6 +75,30 @@ function detectOs() {
   return 'linux-desktop';
 }
 
+// Blacklist of Windows system/large directories that should never be walked
+const SYSTEM_DIR_BLACKLIST = new Set([
+  'windows', 'program files', 'program files (x86)', 'programdata',
+  '$recycle.bin', 'system volume information', 'recovery', 'boot',
+  'perflogs', 'msocache', 'intel', 'amd', 'nvidia',
+  '$windows.~bt', '$windows.~ws', 'config.msi', 'documents and settings',
+  'swapfile.sys', 'pagefile.sys', 'hiberfil.sys',
+]);
+
+/** Discover all available drive letters on Windows (A-Z). Returns ['C:\\', 'D:\\', ...] */
+async function getAvailableDrives() {
+  if (process.platform !== 'win32') return ['/'];
+  const drives = [];
+  for (let code = 65; code <= 90; code++) { // A-Z
+    const letter = String.fromCharCode(code);
+    const drive = `${letter}:\\`;
+    try {
+      await fsp.access(drive);
+      drives.push(drive);
+    } catch {}
+  }
+  return drives.length ? drives : ['C:\\', 'D:\\'];
+}
+
 function recommendedMode(osChoice) {
   if (osChoice === 'win' || osChoice === 'macos') return 'docker';
   return 'native';
@@ -566,6 +591,26 @@ function ensureZaloApiChannel(cfg, token) {
   });
 }
 
+function ensureZaloModPluginConfig(entry, cfg) {
+  entry.hooks = entry.hooks || {};
+  entry.hooks.allowConversationAccess = true;
+  entry.config = entry.config || {};
+  // Auto-assign dashboardPort = gateway port + 1
+  if (!entry.config.dashboardPort) {
+    const gwPort = Number(cfg.gateway?.port) || state.gatewayPort || 18789;
+    entry.config.dashboardPort = gwPort + 1;
+  }
+  // Auto-assign botName from first agent name
+  if (!entry.config.botName) {
+    const agentName = cfg.agents?.list?.[0]?.name;
+    if (agentName) entry.config.botName = agentName;
+  }
+  // Auto-assign zaloDisplayNames from botName
+  if ((!entry.config.zaloDisplayNames || entry.config.zaloDisplayNames.length === 0) && entry.config.botName) {
+    entry.config.zaloDisplayNames = [entry.config.botName];
+  }
+}
+
 function readProjectConfig(projectDir) {
   const cfgPath = join(projectDir || '', '.openclaw', 'openclaw.json');
   if (!projectDir || !existsSync(cfgPath)) return null;
@@ -857,7 +902,32 @@ async function buildBotStatus() {
     resolveProjectRuntimeVersions(state.projectDir, state.mode).catch(() => ({ openclaw: '', nineRouter: '', node: process.version || '' })),
   ]);
   const credentials = await readBotCredentials(state.projectDir).catch(() => ({ openclawToken: '', nineRouterApiKey: '' }));
-  return { ...state, gatewayStatus, routerStatus, bots, credentials, runtimeVersions };
+  
+  let activeModel = 'smart-route';
+  let activeProvider = '9Router';
+  if (state.projectDir) {
+    const cfgPath = join(state.projectDir, '.openclaw', 'openclaw.json');
+    if (existsSync(cfgPath)) {
+      try {
+        const raw = await fsp.readFile(cfgPath, 'utf8');
+        const cfg = JSON.parse(raw);
+        const modelStr = cfg.agents?.defaults?.model?.primary || cfg.agents?.list?.[0]?.model?.primary || 'smart-route';
+        if (modelStr.includes('/')) {
+          const parts = modelStr.split('/');
+          activeProvider = parts[0];
+          activeModel = parts.slice(1).join('/');
+        } else {
+          activeModel = modelStr;
+          activeProvider = cfg.models?.providers?.openai ? 'openai' : '9router';
+        }
+      } catch (e) {}
+    }
+  }
+
+  const cap = (s) => String(s).toLowerCase() === 'openai' ? 'OpenAI' : String(s).toLowerCase() === '9router' ? '9Router' : s;
+  activeProvider = cap(activeProvider);
+
+  return { ...state, gatewayStatus, routerStatus, bots, credentials, runtimeVersions, activeModel, activeProvider };
 }
 
 async function createBotInProject(projectDir, body = {}, runtime = {}) {
@@ -889,10 +959,16 @@ async function createBotInProject(projectDir, body = {}, runtime = {}) {
     agentMetas: [],
   }));
 
-  const existingAgentCount = cfg.agents.list.length;
   const used = new Set(cfg.agents.list.map((a) => a.id));
   const botName = uniqueDisplayName(requestedBotName, new Set(cfg.agents.list.map((a) => a.name || a.id)));
-  const agentId = uniqueSlug(slugify(botName), used);
+  let agentId = body.agentId ? String(body.agentId).trim().toLowerCase().replace(/[^a-z0-9-_]+/g, '-') : '';
+  if (!agentId) {
+    agentId = uniqueSlug(slugify(botName), used);
+  } else {
+    if (used.has(agentId)) {
+      throw httpError(400, `Bot ID "${agentId}" đã tồn tại. Vui lòng chọn ID khác.`);
+    }
+  }
   const workspaceDir = `workspace-${agentId}`;
   const model = cfg.agents.defaults?.model?.primary || cfg.agents.list[0]?.model?.primary || DEFAULT_MODEL;
   cfg.agents.list.push({
@@ -935,6 +1011,8 @@ async function createBotInProject(projectDir, body = {}, runtime = {}) {
   if (existsSync(cfgPath)) await fsp.copyFile(cfgPath, `${cfgPath}.bak`);
   await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
 
+  const hasScheduler = !!(cfg.tools?.alsoAllow || []).includes('group:automation');
+  const hasImageGen = !!(cfg.skills?.entries?.['image-gen']?.enabled);
   const files = buildWorkspaceFileMap({
     isVi: true,
     botName,
@@ -945,6 +1023,8 @@ async function createBotInProject(projectDir, body = {}, runtime = {}) {
     agentWorkspaceDir: workspaceDir,
     workspacePath: `.openclaw/${workspaceDir}`,
     hasZaloMod: channel === 'zalo-personal',
+    hasScheduler,
+    hasImageGen,
   });
   const wsRoot = join(openclawHome, workspaceDir);
   for (const [name, content] of Object.entries(files)) {
@@ -1033,6 +1113,8 @@ async function updateBotInProject(projectDir, agentId, body = {}, runtime = {})
     }
   }
 
+  const hasScheduler = !!(cfg.tools?.alsoAllow || []).includes('group:automation');
+  const hasImageGen = !!(cfg.skills?.entries?.['image-gen']?.enabled);
   const files = buildWorkspaceFileMap({
     isVi: true,
     botName,
@@ -1043,6 +1125,8 @@ async function updateBotInProject(projectDir, agentId, body = {}, runtime = {})
     agentWorkspaceDir: workspaceDir,
     workspacePath: `.openclaw/${workspaceDir}`,
     hasZaloMod: channel === 'zalo-personal',
+    hasScheduler,
+    hasImageGen,
   });
   const wsRoot = join(projectDir, '.openclaw', workspaceDir);
   for (const [name, content] of Object.entries(files)) {
@@ -1388,6 +1472,23 @@ async function syncDockerInfra(projectDir, force = false) {
   sendLog(`[sync] Updating Docker infrastructure files (v${existingVersion} \u2192 v${SETUP_VERSION})`);
   await fsp.writeFile(join(dockerDir, 'Dockerfile'), docker.dockerfile, 'utf8');
   await fsp.writeFile(join(dockerDir, 'docker-compose.yml'), newCompose, 'utf8');
+  // Preserve zalo-mod dashboard port if plugin is active
+  try {
+    const syncCfg = JSON.parse(await fsp.readFile(cfgPath, 'utf8'));
+    const zmEntry = syncCfg.plugins?.entries?.['zalo-mod'] || syncCfg.plugins?.entries?.['openclaw-zalo-mod'];
+    if (zmEntry?.enabled !== false && zmEntry?.config?.dashboardPort) {
+      const dp = zmEntry.config.dashboardPort;
+      let cc = await fsp.readFile(join(dockerDir, 'docker-compose.yml'), 'utf8');
+      if (!cc.includes(`:${dp}`)) {
+        const gpStr = String(gatewayPort);
+        cc = cc.replace(
+          new RegExp(`^(\\s*-\\s*"(?:\\d+:)?${gpStr}(?::${gpStr})?"\\s*)$`, 'm'),
+          `$1\n      - "127.0.0.1:${dp}:${dp}"  # zalo-mod dashboard`
+        );
+        await fsp.writeFile(join(dockerDir, 'docker-compose.yml'), cc, 'utf8');
+      }
+    }
+  } catch {}
   await fsp.writeFile(entrypointPath, entryScript, 'utf8');
   if (docker.syncScript) await fsp.writeFile(join(dockerDir, 'sync.js'), docker.syncScript, 'utf8');
   if (docker.patchScript) await fsp.writeFile(join(dockerDir, 'patch-9router.js'), docker.patchScript, 'utf8');
@@ -1466,10 +1567,9 @@ async function writeCoreProject({ projectDir, osChoice, mode, gatewayPort = 1878
   await fsp.mkdir(openclawHome, { recursive: true });
   await fsp.mkdir(join(openclawHome, 'plugin-runtime-deps'), { recursive: true });
 
-  const selectedSkills = [];
-  const botName = 'OpenClaw Bot';
-  const agentMetas = [{ agentId: 'bot', name: botName, description: 'Personal OpenClaw assistant' }];
-  const common = { botName, channelKey: 'telegram', providerKey: '9router', model: DEFAULT_MODEL, deployMode: mode, osChoice, selectedSkills, skills: dataExport.SKILLS || [], agentMetas, gatewayPort, routerPort };
+  const selectedSkills = ['memory', 'image-gen', 'web-search'];
+  const agentMetas = [];
+  const common = { channelKey: 'telegram', providerKey: '9router', model: DEFAULT_MODEL, deployMode: mode, osChoice, selectedSkills, skills: dataExport.SKILLS || [], agentMetas, gatewayPort, routerPort };
   const cfg = buildOpenclawJson(common);
   const env = buildEnvFileContent({ ...common, apiKey: '', botToken: '' });
   const approvals = buildExecApprovalsJson({ agentMetas });
@@ -1478,26 +1578,6 @@ async function writeCoreProject({ projectDir, osChoice, mode, gatewayPort = 1878
   await fsp.writeFile(join(projectDir, '.env'), env, 'utf8');
   await fsp.writeFile(join(openclawHome, 'exec-approvals.json'), JSON.stringify(approvals, null, 2), 'utf8');
 
-  const workspaceDir = 'workspace-bot';
-  const workspace = buildWorkspaceFileMap({
-    isVi: true,
-    botName,
-    channelKey: 'telegram',
-    providerKey: '9router',
-    selectedSkills,
-    skillsCatalog: dataExport.SKILLS || [],
-    agentMetas,
-    deployMode: mode,
-    osChoice,
-    agentWorkspaceDir: workspaceDir,
-    workspacePath: `.openclaw/${workspaceDir}`,
-  });
-  const wsRoot = join(openclawHome, workspaceDir);
-  for (const [name, content] of Object.entries(workspace)) {
-    await fsp.mkdir(dirname(join(wsRoot, name)), { recursive: true });
-    await fsp.writeFile(join(wsRoot, name), content || '', 'utf8');
-  }
-
   if (mode === 'docker') {
     const projectName = slugify(basename(projectDir)) || 'bot';
     const docker = buildDockerArtifacts({
@@ -1551,7 +1631,7 @@ async function installCore({ osChoice, mode, projectDir, gatewayPort = 18789, ro
       await fsp.mkdir(dockerDir, { recursive: true });
       const envContent = existsSync(rootEnvPath)
         ? await fsp.readFile(rootEnvPath, 'utf8')
-        : buildEnvFileContent({ botName: 'OpenClaw Bot', channelKey: 'telegram', providerKey: '9router', deployMode: mode, osChoice, selectedSkills: [], skills: dataExport.SKILLS || [], agentMetas: [{ agentId: 'bot', name: 'OpenClaw Bot', description: 'Personal OpenClaw assistant' }], apiKey: '', botToken: '' });
+        : buildEnvFileContent({ channelKey: 'telegram', providerKey: '9router', deployMode: mode, osChoice, selectedSkills: [], skills: dataExport.SKILLS || [], agentMetas: [], apiKey: '', botToken: '' });
       await fsp.writeFile(dockerEnvPath, envContent, 'utf8');
       sendLog(`Docker env ready: ${dockerEnvPath}`);
       await run('docker', ['compose', 'up', '-d', '--build'], { cwd: dockerDir });
@@ -1678,11 +1758,16 @@ async function findLatestProject(rootProjectDir) {
     join(rootProjectDir, DEFAULT_PROJECT_NAME),
     dirname(rootProjectDir),
     os.homedir(),
-    'D:\\tmp',
   ];
-  for (const drive of ['D:\\', 'E:\\']) {
+  // Scan all available drives, walking top-level dirs but skipping system folders
+  const drives = await getAvailableDrives();
+  for (const drive of drives) {
     const entries = await fsp.readdir(drive, { withFileTypes: true }).catch(() => []);
-    for (const e of entries) if (e.isDirectory() && !e.name.startsWith('$')) roots.push(join(drive, e.name));
+    for (const e of entries) {
+      if (e.isDirectory() && !e.name.startsWith('$') && !SYSTEM_DIR_BLACKLIST.has(e.name.toLowerCase())) {
+        roots.push(join(drive, e.name));
+      }
+    }
   }
   const candidates = [];
   async function walk(dir, depth = 0) {
@@ -1693,7 +1778,11 @@ async function findLatestProject(rootProjectDir) {
       return;
     }
     const entries = await fsp.readdir(dir, { withFileTypes: true }).catch(() => []);
-    for (const e of entries) if (e.isDirectory() && !e.name.startsWith('.') && e.name !== 'node_modules') await walk(join(dir, e.name), depth + 1);
+    for (const e of entries) {
+      if (e.isDirectory() && !e.name.startsWith('.') && e.name !== 'node_modules' && !SYSTEM_DIR_BLACKLIST.has(e.name.toLowerCase())) {
+        await walk(join(dir, e.name), depth + 1);
+      }
+    }
   }
   for (const r of roots) await walk(r);
   candidates.sort((a, b) => b.mtimeMs - a.mtimeMs);
@@ -1706,10 +1795,10 @@ async function discoverProjects(rootProjectDir) {
     rootProjectDir,
     dirname(rootProjectDir),
     process.env.OPENCLAW_HOME ? dirname(process.env.OPENCLAW_HOME) : '',
-    'D:\\tmp',
-    'D:\\',
-    'E:\\',
   ];
+  // Add all available drives for scanning
+  const drives = await getAvailableDrives();
+  for (const drive of drives) roots.push(drive);
   const seen = new Set();
   const hits = [];
   async function walk(dir, depth = 0) {
@@ -1743,7 +1832,7 @@ async function discoverProjects(rootProjectDir) {
     const entries = await fsp.readdir(full, { withFileTypes: true }).catch(() => []);
     for (const e of entries) {
       if (!e.isDirectory()) continue;
-      if (e.name === 'node_modules' || e.name.startsWith('.git')) continue;
+      if (e.name === 'node_modules' || e.name.startsWith('.git') || SYSTEM_DIR_BLACKLIST.has(e.name.toLowerCase())) continue;
       await walk(join(full, e.name), depth + 1);
     }
   }
@@ -1897,72 +1986,23 @@ async function applyFeatureToggle(projectDir, agentId, kind, id, enabled) {
   const k = `${kind}:${id}`;
 
   if (kind === 'skill' && id === 'browser') {
+    delete cfg.browser;
+    cfg.plugins = cfg.plugins || { entries: {} };
+    cfg.plugins.entries = cfg.plugins.entries || {};
+    const aliases = ['browser-automation', 'openclaw-browser-automation'];
+    const existingKey = aliases.find((a) => cfg.plugins.entries[a]) || aliases[0];
+    cfg.plugins.entries[existingKey] = cfg.plugins.entries[existingKey] || {};
+    cfg.plugins.entries[existingKey].enabled = !!enabled;
+    cfg.plugins.allow = cfg.plugins.allow || [];
     if (enabled) {
-      cfg.browser = {
-        enabled: true,
-        defaultProfile: 'host-chrome',
-        profiles: { 'host-chrome': { cdpUrl: 'http://127.0.0.1:9222', color: '#4285F4' } },
-      };
-      const isHeadlessServer = process.platform === 'linux';
-      const docVariant = 'cli-server';
-
-      for (const a of cfg.agents.list) {
-        const wm = buildWorkspaceFileMap({
-          isVi: true,
-          botName: a.name || a.id,
-          botDesc: '',
-          hasBrowser: false,
-          hasScheduler: true,
-          workspacePath: `.openclaw/${workspaceRelForAgent(a, cfg, projectDir)}/`,
-          agentWorkspaceDir: workspaceRelForAgent(a, cfg, projectDir),
-          variant: cfg.agents.list.length > 1 ? 'relay' : 'single',
-          browserDocVariant: docVariant,
-        });
-        const browserDoc = wm['BROWSER.md'] || '# BROWSER';
-        const browserTool = wm['browser-tool.js'] || '';
-        const bf = await readWorkspaceText(projectDir, a, 'BROWSER.md');
-        await fsp.writeFile(bf.file, browserDoc, 'utf8');
-        const bt = await readWorkspaceText(projectDir, a, 'browser-tool.js');
-        if (browserTool) await fsp.writeFile(bt.file, browserTool, 'utf8');
-        
-        const af = await readWorkspaceText(projectDir, a, 'AGENTS.md');
-        const agentsManaged = upsertManagedBlock(af.content, 'BROWSER_LINK', '- Browser docs: `BROWSER.md`');
-        await fsp.writeFile(af.file, agentsManaged, 'utf8');
-
-        // Add to TOOLS.md
-        const tf = await readWorkspaceText(projectDir, a, 'TOOLS.md');
-        const browserGuide = isHeadlessServer
-          ? `## 🌐 Browser Automation
-- Xem hướng dẫn chi tiết tại **BROWSER.md**
-- Script điều khiển: \`browser-tool.js\`
-- Chế độ hiện tại: Chạy ngầm độc lập qua Docker hoặc Xvfb trên VPS.
-- **Tìm kiếm Web:** Nếu không có công cụ Web Search (hoặc Web Search không khả dụng/bị lỗi), hãy **luôn sử dụng ngay công cụ terminal (exec/run_command) để chạy lệnh: \`node search-tool.js "<từ khóa>" 5\`**! Lệnh này sẽ tự động chạy ngầm qua DuckDuckGo/Google/Bing bằng trình duyệt ngầm tàng hình của bạn và trả về kết quả JSON sạch ngay lập tức. Tuyệt đối KHÔNG được mở trình duyệt thủ công, chụp ảnh màn hình hay click tìm kiếm bằng tay từng bước!
-- Nếu browser lỗi, thử lại 1 lần rồi mới báo user với lỗi cụ thể`
-          : `## 🌐 Browser Automation
-- Xem hướng dẫn chi tiết tại **BROWSER.md**
-- Script điều khiển: \`browser-tool.js\`
-- Chế độ hiện tại: 
-  - **Mặc định:** Chạy ngầm độc lập qua Docker hoặc Server.
-  - **Chế độ xem Chrome thật:** Chạy file \`start-chrome-debug.bat\` / \`start-chrome-debug.sh\` trên host trước để bot kết nối điều khiển trực quan.
-- Kết nối mặc định: \`http://127.0.0.1:9222\`
-- **Tìm kiếm Web:** Nếu không có công cụ Web Search (hoặc Web Search không khả dụng/bị lỗi), hãy **luôn sử dụng ngay công cụ terminal (exec/run_command) để chạy lệnh: \`node search-tool.js "<từ khóa>" 5\`**! Lệnh này sẽ tự động chạy ngầm qua DuckDuckGo/Google/Bing bằng trình duyệt ngầm tàng hình của bạn và trả về kết quả JSON sạch ngay lập tức. Tuyệt đối KHÔNG được mở trình duyệt thủ công, chụp ảnh màn hình hay click tìm kiếm bằng tay từng bước!
-- Nếu browser lỗi, thử lại 1 lần rồi mới báo user với lỗi cụ thể`;
-        await fsp.writeFile(tf.file, upsertManagedBlock(tf.content, 'BROWSER_GUIDE', browserGuide), 'utf8');
-      }
+      if (!cfg.plugins.allow.includes(existingKey)) cfg.plugins.allow.push(existingKey);
     } else {
-      delete cfg.browser;
+      cfg.plugins.allow = cfg.plugins.allow.filter((x) => x !== existingKey);
       for (const a of cfg.agents.list) {
         const bf = await readWorkspaceText(projectDir, a, 'BROWSER.md');
         if (existsSync(bf.file)) await fsp.rm(bf.file, { force: true });
         const bt = await readWorkspaceText(projectDir, a, 'browser-tool.js');
         if (existsSync(bt.file)) await fsp.rm(bt.file, { force: true });
-        
-        const af = await readWorkspaceText(projectDir, a, 'AGENTS.md');
-        await fsp.writeFile(af.file, removeManagedBlock(af.content, 'BROWSER_LINK'), 'utf8');
-
-        // Remove from TOOLS.md
-        const tf = await readWorkspaceText(projectDir, a, 'TOOLS.md');
-        await fsp.writeFile(tf.file, removeManagedBlock(tf.content, 'BROWSER_GUIDE'), 'utf8');
       }
     }
 
@@ -1985,32 +2025,17 @@ async function applyFeatureToggle(projectDir, agentId, kind, id, enabled) {
       cfg.tools.alsoAllow = Array.from(new Set([...(cfg.tools.alsoAllow || []), 'group:automation']));
       cfg.commands = cfg.commands || {};
       cfg.commands.ownerAllowFrom = Array.from(new Set([...(cfg.commands.ownerAllowFrom || []), '*']));
-      const cronGuide = `## ⏰ Cron / Lên lịch nhắc nhở (tool: \`cron\`)
-- **Tên tool chính xác:** Tên công cụ là \`cron\` (tuyệt đối không nhầm là \`native\` hay command line bên ngoài).
-- **Khi tạo cronjob mới (action \`add\`):**
-  - **TUYỆT ĐỐI KHÔNG điền trường \`agentId\`** trong object \`job\` (hãy bỏ qua/omitted trường này). Hệ thống OpenClaw sẽ tự động gán chính xác ID của bạn vào job đó.
-  - Tuyệt đối **không tự điền** \`agentId\` là \`"bot"\` hay \`"main"\`, vì làm vậy sẽ khiến cronjob thuộc về agent khác và bạn sẽ mất quyền kiểm soát/xóa nó sau này.
-- **Khi user yêu cầu tắt/bật/xóa cronjob:**
-  1. **Bước 1 (Tìm kiếm):** Gọi tool \`cron\` với action \`list\` (và \`includeDisabled: true\`) để xem danh sách tất cả cronjob đang chạy trên hệ thống và tìm đúng \`jobId\` phù hợp với yêu cầu.
-  2. **Bước 2 (Xử lý):**
-     - Để xóa: Gọi action \`remove\` với \`id\` tìm được.
-     - Để tắt/tạm dừng: Gọi action \`update\` với \`id\` và patch \`{"enabled": false}\`.
-     - Để bật lại: Gọi action \`update\` với \`id\` và patch \`{"enabled": true}\`.
-  3. **Tuyên bố trung thực:** Tuyệt đối không bao giờ trả lời "đã xóa" hay "không có" dựa trên suy đoán của bản thân mà chưa gọi tool \`cron\` để kiểm tra thực tế.
-- Khi user yêu cầu tạo nhắc nhở / lệnh tự động định kỳ, bạn hãy TỰ ĐỘNG dùng tool \`cron\` (action \`add\`) để tạo. **Tuyệt đối không** bắt user dùng crontab hay Task Scheduler chạy tay trên host.
-- Khi thao tác tool cho cron/scheduler, **không điền \`current\` vào thư mục Session**.
-- **QUAN TRỌNG VỀ TARGETING GROUP CHAT**: Khi tạo hoặc cấu hình cron job gửi tin nhắn thông báo (announce mode) đến một Group Chat, giá trị của trường \`delivery.to\` **bắt buộc** phải sử dụng tiền tố \`group:\` trước ID của group (ví dụ: \`group:3815464776067464419\` hoặc \`group:xxxx\`). Tuyệt đối không được chỉ điền ID thuần túy vì hệ thống sẽ hiểu nhầm đó là một DM chat cá nhân (direct message) và gửi sai địa chỉ.
-- Bỏ qua việc tra cứu docs nội bộ như \`cron-jobs.mdx\`; tin tưởng khả năng dùng tool hiện có để hoàn thành yêu cầu.`;
       for (const a of cfg.agents.list) {
-        const tf = await readWorkspaceText(projectDir, a, 'TOOLS.md');
-        await fsp.writeFile(tf.file, upsertManagedBlock(tf.content, 'CRON_GUIDE', cronGuide), 'utf8');
+        const sf = await readWorkspaceText(projectDir, a, 'skills/cronjob/SKILL.md');
+        await fsp.mkdir(dirname(sf.file), { recursive: true });
+        await fsp.writeFile(sf.file, buildCronjobSkillMd(true), 'utf8');
       }
     } else {
       if (cfg.tools?.alsoAllow) cfg.tools.alsoAllow = cfg.tools.alsoAllow.filter((x) => x !== 'group:automation');
       if (cfg.commands?.ownerAllowFrom) cfg.commands.ownerAllowFrom = cfg.commands.ownerAllowFrom.filter((x) => x !== '*');
       for (const a of cfg.agents.list) {
-        const tf = await readWorkspaceText(projectDir, a, 'TOOLS.md');
-        await fsp.writeFile(tf.file, removeManagedBlock(tf.content, 'CRON_GUIDE'), 'utf8');
+        const sf = await readWorkspaceText(projectDir, a, 'skills/cronjob/SKILL.md');
+        if (existsSync(sf.file)) await fsp.rm(sf.file, { force: true });
       }
     }
 
@@ -2025,6 +2050,59 @@ async function applyFeatureToggle(projectDir, agentId, kind, id, enabled) {
     }
   }
 
+  if (kind === 'skill' && id === 'image-gen') {
+    cfg.skills = cfg.skills || { entries: {} };
+    cfg.skills.entries = cfg.skills.entries || {};
+    cfg.skills.entries['image-gen'] = cfg.skills.entries['image-gen'] || {};
+    cfg.skills.entries['image-gen'].enabled = !!enabled;
+
+    for (const a of cfg.agents.list) {
+      const sf = await readWorkspaceText(projectDir, a, 'skills/infographic-generator/SKILL.md');
+      const js = await readWorkspaceText(projectDir, a, 'skills/infographic-generator/image-generator.js');
+      if (enabled) {
+        await fsp.mkdir(dirname(sf.file), { recursive: true });
+        await fsp.writeFile(sf.file, buildInfographicGeneratorSkillMd(), 'utf8');
+        await fsp.writeFile(js.file, buildInfographicGeneratorJs(), 'utf8');
+      } else {
+        if (existsSync(sf.file)) await fsp.rm(sf.file, { force: true });
+        if (existsSync(js.file)) await fsp.rm(js.file, { force: true });
+      }
+    }
+
+    // Write cfgPath early so recreation reads updated openclaw.json
+    await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
+
+    // Recreate container to apply updated openclaw.json
+    const hasDocker = existsSync(join(projectDir, 'docker', 'openclaw', 'docker-compose.yml'));
+    if (hasDocker) {
+      sendLog(`[docker] Infographic skill toggled to ${enabled}. Recreating containers...`);
+      await recreateDockerBot(projectDir).catch((err) => sendLog(`[docker] Warning: Failed to recreate container: ${err.message}`));
+    }
+  }
+
+  if (kind === 'skill' && id === 'web-search') {
+    cfg.plugins = cfg.plugins || { entries: {} };
+    cfg.plugins.entries = cfg.plugins.entries || {};
+    cfg.plugins.entries['duckduckgo'] = cfg.plugins.entries['duckduckgo'] || {};
+    cfg.plugins.entries['duckduckgo'].enabled = !!enabled;
+    cfg.plugins.allow = cfg.plugins.allow || [];
+    if (enabled) {
+      if (!cfg.plugins.allow.includes('duckduckgo')) cfg.plugins.allow.push('duckduckgo');
+    } else {
+      cfg.plugins.allow = cfg.plugins.allow.filter((x) => x !== 'duckduckgo');
+    }
+
+    // Write cfgPath early so recreation reads updated openclaw.json
+    await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
+
+    // Recreate container to apply updated openclaw.json
+    const hasDocker = existsSync(join(projectDir, 'docker', 'openclaw', 'docker-compose.yml'));
+    if (hasDocker) {
+      sendLog(`[docker] Web Search skill toggled to ${enabled}. Recreating containers...`);
+      await recreateDockerBot(projectDir).catch((err) => sendLog(`[docker] Warning: Failed to recreate container: ${err.message}`));
+    }
+  }
+
   if (kind === 'plugin') {
     cfg.plugins = cfg.plugins || { entries: {} };
     cfg.plugins.entries = cfg.plugins.entries || {};
@@ -2038,13 +2116,31 @@ async function applyFeatureToggle(projectDir, agentId, kind, id, enabled) {
     const existingKey = aliases.find((a) => cfg.plugins.entries[a]) || aliases[0];
     cfg.plugins.entries[existingKey] = cfg.plugins.entries[existingKey] || {};
     cfg.plugins.entries[existingKey].enabled = !!enabled;
-    if (existingKey === 'zalo-mod') {
-      cfg.plugins.entries[existingKey].hooks = cfg.plugins.entries[existingKey].hooks || {};
-      cfg.plugins.entries[existingKey].hooks.allowConversationAccess = true;
+    if (existingKey === 'zalo-mod' || existingKey === 'openclaw-zalo-mod') {
+      ensureZaloModPluginConfig(cfg.plugins.entries[existingKey], cfg);
     }
     // Only add the canonical config key to allow list (not all aliases)
     cfg.plugins.allow = cfg.plugins.allow || [];
     if (!cfg.plugins.allow.includes(existingKey)) cfg.plugins.allow.push(existingKey);
+    // Auto-expose zalo-mod dashboard port in docker-compose.yml when enabling
+    if (enabled && (existingKey === 'zalo-mod' || existingKey === 'openclaw-zalo-mod')) {
+      const composeFile = join(projectDir, 'docker', 'openclaw', 'docker-compose.yml');
+      if (existsSync(composeFile)) {
+        try {
+          let composeContent = await fsp.readFile(composeFile, 'utf8');
+          const dashPort = cfg.plugins.entries[existingKey].config?.dashboardPort;
+          if (dashPort && !composeContent.includes(`:${dashPort}`)) {
+            const gwPortStr = String(Number(cfg.gateway?.port) || state.gatewayPort || 18789);
+            composeContent = composeContent.replace(
+              new RegExp(`^(\\s*-\\s*"(?:\\d+:)?${gwPortStr}(?::${gwPortStr})?"\\s*)$`, 'm'),
+              `$1\n      - "127.0.0.1:${dashPort}:${dashPort}"  # zalo-mod dashboard`
+            );
+            await fsp.writeFile(composeFile, composeContent, 'utf8');
+            sendLog(`[plugin] Added dashboard port ${dashPort} to docker-compose.yml`);
+          }
+        } catch (e) { sendLog(`[plugin] Warning: could not add dashboard port: ${e.message}`); }
+      }
+    }
   }
 
   await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
@@ -2062,8 +2158,15 @@ async function installFeature(projectDir, agentId, kind, id) {
 
     if (composeDir) {
       const botContainer = getBotContainerName(projectDir);
+      sendLog(`[plugin] Installing/updating clawhub:${id} inside container ${botContainer}...`);
       
-      // 1. Temporarily disable the plugin in openclaw.json and restart container to unlock files
+      const cmd = `cd /root/project && openclaw plugins install clawhub:${id} --force`;
+      const cmdOut = await runCapture('docker', ['exec', botContainer, 'sh', '-lc', cmd], { cwd: projectDir, shell: false });
+      
+      if (cmdOut) {
+         for (const line of `${cmdOut.stdout}\n${cmdOut.stderr}`.split(/\r?\n/).filter(Boolean)) sendLog(line);
+      }
+
       const cfgPath = join(projectDir, '.openclaw', 'openclaw.json');
       const pluginAliasMap = {
         'openclaw-browser-automation': ['browser-automation', 'openclaw-browser-automation'],
@@ -2072,53 +2175,12 @@ async function installFeature(projectDir, agentId, kind, id) {
         'openclaw-n8n-facebook-poster': ['openclaw-n8n-facebook-poster', 'openclaw-facebook-poster', 'facebook-poster'],
       };
       const aliases = pluginAliasMap[id] || [id];
-      
-      if (existsSync(cfgPath)) {
-        try {
-          const cfg = ensureConfigShape(JSON.parse(await fsp.readFile(cfgPath, 'utf8')));
-          cfg.plugins = cfg.plugins || { entries: {} };
-          cfg.plugins.entries = cfg.plugins.entries || {};
-          const existingKey = aliases.find((a) => cfg.plugins.entries[a]) || aliases[0];
-          
-          if (cfg.plugins.entries[existingKey]?.enabled) {
-            sendLog(`[plugin] Temporarily disabling ${existingKey} and restarting bot to release file locks...`);
-            cfg.plugins.entries[existingKey].enabled = false;
-            await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
-            await run('docker', ['restart', botContainer], { shell: false }).catch(() => {});
-            // Sleep 2 seconds to let container fully boot and release locks
-            await new Promise((resolve) => setTimeout(resolve, 2000));
-          }
-        } catch (_) {}
-      }
-
-      sendLog(`[plugin] Installing clawhub:${id} inside container ${botContainer}...`);
-      
-      let installSuccess = true;
-      const cleanCmd = `cd /root/project && (openclaw plugins uninstall ${id} --force 2>/dev/null || true) && (openclaw plugins uninstall ${id.replace('openclaw-', '')} --force 2>/dev/null || true) && rm -rf .openclaw/extensions/${id} .openclaw/extensions/${id.replace('openclaw-', '')} && openclaw plugins install clawhub:${id}`;
-      const cmdOut = await runCapture('docker', ['exec', botContainer, 'sh', '-lc', cleanCmd], { cwd: projectDir, shell: false });
-      
-      if (cmdOut) {
-         for (const line of `${cmdOut.stdout}\n${cmdOut.stderr}`.split(/\r?\n/).filter(Boolean)) sendLog(line);
-      }
 
       if (cmdOut.code !== 0) {
         const folderExists = aliases.some((a) => existsSync(join(projectDir, '.openclaw', 'extensions', a)));
         if (folderExists) {
           sendLog(`[plugin] Warning: installation reported errors, but plugin folder successfully written. Proceeding.`);
         } else {
-          installSuccess = false;
-          // Re-enable in config on failure to restore state
-          if (existsSync(cfgPath)) {
-            try {
-              const cfg = ensureConfigShape(JSON.parse(await fsp.readFile(cfgPath, 'utf8')));
-              cfg.plugins = cfg.plugins || { entries: {} };
-              cfg.plugins.entries = cfg.plugins.entries || {};
-              const existingKey = aliases.find((a) => cfg.plugins.entries[a]) || aliases[0];
-              cfg.plugins.entries[existingKey] = cfg.plugins.entries[existingKey] || {};
-              cfg.plugins.entries[existingKey].enabled = true;
-              await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
-            } catch (_) {}
-          }
           throw new Error(cmdOut.stderr || cmdOut.stdout || `Failed to install plugin ${id} inside container.`);
         }
       }
@@ -2127,25 +2189,11 @@ async function installFeature(projectDir, agentId, kind, id) {
         const cfg = ensureConfigShape(JSON.parse(await fsp.readFile(cfgPath, 'utf8')));
         cfg.plugins = cfg.plugins || { entries: {} };
         cfg.plugins.entries = cfg.plugins.entries || {};
-        const pluginAliasMap = {
-          'openclaw-browser-automation': ['browser-automation', 'openclaw-browser-automation'],
-          'openclaw-zalo-mod': ['zalo-mod', 'openclaw-zalo-mod'],
-          'openclaw-facebook-crawler': ['openclaw-facebook-crawler', 'openclaw-n8n-facebook-crawler', 'n8n-facebook-crawler'],
-          'openclaw-n8n-facebook-poster': ['openclaw-n8n-facebook-poster', 'openclaw-facebook-poster', 'facebook-poster'],
-        };
-        const aliases = pluginAliasMap[id] || [id];
         const existingKey = aliases.find((a) => cfg.plugins.entries[a]) || aliases[0];
         cfg.plugins.entries[existingKey] = cfg.plugins.entries[existingKey] || {};
         cfg.plugins.entries[existingKey].enabled = true;
-        if (existingKey === 'zalo-mod') {
-          cfg.plugins.entries[existingKey].hooks = cfg.plugins.entries[existingKey].hooks || {};
-          cfg.plugins.entries[existingKey].hooks.allowConversationAccess = true;
-          // Auto-assign dashboard port = gateway port + 1 to avoid conflicts between bots
-          const gwPort = Number(cfg.gateway?.port) || state.gatewayPort || 18789;
-          cfg.plugins.entries[existingKey].config = cfg.plugins.entries[existingKey].config || {};
-          if (!cfg.plugins.entries[existingKey].config.dashboardPort) {
-            cfg.plugins.entries[existingKey].config.dashboardPort = gwPort + 1;
-          }
+        if (existingKey === 'zalo-mod' || existingKey === 'openclaw-zalo-mod') {
+          ensureZaloModPluginConfig(cfg.plugins.entries[existingKey], cfg);
         }
         // Only add the canonical config key to allow list (not all aliases)
         if (!cfg.plugins.allow.includes(existingKey)) cfg.plugins.allow.push(existingKey);
@@ -2199,7 +2247,7 @@ async function installFeature(projectDir, agentId, kind, id) {
       sendLog(`[plugin] Installing clawhub:${id}...`);
       
       let installSuccess = true;
-      await run('openclaw', ['plugins', 'install', `clawhub:${id}`], {
+      await run('openclaw', ['plugins', 'install', `clawhub:${id}`, '--force'], {
         cwd: projectDir,
         env: openclawProjectEnv(projectDir),
         resolveOnPattern: /Installed plugin:/
@@ -2230,15 +2278,8 @@ async function installFeature(projectDir, agentId, kind, id) {
         const existingKey = aliases.find((a) => cfg.plugins.entries[a]) || aliases[0];
         cfg.plugins.entries[existingKey] = cfg.plugins.entries[existingKey] || {};
         cfg.plugins.entries[existingKey].enabled = true;
-        if (existingKey === 'zalo-mod') {
-          cfg.plugins.entries[existingKey].hooks = cfg.plugins.entries[existingKey].hooks || {};
-          cfg.plugins.entries[existingKey].hooks.allowConversationAccess = true;
-          // Auto-assign dashboard port = gateway port + 1 to avoid conflicts between bots
-          const gwPort = Number(cfg.gateway?.port) || state.gatewayPort || 18789;
-          cfg.plugins.entries[existingKey].config = cfg.plugins.entries[existingKey].config || {};
-          if (!cfg.plugins.entries[existingKey].config.dashboardPort) {
-            cfg.plugins.entries[existingKey].config.dashboardPort = gwPort + 1;
-          }
+        if (existingKey === 'zalo-mod' || existingKey === 'openclaw-zalo-mod') {
+          ensureZaloModPluginConfig(cfg.plugins.entries[existingKey], cfg);
         }
         await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
       }
@@ -2302,6 +2343,8 @@ async function getFeatureFlags(projectDir, agentId = '') {
       Array.from(installedSpecs).some((spec) => spec.includes(a)) ||
       allowSet.has(a)
     );
+  const imageGenOn = !!cfg.skills?.entries?.['image-gen']?.enabled;
+  const webSearchOn = isEnabled(['duckduckgo']);
   const aliases = {
     browser: ['openclaw-browser-automation', 'browser-automation'],
     zalo: ['openclaw-zalo-mod', 'zalo-mod'],
@@ -2311,6 +2354,8 @@ async function getFeatureFlags(projectDir, agentId = '') {
   const flags = {
     'skill:browser': browserOn,
     'skill:cron': cronOn,
+    'skill:image-gen': imageGenOn,
+    'skill:web-search': webSearchOn,
     'plugin:openclaw-browser-automation': isEnabled(aliases.browser),
     'plugin:openclaw-zalo-mod': isEnabled(aliases.zalo),
     'plugin:openclaw-facebook-crawler': isEnabled(aliases.crawler),
@@ -2502,6 +2547,7 @@ async function handler(req, res, rootProjectDir) {
             await run('npm', ['install'], { cwd: rootProjectDir });
             await run('npm', ['run', 'build'], { cwd: rootProjectDir });
             sendLog('[update-setup] Setup Wizard updated successfully! Please restart the installer.');
+            restartInstaller();
           } catch (err) {
             sendLog(`[update-setup] Error updating: ${err.message}`);
           }
@@ -2513,6 +2559,7 @@ async function handler(req, res, rootProjectDir) {
           try {
             await run('npm', ['install', '-g', 'create-openclaw-bot@latest'], { cwd: rootProjectDir });
             sendLog('[update-setup] Setup Wizard updated successfully! Please restart the installer.');
+            restartInstaller();
           } catch (err) {
             sendLog(`[update-setup] Error updating: ${err.message}`);
           }
@@ -2610,6 +2657,8 @@ async function handler(req, res, rootProjectDir) {
       skills: [
         { name: 'Browser', slug: 'browser' },
         { name: 'Cron', slug: 'cron' },
+        { name: 'Tạo ảnh Infographic', slug: 'image-gen' },
+        { name: 'Web Search', slug: 'web-search' },
       ],
       plugins: [
         { name: 'openclaw-browser-automation', package: 'openclaw-browser-automation' },
@@ -2658,13 +2707,42 @@ function openUrl(url) {
   child.unref();
 }
 
+function restartInstaller() {
+  sendLog('[update-setup] Restarting Setup Wizard to apply update...');
+  setTimeout(() => {
+    try {
+      if (activeServerInstance) {
+        activeServerInstance.close();
+      }
+      
+      const entryFile = process.argv[1];
+      const args = process.argv.slice(2);
+      
+      if (!args.includes('--no-open')) {
+        args.push('--no-open');
+      }
+      
+      const child = spawn(process.argv[0], [entryFile, ...args], {
+        detached: true,
+        stdio: 'inherit',
+        shell: process.platform === 'win32'
+      });
+      child.unref();
+      
+      process.exit(0);
+    } catch (err) {
+      sendLog(`[update-setup] Failed to restart: ${err.message}`);
+    }
+  }, 2000);
+}
+
 export async function startLocalInstaller({ host = '127.0.0.1', preferredPort = 51789, openBrowser = true, projectDir = process.cwd() } = {}) {
   const port = await findPort(host, preferredPort);
   const server = http.createServer((req, res) => handler(req, res, projectDir));
+  activeServerInstance = server;
   await new Promise((resolve) => server.listen(port, host, resolve));
   const url = `http://${host}:${port}`;
   console.log(`OpenClaw Setup UI: ${url}`);
-  console.log('Legacy CLI: create-openclaw-bot legacy');
   if (openBrowser) openUrl(url);
 }