create-openclaw-bot 5.8.18 → 5.8.19

package/dist/server/local-server.js

@@ -19,7 +19,7 @@ const { buildDockerArtifacts } = loadSharedModule('../setup/shared/docker-gen.js
 const { OPENCLAW_NPM_SPEC, NINE_ROUTER_NPM_SPEC, build9RouterProviderConfig, get9RouterBaseUrl } = loadSharedModule('../setup/shared/common-gen.js', '__openclawCommon');
 const dataExport = loadSharedModule('../setup/data/index.js', '__openclawData');
 
-async function syncExecApprovals(projectDir, cfg) {
+async function syncExecApprovals(projectDir, cfg) {
   const openclawHome = join(projectDir, '.openclaw');
   const agentMetas = (cfg.agents?.list || []).map((a) => ({ agentId: a.id }));
   const approvals = buildExecApprovalsJson({ agentMetas });
@@ -41,8 +41,189 @@ async function syncExecApprovals(projectDir, cfg) {
   if (existing.socket) {
     approvals.socket = existing.socket;
   }
-  await fsp.writeFile(path2, JSON.stringify(approvals, null, 2), 'utf8');
-}
+  await fsp.writeFile(path2, JSON.stringify(approvals, null, 2), 'utf8');
+}
+
+async function patchBrowserAutomationHostPreference(projectDir, aliases = [], sendLog = () => {}) {
+  const preferredCdpBlock = `const dns = require('dns').promises;
+const DEFAULT_CDP_URLS = [
+    'host-gateway:9222',
+    'http://127.0.0.1:9222',
+];
+const CDP_URLS = (process.env.OPENCLAW_BROWSER_CDP_URLS || DEFAULT_CDP_URLS.join(','))
+    .split(',')
+    .map((u) => u.trim())
+    .filter(Boolean);
+
+async function normalizeCdpUrl(url) {
+    if (url === 'host-gateway:9222') {
+        try {
+            const resolved = await dns.lookup('host.docker.internal');
+            return 'http://' + resolved.address + ':9222';
+        } catch (_) {
+            return 'http://host.docker.internal:9222';
+        }
+    }
+    return url;
+}
+
+async function connectPreferredChrome() {
+    let lastError;
+    for (const rawUrl of CDP_URLS) {
+        const url = await normalizeCdpUrl(rawUrl);
+        try {
+            const connected = await chromium.connectOverCDP(url, { timeout: 2500 });
+            console.error('[Browser] Connected CDP: ' + url);
+            return connected;
+        } catch (err) {
+            lastError = err;
+        }
+    }
+    throw lastError || new Error('No Chrome CDP endpoint available');
+}`;
+
+  const patchContent = (content) => {
+    let next = content;
+    next = next.replace(
+      "const CDP_URL = 'http://127.0.0.1:9222';",
+      preferredCdpBlock
+    );
+    next = next.replace(
+      'browser = await chromium.connectOverCDP(CDP_URL, { timeout: 5000 });',
+      'browser = await connectPreferredChrome();'
+    );
+    return next;
+  };
+
+  const browserToolCandidates = new Set();
+  const extensionDirs = [];
+  for (const alias of aliases) {
+    const extensionDir = join(projectDir, '.openclaw', 'extensions', alias);
+    extensionDirs.push(extensionDir);
+    browserToolCandidates.add(join(extensionDir, 'browser-tool.js'));
+  }
+
+  const workspaceDirs = new Set();
+  try {
+    const cfgPath = join(projectDir, '.openclaw', 'openclaw.json');
+    if (existsSync(cfgPath)) {
+      const cfg = JSON.parse(await fsp.readFile(cfgPath, 'utf8'));
+      for (const a of cfg.agents?.list || []) {
+        const workspaceRel = a.workspace || cfg.agents?.defaults?.workspace;
+        if (!workspaceRel) continue;
+        const workspacePath = workspaceRel.startsWith('/') ? join(projectDir, workspaceRel.replace(/^\/home\/node\/project\/?/, '')) : join(projectDir, workspaceRel);
+        workspaceDirs.add(workspacePath);
+        browserToolCandidates.add(join(workspacePath, 'plugin-skills', 'browser-automation', 'browser-tool.js'));
+      }
+    }
+  } catch (err) {
+    sendLog(`[browser] Warning: could not scan workspaces for browser-tool.js: ${err.message}`);
+  }
+
+  let patched = 0;
+  for (const file of browserToolCandidates) {
+    if (!existsSync(file)) continue;
+    const content = await fsp.readFile(file, 'utf8');
+    if (content.includes('connectPreferredChrome')) continue;
+    const next = patchContent(content);
+    if (next !== content) {
+      await fsp.writeFile(file, next, 'utf8');
+      patched += 1;
+    }
+  }
+  if (patched > 0) {
+    sendLog(`[browser] Patched ${patched} browser-tool.js file(s) to prefer host Chrome debug before headless Chromium.`);
+  }
+
+  const browserMd = `# Browser Automation
+
+This plugin skill owns browser automation only. For normal web search, use OpenClaw's built-in \`web_search\` capability.
+
+Run commands from this folder or pass the full path from the workspace root:
+
+- \`cd plugin-skills/browser-automation && node browser-tool.js status\`
+- \`node plugin-skills/browser-automation/browser-tool.js status\`
+
+## Chrome Debug Mode
+
+On a desktop machine, start real Chrome in debug mode before asking the bot to browse:
+
+- Windows: run \`start-chrome-debug.bat\`
+- macOS/Linux: run \`./start-chrome-debug.sh\`
+
+The tool will try real host Chrome first. If Chrome debug is not available, it falls back to local headless Chromium, which is suitable for VPS/server use.
+
+## Browser Commands
+
+- \`node plugin-skills/browser-automation/browser-tool.js status\`: check the active browser/tab
+- \`node plugin-skills/browser-automation/browser-tool.js open <url>\`: open a page
+- \`node plugin-skills/browser-automation/browser-tool.js get_text [max_chars]\`: read rendered page text
+- \`node plugin-skills/browser-automation/browser-tool.js get_links [filter]\`: list links
+- \`node plugin-skills/browser-automation/browser-tool.js click "<selector>"\`: click an element
+- \`node plugin-skills/browser-automation/browser-tool.js fill "<selector>" "<text>"\`: fill an input
+- \`node plugin-skills/browser-automation/browser-tool.js scroll [px]\`: scroll the page
+- \`node plugin-skills/browser-automation/browser-tool.js screenshot [path]\`: capture the viewport
+- \`node plugin-skills/browser-automation/browser-tool.js tabs\`: list tabs
+
+Do not call \`search-tool.js\`; browser-automation does not own search. Use \`web_search\` for search and this browser tool only when a rendered browser is needed.
+`;
+
+  const removeManagedBlock = (content, blockId) => {
+    const startTag = `<!-- OPENCLAW:${blockId}:START -->`;
+    const endTag = `<!-- OPENCLAW:${blockId}:END -->`;
+    const startIdx = content.indexOf(startTag);
+    const endIdx = content.indexOf(endTag);
+    if (startIdx === -1 || endIdx === -1 || endIdx <= startIdx) return content;
+    return `${content.substring(0, startIdx).trimEnd()}\n${content.substring(endIdx + endTag.length).trimStart()}`.trim() + '\n';
+  };
+
+  const hostOs = normalizeHostOs(await resolveProjectHostOs(projectDir));
+  const shouldKeepBat = hostOs === 'win';
+  const scriptToKeep = shouldKeepBat ? 'start-chrome-debug.bat' : 'start-chrome-debug.sh';
+  const scriptToRemove = shouldKeepBat ? 'start-chrome-debug.sh' : 'start-chrome-debug.bat';
+  const sourceScript = extensionDirs.map((dir) => join(dir, scriptToKeep)).find((file) => existsSync(file));
+  const sourceBrowserTool = extensionDirs.map((dir) => join(dir, 'browser-tool.js')).find((file) => existsSync(file));
+
+  let sanitized = 0;
+  for (const workspacePath of workspaceDirs) {
+    if (!existsSync(workspacePath)) continue;
+    const pluginSkillPath = join(workspacePath, 'plugin-skills', 'browser-automation');
+    await fsp.mkdir(pluginSkillPath, { recursive: true }).catch(() => {});
+    await fsp.rm(join(workspacePath, 'search-tool.js'), { force: true }).catch(() => {});
+    await fsp.rm(join(workspacePath, 'browser-tool.js'), { force: true }).catch(() => {});
+    await fsp.rm(join(workspacePath, 'BROWSER.md'), { force: true }).catch(() => {});
+    await fsp.rm(join(workspacePath, scriptToRemove), { force: true }).catch(() => {});
+    await fsp.rm(join(workspacePath, scriptToKeep), { force: true }).catch(() => {});
+    await fsp.rm(join(pluginSkillPath, scriptToRemove), { force: true }).catch(() => {});
+    if (sourceBrowserTool) {
+      const targetBrowserTool = join(pluginSkillPath, 'browser-tool.js');
+      await fsp.copyFile(sourceBrowserTool, targetBrowserTool).catch(() => {});
+      if (existsSync(targetBrowserTool)) {
+        const content = await fsp.readFile(targetBrowserTool, 'utf8');
+        const next = content.includes('connectPreferredChrome') ? content : patchContent(content);
+        if (next !== content) await fsp.writeFile(targetBrowserTool, next, 'utf8');
+      }
+    }
+    if (sourceScript) {
+      await fsp.copyFile(sourceScript, join(pluginSkillPath, scriptToKeep)).catch(() => {});
+      if (scriptToKeep.endsWith('.sh')) await fsp.chmod(join(pluginSkillPath, scriptToKeep), 0o755).catch(() => {});
+    }
+    await fsp.writeFile(join(pluginSkillPath, 'BROWSER.md'), browserMd, 'utf8');
+    for (const dirName of ['cl-stealth-search', 'openclaw-smart-search']) {
+      await fsp.rm(join(workspacePath, 'plugin-skills', dirName), { recursive: true, force: true }).catch(() => {});
+    }
+    const toolsMdPath = join(workspacePath, 'TOOLS.md');
+    if (existsSync(toolsMdPath)) {
+      const toolsContent = await fsp.readFile(toolsMdPath, 'utf8');
+      const cleaned = removeManagedBlock(toolsContent, 'STEALTH_BROWSER_GUIDE');
+      if (cleaned !== toolsContent) await fsp.writeFile(toolsMdPath, cleaned, 'utf8');
+    }
+    sanitized += 1;
+  }
+  if (sanitized > 0) {
+    sendLog(`[browser] Sanitized ${sanitized} workspace(s): browser assets are in plugin-skills/browser-automation; web_search remains responsible for search.`);
+  }
+}
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const WEB_DIR = resolve(__dirname, '../web');
@@ -114,13 +295,39 @@ function extractCompletePngBase64(stdout) {
   return b64;
 }
 
-function detectOs() {
-  const platform = process.platform;
-  if (platform === 'win32') return 'win';
-  if (platform === 'darwin') return 'macos';
-  if (platform === 'linux') return os.release().toLowerCase().includes('microsoft') ? 'linux-desktop' : 'linux-desktop';
-  return 'linux-desktop';
-}
+function detectOs() {
+  const platform = process.platform;
+  if (platform === 'win32') return 'win';
+  if (platform === 'darwin') return 'macos';
+  if (platform === 'linux') return os.release().toLowerCase().includes('microsoft') ? 'linux-desktop' : 'linux-desktop';
+  return 'linux-desktop';
+}
+
+function normalizeHostOs(value = '') {
+  const v = String(value || '').trim().toLowerCase();
+  if (['win', 'windows', 'win32'].includes(v)) return 'win';
+  if (['mac', 'macos', 'darwin'].includes(v)) return 'macos';
+  if (['vps', 'server'].includes(v)) return 'vps';
+  if (['linux', 'linux-desktop', 'ubuntu', 'debian'].includes(v)) return 'linux-desktop';
+  return '';
+}
+
+async function resolveProjectHostOs(projectDir = '') {
+  try {
+    const cfgPath = join(projectDir || '', '.openclaw', 'openclaw.json');
+    if (existsSync(cfgPath)) {
+      const cfg = JSON.parse(await fsp.readFile(cfgPath, 'utf8'));
+      const pluginEntries = cfg.plugins?.entries || {};
+      const browserEntry = pluginEntries['browser-automation'] || pluginEntries['openclaw-browser-automation'] || {};
+      const fromConfig = normalizeHostOs(browserEntry.config?.hostOs || cfg.meta?.osChoice || cfg.meta?.hostOs);
+      if (fromConfig) return fromConfig;
+    }
+  } catch {}
+  const fromState = normalizeHostOs(state.os);
+  if (fromState) return fromState;
+  if (/^[A-Za-z]:[\\/]/.test(String(projectDir || ''))) return 'win';
+  return detectOs();
+}
 
 function getRealHomedir() {
   const home = os.homedir();
@@ -1608,8 +1815,9 @@ async function syncDockerInfra(projectDir, force = false) {
   const botContainer = parseComposeServiceContainerName(compose, 'ai-bot') || `openclaw-${slugify(basename(projectDir))}`;
   const routerContainer = parseComposeServiceContainerName(compose, '9router') || `9router-${slugify(basename(projectDir))}`;
   const composeName = (compose.match(/^name:\s*(\S+)/m) || [])[1] || `oc-${slugify(basename(projectDir))}`;
-  const gatewayPort = state.gatewayPort || 18789;
-  const routerPort = state.routerPort || 20128;
+  const gatewayPort = state.gatewayPort || 18789;
+  const routerPort = state.routerPort || 20128;
+  const osChoice = await resolveProjectHostOs(projectDir);
 
   // Detect features from openclaw.json
   const cfgPath = join(projectDir, '.openclaw', 'openclaw.json');
@@ -1624,9 +1832,10 @@ async function syncDockerInfra(projectDir, force = false) {
     is9Router: true,
     openClawNpmSpec: OPENCLAW_NPM_SPEC,
     openClawRuntimePackages: '',
-    allSkills: [],
-    dockerfilePlugins: [],
-    gatewayPort,
+    allSkills: [],
+    dockerfilePlugins: [],
+    osChoice,
+    gatewayPort,
     routerPort,
     singleComposeName: composeName,
     singleAppContainerName: botContainer,
@@ -2109,32 +2318,32 @@ async function discoverProjects(rootProjectDir) {
   return state.projects.slice(0, 20);
 }
 
-async function resolveProjectDir(rootProjectDir, body = {}) {
-  if (body.projectDir && existsSync(join(resolve(String(body.projectDir)), '.openclaw', 'openclaw.json'))) {
-    state.projectDir = resolve(String(body.projectDir));
-    await syncRuntimeState(state.projectDir);
-    return state.projectDir;
-  }
-  const envProjectDir = process.env.OPENCLAW_PROJECT_DIR || (process.env.OPENCLAW_HOME ? dirname(process.env.OPENCLAW_HOME) : '');
-  if (envProjectDir && existsSync(join(resolve(String(envProjectDir)), '.openclaw', 'openclaw.json'))) {
-    state.projectDir = resolve(String(envProjectDir));
-    await syncRuntimeState(state.projectDir);
-    return state.projectDir;
-  }
-  if (state.projectDir && existsSync(join(state.projectDir, '.openclaw', 'openclaw.json'))) {
-    await syncRuntimeState(state.projectDir);
-    return state.projectDir;
-  }
-  await loadSavedState(rootProjectDir);
-  if (state.projectDir && existsSync(join(state.projectDir, '.openclaw', 'openclaw.json'))) {
-    await syncRuntimeState(state.projectDir);
-    return state.projectDir;
-  }
-  const found = await findLatestProject(rootProjectDir);
-  if (found) {
-    await syncRuntimeState(found);
-    await saveState(rootProjectDir);
-  }
+async function resolveProjectDir(rootProjectDir, body = {}) {
+  if (body.projectDir && existsSync(join(resolve(String(body.projectDir)), '.openclaw', 'openclaw.json'))) {
+    state.projectDir = resolve(String(body.projectDir));
+    await syncRuntimeState(state.projectDir);
+    return state.projectDir;
+  }
+  if (state.projectDir && existsSync(join(state.projectDir, '.openclaw', 'openclaw.json'))) {
+    await syncRuntimeState(state.projectDir);
+    return state.projectDir;
+  }
+  await loadSavedState(rootProjectDir);
+  if (state.projectDir && existsSync(join(state.projectDir, '.openclaw', 'openclaw.json'))) {
+    await syncRuntimeState(state.projectDir);
+    return state.projectDir;
+  }
+  const envProjectDir = process.env.OPENCLAW_PROJECT_DIR || (process.env.OPENCLAW_HOME ? dirname(process.env.OPENCLAW_HOME) : '');
+  if (envProjectDir && existsSync(join(resolve(String(envProjectDir)), '.openclaw', 'openclaw.json'))) {
+    state.projectDir = resolve(String(envProjectDir));
+    await syncRuntimeState(state.projectDir);
+    return state.projectDir;
+  }
+  const found = await findLatestProject(rootProjectDir);
+  if (found) {
+    await syncRuntimeState(found);
+    await saveState(rootProjectDir);
+  }
   return state.projectDir;
 }
 
@@ -2287,15 +2496,17 @@ async function applyFeatureToggle(projectDir, agentId, kind, id, enabled) {
     cfg.plugins.allow = cfg.plugins.allow || [];
     if (enabled) {
       if (!cfg.plugins.allow.includes(existingKey)) cfg.plugins.allow.push(existingKey);
-    } else {
-      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 });
-      }
-    }
+    } else {
+      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 rel = workspaceRelForAgent(a, cfg, projectDir);
+        await fsp.rm(join(projectDir, '.openclaw', rel, 'plugin-skills', 'browser-automation'), { recursive: true, force: true }).catch(() => {});
+      }
+    }
 
     // Write cfgPath early so syncDockerInfra reads the updated openclaw.json
     await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
@@ -2586,12 +2797,17 @@ 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 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' || existingKey === 'openclaw-zalo-mod') {
-          ensureZaloModPluginConfig(cfg.plugins.entries[existingKey], cfg);
-        }
+        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 === 'browser-automation' || existingKey === 'openclaw-browser-automation') {
+          cfg.plugins.entries[existingKey].config = Object.assign({}, cfg.plugins.entries[existingKey].config, {
+            hostOs: await resolveProjectHostOs(projectDir),
+          });
+        }
+        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);
         await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
@@ -2619,14 +2835,15 @@ async function installFeature(projectDir, agentId, kind, id) {
         }
       }
 
-      // Browser-automation plugin needs Docker rebuild for Playwright/Chromium deps
-      const isBrowserPlugin = id === 'openclaw-browser-automation' || id === 'browser-automation';
-      if (isBrowserPlugin && composeDir) {
-        sendLog(`[plugin] Browser plugin requires Docker rebuild for Playwright/Chromium...`);
-        const svcName = getBotServiceName(projectDir);
-        await run('docker', ['compose', '-f', join(composeDir, 'docker-compose.yml'), 'up', '-d', '--build', '--force-recreate', svcName], { shell: false }).catch((err) => {
-          sendLog(`[plugin] Docker rebuild failed: ${err.message}. Falling back to restart...`);
-          return run('docker', ['restart', botContainer], { shell: false });
+      // Browser-automation plugin needs Docker rebuild for Playwright/Chromium deps
+      const isBrowserPlugin = id === 'openclaw-browser-automation' || id === 'browser-automation';
+      if (isBrowserPlugin && composeDir) {
+        await patchBrowserAutomationHostPreference(projectDir, aliases, sendLog);
+        sendLog(`[plugin] Browser plugin requires Docker rebuild for Playwright/Chromium...`);
+        const svcName = getBotServiceName(projectDir);
+        await run('docker', ['compose', '-f', join(composeDir, 'docker-compose.yml'), 'up', '-d', '--build', '--force-recreate', svcName], { shell: false }).catch((err) => {
+          sendLog(`[plugin] Docker rebuild failed: ${err.message}. Falling back to restart...`);
+          return run('docker', ['restart', botContainer], { shell: false });
         });
       } else if (isZaloMod && composeDir) {
         // Use docker compose up to apply new port mappings from docker-compose.yml
@@ -2662,26 +2879,37 @@ async function installFeature(projectDir, agentId, kind, id) {
       
       // Automatically enable it in config after install
       const cfgPath = join(projectDir, '.openclaw', 'openclaw.json');
-      if (existsSync(cfgPath)) {
-        const cfg = ensureConfigShape(JSON.parse(await fsp.readFile(cfgPath, 'utf8')));
-        cfg.plugins = cfg.plugins || { entries: {} };
-        cfg.plugins.entries = cfg.plugins.entries || {};
-        const pluginAliasMap = {
-          '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' || existingKey === 'openclaw-zalo-mod') {
-          ensureZaloModPluginConfig(cfg.plugins.entries[existingKey], cfg);
-        }
-        await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
-      }
-    }
-  }
+      if (existsSync(cfgPath)) {
+        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 === 'browser-automation' || existingKey === 'openclaw-browser-automation') {
+          cfg.plugins.entries[existingKey].config = Object.assign({}, cfg.plugins.entries[existingKey].config, {
+            hostOs: await resolveProjectHostOs(projectDir),
+          });
+        }
+        if (existingKey === 'zalo-mod' || existingKey === 'openclaw-zalo-mod') {
+          ensureZaloModPluginConfig(cfg.plugins.entries[existingKey], cfg);
+        }
+        await fsp.writeFile(cfgPath, JSON.stringify(cfg, null, 2), 'utf8');
+      }
+
+      if (id === 'openclaw-browser-automation' || id === 'browser-automation') {
+        const aliases = ['browser-automation', 'openclaw-browser-automation'];
+        await patchBrowserAutomationHostPreference(projectDir, aliases, sendLog);
+      }
+    }
+  }
   return { ok: true };
 }
 
@@ -2955,10 +3183,10 @@ async function handler(req, res, rootProjectDir) {
       const body = await readJson(req);
       return json(res, await connectPickedProject(body.projectName, rootProjectDir));
     }
-    if (url.pathname === '/api/bot/status' && req.method === 'GET') {
-      await resolveProjectDir(rootProjectDir);
-      return json(res, await buildBotStatus());
-    }
+    if (url.pathname === '/api/bot/status' && req.method === 'GET') {
+      await resolveProjectDir(rootProjectDir, Object.fromEntries(url.searchParams));
+      return json(res, await buildBotStatus());
+    }
     if (url.pathname === '/api/bot/credentials' && req.method === 'PUT') {
       const body = await readJson(req);
       const projectDir = await resolveProjectDir(rootProjectDir, body);
@@ -3085,29 +3313,34 @@ async function handler(req, res, rootProjectDir) {
       });
       return json(res, { ok: true, message: 'Zalo login initiated. QR will appear in UI.' });
     }
-    if (url.pathname.startsWith('/api/bot/') && req.method === 'DELETE' && !url.pathname.startsWith('/api/bot/files/')) {
-      const agentId = decodeURIComponent(url.pathname.replace('/api/bot/', ''));
-      const projectDir = await resolveProjectDir(rootProjectDir);
-      const result = await deleteBotInProject(projectDir, agentId);
-      sendLog(`? Bot deleted: ${agentId}`);
-      await recreateDockerBot(projectDir).catch((err) => sendLog(`[docker] recreate skipped/failed: ${err.message}`));
-      return json(res, result);
-    }
-    if (url.pathname === '/api/bot/files' && req.method === 'GET') {
-      await resolveProjectDir(rootProjectDir);
-      return json(res, { files: state.projectDir ? await listMarkdownFiles(state.projectDir, url.searchParams.get('agentId') || '') : [] });
-    }
-    if (url.pathname.startsWith('/api/bot/files/') && state.projectDir) {
-      const name = decodeURIComponent(url.pathname.replace('/api/bot/files/', ''));
-      const file = safeJoin(state.projectDir, name);
-      if (req.method === 'GET') return json(res, { name, content: await fsp.readFile(file, 'utf8') });
-      if (req.method === 'PUT') {
-        if (!name.endsWith('.md')) throw httpError(400, 'Only markdown files (.md) can be modified');
-        const body = await readJson(req);
-        await fsp.writeFile(file, String(body.content || ''), 'utf8');
-        return json(res, { ok: true });
-      }
-    }
+    if (url.pathname.startsWith('/api/bot/') && req.method === 'DELETE' && !url.pathname.startsWith('/api/bot/files/')) {
+      const agentId = decodeURIComponent(url.pathname.replace('/api/bot/', ''));
+      const projectDir = await resolveProjectDir(rootProjectDir, Object.fromEntries(url.searchParams));
+      const result = await deleteBotInProject(projectDir, agentId);
+      sendLog(`? Bot deleted: ${agentId}`);
+      await recreateDockerBot(projectDir).catch((err) => sendLog(`[docker] recreate skipped/failed: ${err.message}`));
+      return json(res, result);
+    }
+    if (url.pathname === '/api/bot/files' && req.method === 'GET') {
+      await resolveProjectDir(rootProjectDir, Object.fromEntries(url.searchParams));
+      return json(res, { files: state.projectDir ? await listMarkdownFiles(state.projectDir, url.searchParams.get('agentId') || '') : [] });
+    }
+    if (url.pathname.startsWith('/api/bot/files/')) {
+      const name = decodeURIComponent(url.pathname.replace('/api/bot/files/', ''));
+      if (req.method === 'GET') {
+        const projectDir = await resolveProjectDir(rootProjectDir, Object.fromEntries(url.searchParams));
+        const file = safeJoin(projectDir, name);
+        return json(res, { name, content: await fsp.readFile(file, 'utf8') });
+      }
+      if (req.method === 'PUT') {
+        if (!name.endsWith('.md')) throw httpError(400, 'Only markdown files (.md) can be modified');
+        const body = await readJson(req);
+        const projectDir = await resolveProjectDir(rootProjectDir, body);
+        const file = safeJoin(projectDir, name);
+        await fsp.writeFile(file, String(body.content || ''), 'utf8');
+        return json(res, { ok: true });
+      }
+    }
     if (url.pathname === '/api/catalog' && req.method === 'GET') return json(res, {
       skills: [
         { name: 'Browser', slug: 'browser' },
@@ -3122,20 +3355,20 @@ async function handler(req, res, rootProjectDir) {
         { name: 'openclaw-n8n-facebook-poster', package: 'openclaw-n8n-facebook-poster' },
       ]
     });
-    if (url.pathname === '/api/features' && req.method === 'GET') {
-      const projectDir = await resolveProjectDir(rootProjectDir);
-      return json(res, await getFeatureFlags(projectDir, url.searchParams.get('agentId') || ''));
-    }
-    if (url.pathname === '/api/features/toggle' && req.method === 'POST') {
-      const body = await readJson(req);
-      const projectDir = await resolveProjectDir(rootProjectDir);
-      return json(res, await applyFeatureToggle(projectDir, body.agentId || '', body.kind, body.id, !!body.enabled));
-    }
-    if (url.pathname === '/api/features/install' && req.method === 'POST') {
-      const body = await readJson(req);
-      const projectDir = await resolveProjectDir(rootProjectDir);
-      return json(res, await installFeature(projectDir, body.agentId || '', body.kind, body.id));
-    }
+    if (url.pathname === '/api/features' && req.method === 'GET') {
+      const projectDir = await resolveProjectDir(rootProjectDir, Object.fromEntries(url.searchParams));
+      return json(res, await getFeatureFlags(projectDir, url.searchParams.get('agentId') || ''));
+    }
+    if (url.pathname === '/api/features/toggle' && req.method === 'POST') {
+      const body = await readJson(req);
+      const projectDir = await resolveProjectDir(rootProjectDir, body);
+      return json(res, await applyFeatureToggle(projectDir, body.agentId || '', body.kind, body.id, !!body.enabled));
+    }
+    if (url.pathname === '/api/features/install' && req.method === 'POST') {
+      const body = await readJson(req);
+      const projectDir = await resolveProjectDir(rootProjectDir, body);
+      return json(res, await installFeature(projectDir, body.agentId || '', body.kind, body.id));
+    }
     if (await serveStatic(req, res)) return;
     json(res, { error: 'Not found' }, 404);
   } catch (err) {

package/dist/setup/shared/bot-config-gen.js

@@ -91,7 +91,11 @@
     }));
 
     const cfg = {
-      meta: { lastTouchedVersion: (_common.OPENCLAW_NPM_SPEC || 'latest').replace('openclaw@', '') },
+      meta: {
+        lastTouchedVersion: (_common.OPENCLAW_NPM_SPEC || 'latest').replace('openclaw@', ''),
+        osChoice,
+        deployMode,
+      },
       agents: {
         defaults: {
           model: { primary: model, fallbacks: [] },

package/dist/setup/shared/docker-gen.js

@@ -221,11 +221,12 @@ if(touched){console.log('[patch-9router] Applied Codex compatibility patch.');}e
       singleOllamaContainerName = 'ollama',
       multiOllamaContainerName = 'ollama-multibot',
       plainSingleExtraHosts = false,
-      multiOllamaNumParallel = 1,
-      singleOllamaNumParallel = 1,
-      gatewayPort = 18789,
-      routerPort = 20128,
-    } = options;
+      multiOllamaNumParallel = 1,
+      singleOllamaNumParallel = 1,
+      gatewayPort = 18789,
+      routerPort = 20128,
+      osChoice = '',
+    } = options;
     const skillLines = dockerfileSkillInstallMode === 'build' && allSkills.length > 0
       ? `\n# Install skills (ClawHub)\n${allSkills.map((skill) => `RUN openclaw skills install ${skill} || echo "Warning: Failed to install ${skill} due to rate limits."`).join('\n')}\n`
       : '';
@@ -355,7 +356,7 @@ CMD ["/bin/sh", "/usr/local/bin/openclaw-entrypoint.sh"]`;
     const docker9RouterEntrypointScript = build9RouterComposeEntrypointScript(routerPort);
     const extraHostsBlock = `    extra_hosts:\n      - "host.docker.internal:host-gateway"`;
 
-    const appEnvironmentBlock = `    environment:\n      - HOME=/home/node/project/.openclaw\n      - OPENCLAW_HOME=/home/node/project/.openclaw\n      - OPENCLAW_STATE_DIR=/home/node/project/.openclaw\n      - OPENCLAW_ALLOW_INSECURE_PRIVATE_WS=1\n      - OPENCLAW_GATEWAY_PORT=${gatewayPort}\n      - OPENCLAW_PORT=${gatewayPort}\n    tmpfs:\n      - /home/node/project/.openclaw/plugin-runtime-deps\n`;
+    const appEnvironmentBlock = `    environment:\n      - HOME=/home/node/project/.openclaw\n      - OPENCLAW_HOME=/home/node/project/.openclaw\n      - OPENCLAW_STATE_DIR=/home/node/project/.openclaw\n      - OPENCLAW_ALLOW_INSECURE_PRIVATE_WS=1\n      - OPENCLAW_SETUP_OS=${osChoice || ''}\n      - OPENCLAW_BROWSER_HOST_OS=${osChoice || ''}\n      - OPENCLAW_GATEWAY_PORT=${gatewayPort}\n      - OPENCLAW_PORT=${gatewayPort}\n    tmpfs:\n      - /home/node/project/.openclaw/plugin-runtime-deps\n`;
 
     let compose;
     if (isMultiBot) {

package/dist/setup/shared/workspace-gen.js

@@ -330,79 +330,61 @@ description: Startup and initialization instructions
 - [Operating Manual](./AGENTS.md)`;
   }
 
-  function buildCronjobSkillMd(isVi = true) {
-    if (isVi) {
-      return `---
-name: cronjob
-description: Lên lịch tác vụ định kỳ sử dụng công cụ cron.
----
-
-# ⏰ 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).
-- **⛔ TUYỆT ĐỐI KHÔNG sửa trực tiếp file JSON** như \`jobs.json\`, \`jobs-state.json\` trong thư mục \`.openclaw/cron/\`. Dữ liệu cron được lưu trong SQLite database, file JSON chỉ là legacy format đã ngưng hỗ trợ. Mọi thao tác PHẢI thông qua tool \`cron\`.
-- **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.
-  - **Session:** Luôn dùng \`sessionTarget: "isolated"\` cho các job chạy nền (báo cáo, nhắc nhở, gửi tin nhắn tự động). Chỉ dùng \`"main"\` cho system event/reminder ngắn.
-  - **Timezone:** Luôn chỉ định timezone rõ ràng bằng trường \`tz\` (ví dụ: \`"Asia/Ho_Chi_Minh"\`). Nếu không chỉ định, hệ thống sẽ dùng timezone của Gateway host (thường là UTC) và job sẽ chạy sai giờ.
-  - **Delivery:** Đối với job cần gửi kết quả ra chat, set \`delivery.mode: "announce"\` kèm \`delivery.channel\` và \`delivery.to\`.
-- **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ố thích hợp trước ID của group. Với kênh Telegram/Matrix/Discord/Slack, dùng tiền tố \`group:\` (ví dụ: \`group:123456\`). RIÊNG với kênh Zalo (\`zalouser\`), **bắt buộc** phải sử dụng tiền tố \`g:\` (ví dụ: \`g:3815464776067464419\`) để tránh bị OpenClaw core lược bỏ tiền tố và gửi nhầm vào DM chat cá nhân.
-- **One-shot job:** Dùng schedule kind \`"at"\` với ISO 8601 timestamp. Job sẽ tự xóa sau khi chạy thành công trừ khi set \`deleteAfterRun: false\`.
-- 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.`;
-    }
-    return `---
-name: cronjob
-description: Schedule recurring tasks using the cron tool.
----
-
-# ⏰ Cron / Scheduled Tasks (tool: \`cron\`)
-- **Exact tool name:** The tool name is \`cron\` (never mistake it for \`native\` or external command lines).
-- **⛔ NEVER edit JSON files directly** such as \`jobs.json\` or \`jobs-state.json\` in \`.openclaw/cron/\`. Cron data is stored in SQLite database; JSON files are legacy format no longer supported. All operations MUST go through the \`cron\` tool.
-- **When creating a new cronjob (action \`add\`):**
-  - **ABSOLUTELY DO NOT specify the \`agentId\` field** in the \`job\` object (leave this field omitted). The OpenClaw system will automatically assign your correct agent ID to that job.
-  - Never manually specify \`agentId\` as \`"bot"\` or \`"main"\`, as this will cause the cronjob to belong to another agent and you will lose control to manage/delete it later.
-  - **Session:** Always use \`sessionTarget: "isolated"\` for background jobs (reports, reminders, automated messages). Only use \`"main"\` for short system events/reminders.
-  - **Timezone:** Always specify timezone explicitly via the \`tz\` field (e.g., \`"Asia/Ho_Chi_Minh"\`). If omitted, the system uses the Gateway host timezone (often UTC) and the job will run at the wrong time.
-  - **Delivery:** For jobs that should send results to chat, set \`delivery.mode: "announce"\` with \`delivery.channel\` and \`delivery.to\`.
-- **When the user requests to disable/enable/delete a cronjob:**
-  1. **Step 1 (Search):** Call the \`cron\` tool with action \`list\` (and \`includeDisabled: true\`) to view all cron jobs on the system and find the matching \`jobId\`.
-  2. **Step 2 (Processing):**
-     - To delete: Call action \`remove\` with the \`id\` found.
-     - To disable/pause: Call action \`update\` with \`id\` and patch \`{"enabled": false}\`.
-     - To enable: Call action \`update\` with \`id\` and patch \`{"enabled": true}\`.
-  3. **Honest statement:** Never claim a job is "deleted" or "not found" based on guessing without calling the \`cron\` tool to verify the actual state.
-- When the user asks to schedule tasks or reminders, use the built-in \`cron\` tool (action \`add\`) automatically. Do NOT ask users to run crontab or Task Scheduler manually on the host.
-- When operating cron/scheduler tools, do **not** put \`current\` into the Session directory.
-- **IMPORTANT ABOUT GROUP CHAT TARGETING**: When creating or configuring a cron job to send messages (announce mode) to a Group Chat, the value of the \`delivery.to\` field **must** use the appropriate prefix before the group ID. For Telegram/Matrix/Discord/Slack, use the \`group:\` prefix (e.g., \`group:123456\`). ESPECIALLY for Zalo (\`zalouser\`), you **must** use the \`g:\` prefix (e.g., \`g:3815464776067464419\`) to prevent the OpenClaw core from stripping the prefix and misrouting the message to a private DM.
-- **One-shot jobs:** Use schedule kind \`"at"\` with an ISO 8601 timestamp. The job auto-deletes after successful run unless \`deleteAfterRun: false\` is set.
-- Skip internal doc lookups such as \`cron-jobs.mdx\`; rely on the available tools and complete the scheduling task directly.`;
-  }
-
-  function buildInfographicGeneratorSkillMd(botName = 'Williams') {
-    return '';
-  }
+        function buildCronjobSkillMd(isVi = true) {
+    return `---
+name: cronjob
+description: Lên lịch tác vụ định kỳ sử dụng công cụ cron.
+---
 
-  function buildInfographicGeneratorJs() {
-    return '';
-  }
+# ⏰ Lập lịch & Nhắc nhở (tool: \`cron\`)
 
-  function buildStickerMentionSkillMd(botName = 'Williams') {
-    return '';
-  }
+Sử dụng công cụ \`cron\` (không chạy command line ngoài, không sửa trực tiếp tệp JSON).
+
+## 1. Tạo Lịch Nhắc Nhở Mới (action: \`add\`)
+Truyền tham số \`job\` (object) gồm:
+- **\`agentId\`**: Bỏ qua (không truyền). Hệ thống tự gán.
+- **\`sessionTarget\`**: \`"isolated"\` (cho chạy nền) hoặc \`"main"\`.
+- **\`wakeMode\`**: \`"now"\`.
+- **\`schedule\`**:
+  - \`kind\`: \`"cron"\` (lặp lại) hoặc \`"at"\` (một lần).
+  - \`expr\`: Biểu thức cron (ví dụ: \`"0 7 * * *"\`).
+  - \`tz\`: Bắt buộc điền múi giờ, ví dụ: \`"Asia/Ho_Chi_Minh"\`.
+- **\`payload\`**:
+  - \`kind\`: \`"agentTurn"\`.
+  - \`message\`: Nội dung tin nhắn nhắc nhở.
+- **\`delivery\`**:
+  - \`mode\`: \`"announce"\`.
+  - \`channel\`: \`"zalouser"\`.
+  - \`to\`: ID người nhận hoặc ID nhóm.
+    - ⚠️ **QUAN TRỌNG:** Nếu gửi tới Group Zalo, ID nhóm bắt buộc phải thêm tiền tố **\`g:\`** ở đầu (Ví dụ: \`g:1925989252066183028\`). Nếu thiếu \`g:\`, tin nhắn sẽ bị gửi nhầm thành tin cá nhân (DM) hoặc lỗi.
+
+## 2. Tìm kiếm, Tắt, Bật, Xóa Lịch
+- **Xem danh sách:** Gọi \`cron\` với action \`list\` (kèm \`includeDisabled: true\`). Tìm \`id\` phù hợp.
+- **Xóa job:** Gọi action \`remove\` với \`id\`.
+- **Tắt job:** Gọi action \`update\` với \`id\` và patch \`{"enabled": false}\`.
+- **Bật job:** Gọi action \`update\` với \`id\` and patch \`{"enabled": true}\`.
 
-  function buildStickerMentionJs() {
-    return '';
+## 3. Chạy thử nghiệm ngay lập tức (Test Run)
+- Sau khi thêm job, có thể chạy thử ngay lập tức để kiểm tra bằng cách gọi CLI trong container:
+  \`openclaw cron run <job_id> --wait\` (hoặc gọi tool \`cron\` với action \`run\` kèm \`id\`).`;
   }
 
+  function buildInfographicGeneratorSkillMd(botName = 'Williams') {
+    return '';
+  }
+
+  function buildInfographicGeneratorJs() {
+    return '';
+  }
+
+  function buildStickerMentionSkillMd(botName = 'Williams') {
+    return '';
+  }
+
+  function buildStickerMentionJs() {
+    return '';
+  }
+
   function buildSecurityRules(isVi = true) {
     if (isVi) {
       return `\n\n## 🔐 Quy Tắc Bảo Mật — BẮT BUỘC (Red Lines)\n\n**GIỚI HẠN FILE & HỆ THỐNG:**\n- ✅ CHỈ làm việc trong thư mục project (workspace).\n- ❌ KHÔNG cung cấp file nội bộ của \`.openclaw\` (config.json, registry.json, task-memory.json, workspace-memory...)\n- ❌ KHÔNG đọc, sao chép, hoặc truy cập bất kỳ file nào ngoài thư mục project\n- ❌ KHÔNG quét hoặc liệt kê các thư mục hệ thống: Documents, Desktop, Downloads, AppData\n- ❌ KHÔNG truy cập registry, system32, hoặc Program Files\n- ❌ KHÔNG cài đặt phần mềm, driver, hoặc service ngoài Docker\n\n**API KEY & CREDENTIALS:**\n- ❌ KHÔNG BAO GIỜ hiển thị API key, token, hoặc mật khẩu trong chat\n- ❌ KHÔNG viết API key trực tiếp vào mã nguồn\n- ❌ KHÔNG commit file credentials lên Git\n- ✅ LUÔN lưu credentials trong file .env riêng\n- ✅ LUÔN dùng biến môi trường thay vì hardcode\n\n**VÍ CRYPTO & TÀI SẢN SỐ:**\n- ❌ TUYỆT ĐỐI KHÔNG truy cập, đọc, hoặc quét các thư mục ví crypto\n- ❌ KHÔNG quét clipboard (có thể chứa seed phrases)\n- ❌ KHÔNG truy cập browser profile, cookie, hoặc mật khẩu đã lưu\n- ❌ KHÔNG cài đặt npm package lạ (chỉ openclaw và plugin chính thức)\n\n**DOCKER:**\n- ✅ Chỉ mount đúng thư mục cần thiết (config + workspace)\n- ❌ KHÔNG mount nguyên ổ đĩa (C:/ hoặc D:/)\n- ❌ KHÔNG chạy container với --privileged\n- ✅ Giới hạn port expose (chỉ 18789)`;

package/dist/web/app.js

@@ -31,12 +31,25 @@ function staticChoiceCard(item) {
   </div>`;
 }
 
-async function api(path, opts) {
-  const res = await fetch(path, opts && opts.body ? { ...opts, headers: { 'content-type': 'application/json' }, body: JSON.stringify(opts.body) } : opts);
-  if (!res.ok) throw new Error((await res.json()).error || res.statusText);
-  return res.json();
-}
-function runtimeBadge(label, kind='') { return `<span class="mini-pill ${kind?`mini-pill--${kind}`:''}">${escapeHtml(label)}</span>`; }
+async function api(path, opts) {
+  const res = await fetch(path, opts && opts.body ? { ...opts, headers: { 'content-type': 'application/json' }, body: JSON.stringify(opts.body) } : opts);
+  if (!res.ok) throw new Error((await res.json()).error || res.statusText);
+  return res.json();
+}
+function activeProjectDir() {
+  return state.selectedProjectDir || state.install?.projectDir || '';
+}
+function projectQuery(extra = {}) {
+  const params = new URLSearchParams();
+  const projectDir = activeProjectDir();
+  if (projectDir) params.set('projectDir', projectDir);
+  Object.entries(extra).forEach(([key, value]) => {
+    if (value !== undefined && value !== null && value !== '') params.set(key, value);
+  });
+  const query = params.toString();
+  return query ? `?${query}` : '';
+}
+function runtimeBadge(label, kind='') { return `<span class="mini-pill ${kind?`mini-pill--${kind}`:''}">${escapeHtml(label)}</span>`; }
 async function withButtonLoading(btn, task) {
   if (!btn || btn.classList.contains('is-loading')) return;
   const prevDisabled = btn.disabled;
@@ -420,7 +433,7 @@ function renderFilesPanel() {
   // Re-wire only file-panel-specific handlers
   panel.querySelectorAll('[data-select-file]').forEach(btn => btn.onclick = () => { state.selectedFile = btn.dataset.selectFile; renderFilesPanel(); });
   panel.querySelectorAll('[data-toggle-dir]').forEach(btn => btn.onclick = () => { const p = btn.dataset.toggleDir; state.openDirs[p] = !(state.openDirs[p] ?? true); renderFilesPanel(); });
-  panel.querySelectorAll('.save').forEach(btn => btn.onclick = () => withButtonLoading(btn, async () => { const name = btn.dataset.file; await api('/api/bot/files/'+encodeURIComponent(name), { method: 'PUT', body: { content: document.querySelector(`[data-editor="${CSS.escape(name)}"]`).value } }); showToast(t('Đã lưu', 'Saved'), t('Đã lưu tệp tin: ', 'Saved file: ') + fileBaseName(name), 'success'); btn.innerHTML=`${actionIcon('save')} ${ui('saved')}`; setTimeout(()=>btn.innerHTML=`${actionIcon('save')} ${ui('save')}`,1200); }));
+  panel.querySelectorAll('.save').forEach(btn => btn.onclick = () => withButtonLoading(btn, async () => { const name = btn.dataset.file; await api('/api/bot/files/'+encodeURIComponent(name), { method: 'PUT', body: { projectDir: activeProjectDir(), content: document.querySelector(`[data-editor="${CSS.escape(name)}"]`).value } }); showToast(t('Đã lưu', 'Saved'), t('Đã lưu tệp tin: ', 'Saved file: ') + fileBaseName(name), 'success'); btn.innerHTML=`${actionIcon('save')} ${ui('saved')}`; setTimeout(()=>btn.innerHTML=`${actionIcon('save')} ${ui('save')}`,1200); }));
 }
 
 function renderSkillsPanel() {
@@ -439,7 +452,7 @@ function wireSkillsHandlers(scope = document) {
     state.featureLoading[key] = true;
     renderSkillsPanel();
     try {
-      await api('/api/features/toggle', { method:'POST', body:{ kind, id, enabled, agentId: currentBotId() } });
+      await api('/api/features/toggle', { method:'POST', body:{ projectDir: activeProjectDir(), kind, id, enabled, agentId: currentBotId() } });
       await loadFeatureFlags(true);
       if (kind === 'skill') await loadFiles(true);
     } finally {
@@ -453,7 +466,7 @@ function wireSkillsHandlers(scope = document) {
     state.featureLoading[key] = true;
     renderSkillsPanel();
     try {
-      await api('/api/features/install', { method:'POST', body:{ kind, id, agentId: currentBotId() } });
+      await api('/api/features/install', { method:'POST', body:{ projectDir: activeProjectDir(), kind, id, agentId: currentBotId() } });
       await loadFeatureFlags(true);
       await loadFiles(true);
       const label = kind === 'skill' ? t('kỹ năng: ', 'skill: ') : t('plugin: ', 'plugin: ');
@@ -909,7 +922,7 @@ function wireTab() {
     state.zaloLoginLines = [t('Đang chuẩn bị quét mã Zalo...', 'Preparing Zalo QR login...')];
     render();
     try {
-      await api('/api/zalo/login', { method: 'POST', body: { agentId: state.activeBotId } });
+      await api('/api/zalo/login', { method: 'POST', body: { projectDir: activeProjectDir(), agentId: state.activeBotId } });
     } catch (err) {
       state.zaloLoginOpen = false;
       state.confirmModal = { title: t('Lỗi đăng nhập','Login error'), message: err.message, okText: t('Đóng','Close'), onConfirm: () => {} };
@@ -1016,12 +1029,12 @@ document.querySelectorAll('[data-project-pick-folder]').forEach(btn => btn.oncli
     }
   }));
   document.querySelectorAll('[data-update-app]').forEach(btn => btn.onclick = () => withButtonLoading(btn, async () => {
-    await api('/api/runtime/update', { method: 'POST', body: { target: 'openclaw' } });
+    await api('/api/runtime/update', { method: 'POST', body: { projectDir: activeProjectDir(), target: 'openclaw' } });
     await loadSystem();
     await loadStatus();
   }));
   document.querySelectorAll('[data-update-router]').forEach(btn => btn.onclick = () => withButtonLoading(btn, async () => {
-    await api('/api/runtime/update', { method: 'POST', body: { target: '9router' } });
+    await api('/api/runtime/update', { method: 'POST', body: { projectDir: activeProjectDir(), target: '9router' } });
     await loadSystem();
     await loadStatus();
   }));document.querySelectorAll('[data-project-remove]').forEach(btn => btn.onclick = (ev) => {
@@ -1070,7 +1083,7 @@ document.querySelectorAll('[data-project-pick-folder]').forEach(btn => btn.oncli
       okText: t('Xóa bot','Delete bot'),
       onConfirm: async () => {
         try {
-          await api('/api/bot/'+encodeURIComponent(id), { method: 'DELETE' });
+          await api('/api/bot/'+encodeURIComponent(id) + projectQuery(), { method: 'DELETE' });
           state.confirmModal = null;
           showToast(t('Đã xóa bot', 'Bot deleted'), `${t('Đã xóa bot','Bot deleted')}: ${id}`, 'success');
           if (state.activeBotId === id) { state.activeBotId = ''; state.selectedFile = ''; state.files = []; }
@@ -1106,7 +1119,7 @@ document.querySelectorAll('[data-project-pick-folder]').forEach(btn => btn.oncli
     const submitBtn = ev.currentTarget.querySelector('button[type="submit"]');
     withButtonLoading(submitBtn, async () => {
       const nineRouterApiKey = ev.currentTarget.querySelector('[name="nineRouterApiKey"]')?.value || '';
-      await api('/api/bot/credentials', { method: 'PUT', body: { nineRouterApiKey } });
+      await api('/api/bot/credentials', { method: 'PUT', body: { projectDir: activeProjectDir(), nineRouterApiKey } });
       const msg = ev.currentTarget.querySelector('[data-cred-msg]');
       if (msg) msg.textContent = t('Đã lưu','Saved');
       await loadStatus();
@@ -1181,9 +1194,10 @@ document.querySelectorAll('[data-project-pick-folder]').forEach(btn => btn.oncli
     const submitBtn = ev.currentTarget.querySelector('button[type="submit"]');
     if (submitBtn?.classList.contains('is-loading')) return;
     await withButtonLoading(submitBtn, async () => {
-    const fd = new FormData(ev.currentTarget);
-    const body = Object.fromEntries(fd.entries());
-    body.channel = state.botChannel || 'telegram';
+    const fd = new FormData(ev.currentTarget);
+    const body = Object.fromEntries(fd.entries());
+    body.projectDir = activeProjectDir();
+    body.channel = state.botChannel || 'telegram';
     if (body.channel === 'zalo-personal') {
       state.botModalOpen = false;
       state.zaloLoginOpen = true;
@@ -1227,14 +1241,21 @@ document.querySelectorAll('[data-project-pick-folder]').forEach(btn => btn.oncli
     }
     });
   });
-  document.querySelectorAll('.save').forEach(btn => btn.onclick = () => withButtonLoading(btn, async () => { const name = btn.dataset.file; await api('/api/bot/files/'+encodeURIComponent(name), { method: 'PUT', body: { content: document.querySelector(`[data-editor="${CSS.escape(name)}"]`).value } }); showToast(t('Đã lưu', 'Saved'), t('Đã lưu tệp tin: ', 'Saved file: ') + fileBaseName(name), 'success'); btn.innerHTML=`${actionIcon('save')} ${ui('saved')}`; setTimeout(()=>btn.innerHTML=`${actionIcon('save')} ${ui('save')}`,1200); }));
+  document.querySelectorAll('.save').forEach(btn => btn.onclick = () => withButtonLoading(btn, async () => { const name = btn.dataset.file; await api('/api/bot/files/'+encodeURIComponent(name), { method: 'PUT', body: { projectDir: activeProjectDir(), content: document.querySelector(`[data-editor="${CSS.escape(name)}"]`).value } }); showToast(t('Đã lưu', 'Saved'), t('Đã lưu tệp tin: ', 'Saved file: ') + fileBaseName(name), 'success'); btn.innerHTML=`${actionIcon('save')} ${ui('saved')}`; setTimeout(()=>btn.innerHTML=`${actionIcon('save')} ${ui('save')}`,1200); }));
   wireSkillsHandlers(document);
 }
 
 function escapeHtml(s='') { return String(s).replace(/[&<>"']/g, c => ({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[c])); }
 function fileBaseName(s='') { const clean = String(s).replace(/[\\/]+$/, ''); return clean.split(/[\\/]/).pop() || s; }
-async function loadSystem(silent=false){ state.system = await api('/api/system'); if (!silent) render(); }
-async function loadStatus(silent=false){ state.install = await api('/api/bot/status'); if (!state.selectedProjectDir && state.install?.projectDir) state.selectedProjectDir = state.install.projectDir; if (!silent) render(); }
+async function loadSystem(silent=false){ state.system = await api('/api/system'); if (!silent) render(); }
+async function loadStatus(silent=false){
+  const requestedProjectDir = activeProjectDir();
+  const install = await api('/api/bot/status' + projectQuery());
+  if (requestedProjectDir && install?.projectDir && install.projectDir !== requestedProjectDir) return;
+  state.install = install;
+  if (!state.selectedProjectDir && state.install?.projectDir) state.selectedProjectDir = state.install.projectDir;
+  if (!silent) render();
+}
 function autoSwitchBotChannel() {
   const bots = state.install?.bots || [];
   const ch = state.botChannel || 'telegram';
@@ -1255,14 +1276,14 @@ function currentBotId() {
   }
   return state.activeBotId || '';
 }
-async function loadFiles(silent=false){
-  const botId = currentBotId();
-  if (!botId) { state.files = []; if (!silent) render(); return; }
-  state.files = (await api('/api/bot/files' + (botId ? `?agentId=${encodeURIComponent(botId)}` : ''))).files;
-  if (!silent) render();
-}
-async function loadCatalog(silent=false){ state.catalog = await api('/api/catalog'); if (!silent) render(); }
-async function loadFeatureFlags(silent=false){ const botId=currentBotId(); const data = (await api('/api/features' + (botId ? `?agentId=${encodeURIComponent(botId)}` : ''))) || {}; state.featureFlags = data.flags || {}; state.featureInstalled = data.installed || {}; state.featureVersions = data.versions || {}; if (!silent) render(); }
+async function loadFiles(silent=false){
+  const botId = currentBotId();
+  if (!botId) { state.files = []; if (!silent) render(); return; }
+  state.files = (await api('/api/bot/files' + projectQuery({ agentId: botId }))).files;
+  if (!silent) render();
+}
+async function loadCatalog(silent=false){ state.catalog = await api('/api/catalog'); if (!silent) render(); }
+async function loadFeatureFlags(silent=false){ const botId=currentBotId(); const data = (await api('/api/features' + projectQuery({ agentId: botId }))) || {}; state.featureFlags = data.flags || {}; state.featureInstalled = data.installed || {}; state.featureVersions = data.versions || {}; if (!silent) render(); }
 function appendLogLine(line) {
   if (line.includes('Setup Wizard updated successfully! Please restart the installer.')) {
     showToast(t('Đang khởi động lại UI', 'Restarting Setup UI'), t('Hệ thống đang tự khởi động lại để áp dụng phiên bản mới...', 'The system is restarting to apply the new version...'), 'info', 12000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-openclaw-bot",
-  "version": "5.8.18",
+  "version": "5.8.19",
   "description": "Interactive CLI installer for OpenClaw Bot",
   "main": "dist/cli.js",
   "bin": {