winter-super-cli 2026.6.24 → 2026.6.27

package/src/cli/slash-commands.js

@@ -36,13 +36,14 @@ export const SLASH_COMMANDS = [
   { cmd: '/grep', desc: 'Search files', usage: '/grep <pattern>' },
   { cmd: '/bash', desc: 'Run command', usage: '/bash <command>' },
   { cmd: '/image', desc: 'Analyze image/screenshot or clipboard image', usage: '/image [file] [question]' },
+  { cmd: '/paste', desc: 'Read clipboard text or image', usage: '/paste [prompt]' },
   { cmd: '/design', desc: 'Design commands', sub: ['search', 'add', 'apply', 'list', 'preview'] },
   { cmd: '/designs', desc: 'List/search awesome-design-md systems', usage: '/designs [query]' },
   { cmd: '/skill', desc: 'Skills management', sub: ['list', 'enable', 'create'] },
   { cmd: '/skills', desc: 'List local Winter/Codex/Claude skills' },
   { cmd: '/plugin', desc: 'Plugin management', sub: ['list', 'install', 'remove'] },
-  { cmd: '/mcp', desc: 'MCP server management', sub: ['list', 'add', 'remove', 'allow'] },
-  { cmd: '/permissions', desc: 'Permission allowlist', sub: ['list', 'allow', 'prompt'] },
+  { cmd: '/mcp', desc: 'MCP server management', sub: ['list', 'add', 'preset', 'install', 'remove', 'allow', 'tools'] },
+  { cmd: '/permissions', desc: 'Permission allowlist', sub: ['list', 'allow', 'prompt', 'full'] },
   { cmd: '/stats', desc: 'Tool usage statistics' },
   { cmd: '/replay', desc: 'Replay recent session/tool events', usage: '/replay [count]' },
   { cmd: '/diff', desc: 'Preview git diff', usage: '/diff [--cached|--confirm]' },
@@ -57,6 +58,7 @@ export const SLASH_COMMANDS = [
   { cmd: '/composer', desc: 'Multi-file editing mode (like Cursor Composer)', usage: '/composer <task>' },
   { cmd: '/complete', desc: 'Trigger inline code completion', usage: '/complete <file> [line] [col]' },
   { cmd: '/browse', desc: 'Browse URL in Chrome via browser automation', usage: '/browse <url>' },
+  { cmd: '/browser', desc: 'Control visible Chrome', usage: '/browser <open|click|type|screenshot|snapshot|eval> [url] [--selector css] [--text value] [--keep-open]' },
   { cmd: '/ensemble', desc: 'Run all AI providers in parallel', usage: '/ensemble <prompt>' },
   { cmd: '/vote', desc: 'Run multiple models and vote for best answer', usage: '/vote <prompt>' },
   { cmd: '/orchestrate', desc: 'Full pipeline: classify → parallel → merge → review', usage: '/orchestrate <task>' },

package/src/cli/tui.js

@@ -1,4 +1,4 @@
-import { terminalWidth, visibleWidth, wrapText } from './terminal-ui.js';
+import { terminalWidth, visibleWidth } from './terminal-ui.js';
 
 const WINTER_LOGO = [
   ' __        __ _____ _   _ _______ ______ _____  ',
@@ -14,15 +14,90 @@ function basenameFromPath(filePath, fallback = 'project') {
   return parts[parts.length - 1] || fallback;
 }
 
+function stripAnsi(text = '') {
+  return String(text || '').replace(/\x1b\[[0-9;]*m/g, '');
+}
+
+function clampText(text = '', max = 72) {
+  const value = String(text || '');
+  if (visibleWidth(value) <= max) return value;
+  const plain = stripAnsi(value);
+  return `${plain.slice(0, Math.max(0, max - 3))}...`;
+}
+
+function formatCount(value, fallback = 0) {
+  const number = Number(value ?? fallback);
+  return Number.isFinite(number) ? number : fallback;
+}
+
+function summarizeTools(events = []) {
+  if (!Array.isArray(events) || events.length === 0) return 'idle';
+  return events.slice(-4).map(event => {
+    const name = event.toolName || event.tool || event.name || 'tool';
+    const ok = event.success === false ? 'fail' : 'ok';
+    return `${name}:${ok}`;
+  }).join('  ');
+}
+
+function summarizeHistory(entries = []) {
+  if (!Array.isArray(entries) || entries.length === 0) return [];
+  return entries.slice(-4).map(entry => {
+    const role = entry.role === 'assistant' ? 'Winter' : entry.role === 'user' ? 'You' : entry.role || 'event';
+    const content = typeof entry.content === 'string'
+      ? entry.content
+      : Array.isArray(entry.content)
+        ? entry.content.map(part => part?.text || part?.content || '').join(' ')
+        : entry.text || '';
+    const compact = clampText(content.replace(/\s+/g, ' ').trim(), 78);
+    return compact ? `${role}: ${compact}` : '';
+  }).filter(Boolean);
+}
+
+function formatRecentHistoryLine(entry) {
+  if (typeof entry === 'string') return entry;
+  if (!entry || typeof entry !== 'object') return '';
+  const role = entry.role === 'assistant' ? 'Winter' : entry.role === 'user' ? 'You' : entry.role || 'event';
+  const content = typeof entry.content === 'string'
+    ? entry.content
+    : Array.isArray(entry.content)
+      ? entry.content.map(part => part?.text || part?.content || '').join(' ')
+      : entry.text || '';
+  const compact = clampText(String(content || '').replace(/\s+/g, ' ').trim(), 78);
+  return compact ? `${role}: ${compact}` : '';
+}
+
+function sectionLine(label, value, c = {}) {
+  return `${c.dim || ''}${label.padEnd(10)}${c.reset || ''} ${value}`;
+}
+
 export function buildTuiSnapshot(repl = {}) {
   const provider = repl.ai?.getActiveProvider?.() || 'provider';
   const model = repl.ai?.providers?.[provider]?.model || 'model';
+  const context = repl.session?.getContext?.() || {};
+  const history = repl.session?.getHistory?.() || [];
+  const toolEvents = repl.session?.getToolEvents?.() || [];
+  const codebaseStats = repl.codebaseSearcher?.indexer?.getStats?.() || {};
+  const activeSkills = Array.isArray(context.activeSkills?.value)
+    ? context.activeSkills.value
+    : Array.isArray(context.activeSkills)
+      ? context.activeSkills
+      : [];
+
   return {
     provider,
     model,
+    modelTier: repl.ai?._modelTier || repl.getActiveModelTier?.() || 'unknown',
     projectPath: repl.projectPath || process.cwd(),
     sessionShort: String(repl.session?.getSessionId?.() || 'session').slice(0, 8),
     projectName: basenameFromPath(repl.projectPath || process.cwd()),
+    statusText: repl.isProcessing ? 'running' : 'ready',
+    queueText: Array.isArray(repl.taskQueue) && repl.taskQueue.length > 0 ? `${repl.taskQueue.length} queued` : 'empty',
+    codebaseFiles: formatCount(codebaseStats.totalFiles),
+    codebaseChunks: formatCount(codebaseStats.totalChunks),
+    toolSummary: summarizeTools(toolEvents),
+    recentHistory: summarizeHistory(history),
+    activeSkills: activeSkills.slice(0, 8),
+    hermesCore: true,
   };
 }
 
@@ -39,40 +114,57 @@ export function renderInputPanel(snapshot, {
     : snapshot.provider || snapshot.model || 'model';
 
   return {
-    top: `${c.dim}┌${'─'.repeat(innerWidth + 2)}┐${c.reset}`,
-    status: `${c.bright}${c.cyan}WINTER${c.reset} ${c.dim}·${c.reset} ${projectName} ${c.dim}·${c.reset} ${providerModel}`,
-    hint: `${c.dim}@file${c.reset} attach · ${c.dim}!cmd${c.reset} bash · ${c.dim}^V img${c.reset} paste`,
-    prompt: `${c.bright}${c.green}winter${c.reset} ${c.dim}›${c.reset} `,
-    bottom: `${c.dim}└${'─'.repeat(innerWidth + 2)}┘${c.reset}`,
+    top: `${c.dim}+${'-'.repeat(innerWidth + 2)}+${c.reset}`,
+    status: `${c.bright}${c.cyan}WINTER${c.reset} ${c.dim}.${c.reset} ${projectName} ${c.dim}.${c.reset} ${providerModel}`,
+    hint: `${c.dim}@file${c.reset} attach . ${c.dim}!cmd${c.reset} bash . ${c.dim}Ctrl+V${c.reset}/${c.dim}^V img${c.reset}`,
+    prompt: `${c.bright}${c.green}winter${c.reset} ${c.dim}>${c.reset} `,
+    bottom: `${c.dim}+${'-'.repeat(innerWidth + 2)}+${c.reset}`,
   };
 }
 
 export function renderLandingTui(snapshot, { colors } = {}) {
   const c = colors || {};
   const W = Math.max(60, Math.min(process.stdout.columns || 80, 140));
-  
+
   const bright = c.bright || '\x1b[1m';
   const green = c.brightGreen || c.green || '\x1b[92m';
   const white = c.white || '\x1b[37m';
   const dim = c.dim || '\x1b[2m';
   const reset = c.reset || '\x1b[0m';
-  const bgBlue = '\x1b[48;5;236m'; 
+  const bgBlue = '\x1b[48;5;236m';
 
   const logoLines = WINTER_LOGO.map(line => `${bright}${green}${line}${reset}`);
-  
-  const leftStatus = ` ${snapshot.provider} · ${snapshot.model} `;
-  const rightStatus = ` ESC×2 exit · /help `;
-  const padding = Math.max(0, W - leftStatus.length - rightStatus.length);
+  const leftStatus = ` ${snapshot.provider} / ${snapshot.model} `;
+  const rightStatus = ' /tui /help /doctor tools ';
+  const padding = Math.max(0, W - stripAnsi(leftStatus).length - stripAnsi(rightStatus).length);
   const statusBar = `${bgBlue}${white}${leftStatus}${' '.repeat(padding)}${rightStatus}${reset}`;
+  const recent = snapshot.recentHistory?.length
+    ? snapshot.recentHistory.map(formatRecentHistoryLine).filter(Boolean).map(line => `${dim}- ${line}${reset}`)
+    : [`${dim}- No recent messages loaded.${reset}`];
+  const skills = snapshot.activeSkills?.length ? snapshot.activeSkills.join(', ') : 'coding, debug, test';
 
   return [
     ...logoLines,
     '',
-    `${white}Winter will run commands on your behalf to help you build.${reset}`,
+    `${white}Winter dashboard${reset} ${dim}Hermes-style agent core: skills, memory, tools, subagents, gateway discipline.${reset}`,
     '',
-    `${white}Directory${reset} ${dim}${snapshot.projectPath}${reset}`,
+    statusBar,
     '',
-    statusBar
+    `${bgBlue}${white} STATUS ${reset}`,
+    sectionLine('Project', `${snapshot.projectName}  ${dim}${snapshot.projectPath}${reset}`, c),
+    sectionLine('Model', `${snapshot.provider}/${snapshot.model}  ${dim}${snapshot.modelTier || 'unknown'}${reset}`, c),
+    sectionLine('Session', `${snapshot.sessionShort}  ${dim}${snapshot.statusText || 'ready'} . queue ${snapshot.queueText || 'empty'}${reset}`, c),
+    sectionLine('Codebase', `${snapshot.codebaseFiles || 0} files, ${snapshot.codebaseChunks || 0} chunks`, c),
+    sectionLine('Tools', snapshot.toolSummary || 'idle', c),
+    '',
+    `${bgBlue}${white} AGENT CORE ${reset}`,
+    sectionLine('Hermes', 'self-improve . skill lifecycle . session search . subagents . automation', c),
+    sectionLine('Skills', skills, c),
+    sectionLine('Gateway', 'MCP diagnostics . timeout handling . concrete tool evidence', c),
+    '',
+    `${bgBlue}${white} RECENT ${reset}`,
+    ...recent,
+    renderCommandCenter({ colors: c, width: W }),
   ].join('\n');
 }
 
@@ -84,11 +176,11 @@ export function renderStatusPanel(snapshot, { colors, title = 'Status' } = {}) {
   return [
     '',
     header,
-    `${c.dim}Project :${c.reset} ${snapshot.projectName} (${snapshot.projectPath})`,
-    `${c.dim}Model   :${c.reset} ${snapshot.provider}/${snapshot.model} (${snapshot.modelTier})`,
-    `${c.dim}Session :${c.reset} ${snapshot.sessionShort} | State: ${snapshot.statusText}`,
-    `${c.dim}Codebase:${c.reset} ${snapshot.codebaseFiles} files, ${snapshot.codebaseChunks} chunks`,
-    `${c.dim}Activity:${c.reset} ${snapshot.toolSummary || 'idle'}`,
+    sectionLine('Project', `${snapshot.projectName} (${snapshot.projectPath})`, c),
+    sectionLine('Model', `${snapshot.provider}/${snapshot.model} (${snapshot.modelTier || 'unknown'})`, c),
+    sectionLine('Session', `${snapshot.sessionShort} | ${snapshot.statusText || 'ready'} | queue ${snapshot.queueText || 'empty'}`, c),
+    sectionLine('Codebase', `${snapshot.codebaseFiles || 0} files, ${snapshot.codebaseChunks || 0} chunks`, c),
+    sectionLine('Activity', snapshot.toolSummary || 'idle', c),
     ''
   ].join('\n');
 }
@@ -101,16 +193,20 @@ export function renderCommandCenter({ colors, width = 80 } = {}) {
   const c = colors || {};
   const bgBlue = '\x1b[48;5;236m';
   const header = `${bgBlue}${c.white} COMMAND CENTER ${c.reset}`;
-  
+  const hint = `${c.dim}Slash commands share one workflow: inspect real state, use tools, verify, then report evidence.${c.reset}`;
+
   return [
     '',
     header,
-    `${c.brightGreen}B${c.reset} ${c.bright}${c.cyan}Build  ${c.reset} ${c.dim}/auto /debug /tdd /swe /composer${c.reset}`,
-    `${c.brightGreen}I${c.reset} ${c.bright}${c.cyan}Inspect${c.reset} ${c.dim}/read /grep /glob /search /context${c.reset}`,
-    `${c.brightGreen}M${c.reset} ${c.bright}${c.cyan}Model  ${c.reset} ${c.dim}/provider /providers /model /models /scorecard${c.reset}`,
-    `${c.brightGreen}K${c.reset} ${c.bright}${c.cyan}Memory ${c.reset} ${c.dim}/remember /memories /memory-vault /compress${c.reset}`,
-    `${c.brightGreen}V${c.reset} ${c.bright}${c.cyan}Visual ${c.reset} ${c.dim}/image /paste ^V img /designs /page-agent${c.reset}`,
-    `${c.brightGreen}S${c.reset} ${c.bright}${c.cyan}System ${c.reset} ${c.dim}/doctor full /stats /permissions /mcp /help${c.reset}`,
+    hint,
+    `${c.brightGreen}B${c.reset} ${c.bright}${c.cyan}Build     ${c.reset} ${c.dim}/auto /debug /tdd /swe /composer /plan fetch${c.reset}`,
+    `${c.brightGreen}I${c.reset} ${c.bright}${c.cyan}Inspect   ${c.reset} ${c.dim}/read /grep /glob /search /context /doctor tools${c.reset}`,
+    `${c.brightGreen}M${c.reset} ${c.bright}${c.cyan}Model     ${c.reset} ${c.dim}/provider /providers /model /models /scorecard${c.reset}`,
+    `${c.brightGreen}K${c.reset} ${c.bright}${c.cyan}Memory    ${c.reset} ${c.dim}/remember /memories /memory-vault /compress /stats${c.reset}`,
+    `${c.brightGreen}A${c.reset} ${c.bright}${c.cyan}Agent     ${c.reset} ${c.dim}/skills hermes-agent /mcp /resources /agent /parallel${c.reset}`,
+    `${c.brightGreen}G${c.reset} ${c.bright}${c.cyan}Gateway   ${c.reset} ${c.dim}/mcp list /mcp tools chrome-devtools /permissions list${c.reset}`,
+    `${c.brightGreen}V${c.reset} ${c.bright}${c.cyan}Visual    ${c.reset} ${c.dim}/image /paste Ctrl+V /designs /page-agent /htmlfx${c.reset}`,
+    `${c.brightGreen}S${c.reset} ${c.bright}${c.cyan}System    ${c.reset} ${c.dim}/doctor full /stats /resources /help${c.reset}`,
     ''
   ].join('\n');
 }
@@ -119,16 +215,16 @@ export function renderSplitPanel({ title, left = [], right = [], colors, width =
   const c = colors || {};
   const bgBlue = '\x1b[48;5;236m';
   const header = `${bgBlue}${c.white} ${(title || 'Info').toUpperCase()} ${c.reset}`;
-  
+
   const innerWidth = Math.max(56, width - 4);
   const leftWidth = Math.floor(innerWidth * 0.5);
-  
+
   const rows = [];
   const count = Math.max(left.length, right.length);
   for (let i = 0; i < count; i++) {
     const lText = String(left[i] || '');
     const rText = String(right[i] || '');
-    const lPlain = lText.replace(/\x1b\[[0-9;]*m/g, '');
+    const lPlain = stripAnsi(lText);
     const lPad = Math.max(0, leftWidth - lPlain.length);
     rows.push(`${lText}${' '.repeat(lPad)}   ${rText}`);
   }
@@ -145,7 +241,7 @@ export function renderHistoryPanel(entries = [], { colors, title = 'Recent Sessi
   const c = colors || {};
   const bgBlue = '\x1b[48;5;236m';
   const header = `${bgBlue}${c.white} ${title.toUpperCase()} ${c.reset}`;
-  
+
   const body = entries.length > 0
     ? entries.map(entry => {
       const role = entry.role === 'assistant' ? 'Winter' : entry.role === 'user' ? 'You' : entry.role || 'event';
@@ -166,7 +262,7 @@ export function renderAssistantPanel({ content = '', footer = '', colors, title
   const c = colors || {};
   const bgBlue = '\x1b[48;5;236m';
   const header = `${bgBlue}${c.white} ${title.toUpperCase()} ${c.reset}`;
-  
+
   const parts = [];
   if (title) parts.push('', header);
   if (content) parts.push(content);
@@ -176,15 +272,15 @@ export function renderAssistantPanel({ content = '', footer = '', colors, title
 
 export function renderToolPanel({ toolName = 'Tool', summary = '', success = true, colors } = {}) {
   const c = colors || {};
-  const status = success ? `${c.brightGreen}✓${c.reset}` : `${c.red}✖${c.reset}`;
-  
+  const status = success ? `${c.brightGreen}OK${c.reset}` : `${c.red}FAIL${c.reset}`;
+
   if (!summary.includes('\n')) {
-    return `${status} ${c.bright}${c.cyan}${toolName}${c.reset} ${c.dim}· ${summary}${c.reset}`;
+    return `${status} ${c.bright}${c.cyan}${toolName}${c.reset} ${c.dim}. ${summary}${c.reset}`;
   }
 
   const lines = summary.split('\n');
   const firstLine = lines.shift();
-  
+
   const formattedRest = lines.map(line => {
     if (line.startsWith('+')) return `    ${c.green}${line}${c.reset}`;
     if (line.startsWith('-')) return `    ${c.red}${line}${c.reset}`;
@@ -192,7 +288,7 @@ export function renderToolPanel({ toolName = 'Tool', summary = '', success = tru
     return `    ${c.dim}${line}${c.reset}`;
   }).join('\n');
 
-  let output = `${status} ${c.bright}${c.cyan}${toolName}${c.reset} ${c.dim}· ${firstLine}${c.reset}`;
+  let output = `${status} ${c.bright}${c.cyan}${toolName}${c.reset} ${c.dim}. ${firstLine}${c.reset}`;
   if (formattedRest) output += `\n${formattedRest}`;
   return output;
 }

package/src/mcp/client.js

@@ -1,7 +1,22 @@
-import { spawn } from 'child_process';
-import { encodeMcpMessage, decodeMcpMessages, createNotification, createRequest } from './protocol.js';
-
-export class MCPClient {
+import { spawn } from 'child_process';
+import { encodeMcpMessage, decodeMcpMessages, createNotification, createRequest } from './protocol.js';
+
+export class MCPRequestTimeoutError extends Error {
+  constructor({ method, timeoutMs, requestId, serverName, lastStderr } = {}) {
+    const serverText = serverName ? ` on ${serverName}` : '';
+    const stderrText = lastStderr ? `; stderr: ${lastStderr}` : '';
+    super(`MCP request timed out after ${timeoutMs}ms: ${method}${serverText}${stderrText}`);
+    this.name = 'MCPRequestTimeoutError';
+    this.code = 'MCP_REQUEST_TIMEOUT';
+    this.method = method;
+    this.timeoutMs = timeoutMs;
+    this.requestId = requestId;
+    this.serverName = serverName;
+    this.lastStderr = lastStderr;
+  }
+}
+
+export class MCPClient {
   constructor(serverConfig = {}) {
     this.serverConfig = serverConfig;
     this.process = null;
@@ -22,12 +37,14 @@ export class MCPClient {
       throw new Error('MCP server command is required');
     }
 
-    const args = Array.isArray(this.serverConfig.args) ? this.serverConfig.args : [];
-    this.process = spawn(command, args, {
-      stdio: ['pipe', 'pipe', 'pipe'],
-      shell: false,
-      windowsHide: true,
-    });
+    const args = Array.isArray(this.serverConfig.args) ? this.serverConfig.args : [];
+    this.process = spawn(command, args, {
+      stdio: ['pipe', 'pipe', 'pipe'],
+      cwd: this.serverConfig.cwd || undefined,
+      env: { ...process.env, ...(this.serverConfig.env || {}) },
+      shell: false,
+      windowsHide: true,
+    });
 
     this.process.stdout.on('data', chunk => this.handleStdout(chunk));
     this.process.stderr.on('data', chunk => {
@@ -92,7 +109,15 @@ export class MCPClient {
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
         this.pending.delete(id);
-        reject(new Error(`MCP request timed out: ${method}`));
+        const error = new MCPRequestTimeoutError({
+          method,
+          timeoutMs: this.requestTimeoutMs,
+          requestId: id,
+          serverName: this.serverConfig.name,
+          lastStderr: this.lastStderr,
+        });
+        reject(error);
+        this.closeAfterTimeout(error);
       }, this.requestTimeoutMs);
       this.pending.set(id, { resolve, reject, timer });
       this.process.stdin.write(packet, error => {
@@ -136,6 +161,24 @@ export class MCPClient {
     }
   }
 
+  closeAfterTimeout(error) {
+    this.rejectAllPending(error || new Error('MCP server timed out'));
+    if (!this.process) return;
+    const processRef = this.process;
+    this.process = null;
+    this.initialized = false;
+    try {
+      processRef.stdin?.destroy?.();
+    } catch {
+      // Best-effort cleanup after a timed-out request.
+    }
+    try {
+      processRef.kill();
+    } catch {
+      // Process may already be gone.
+    }
+  }
+
   rejectAllPending(error) {
     for (const pending of this.pending.values()) {
       clearTimeout(pending.timer);

package/src/mcp/presets.js

@@ -0,0 +1,114 @@
+export const CHROME_DEVTOOLS_MCP_NAME = 'chrome-devtools';
+
+const CHROME_DEVTOOLS_PACKAGE = 'chrome-devtools-mcp@latest';
+const CHROME_DEVTOOLS_SOURCE = 'https://github.com/ChromeDevTools/chrome-devtools-mcp';
+
+const CHROME_DEVTOOLS_FLAGS_WITH_VALUES = new Set([
+  '--browser-url',
+  '--channel',
+  '--executablePath',
+  '--logFile',
+  '--viewport',
+  '--proxy-server',
+]);
+
+const CHROME_DEVTOOLS_BOOLEAN_FLAGS = new Set([
+  '--headless',
+  '--isolated',
+  '--acceptInsecureCerts',
+  '--help',
+]);
+
+export function normalizeMcpPresetName(name = '') {
+  return String(name || '').trim().toLowerCase();
+}
+
+export function isChromeDevtoolsPreset(name = '') {
+  return ['chrome-devtools', 'chromedevtools', 'chrome', 'devtools', 'cdp'].includes(normalizeMcpPresetName(name));
+}
+
+export function buildChromeDevtoolsArgs(options = []) {
+  const input = Array.isArray(options) ? [...options] : [];
+  const args = ['-y', CHROME_DEVTOOLS_PACKAGE];
+
+  for (let index = 0; index < input.length; index += 1) {
+    const flag = input[index];
+    if (!String(flag || '').startsWith('--')) continue;
+
+    if (CHROME_DEVTOOLS_BOOLEAN_FLAGS.has(flag)) {
+      args.push(flag);
+      continue;
+    }
+
+    if (CHROME_DEVTOOLS_FLAGS_WITH_VALUES.has(flag)) {
+      const value = input[index + 1];
+      if (value === undefined || String(value).startsWith('--')) {
+        throw new Error(`Missing value for ${flag}`);
+      }
+      args.push(flag, String(value));
+      index += 1;
+    }
+  }
+
+  return args;
+}
+
+export function createChromeDevtoolsMcpServer(options = [], platform = process.platform, env = process.env) {
+  const npxArgs = buildChromeDevtoolsArgs(options);
+  const common = {
+    name: CHROME_DEVTOOLS_MCP_NAME,
+    enabled: true,
+    requestTimeoutMs: 60000,
+    metadata: {
+      preset: CHROME_DEVTOOLS_MCP_NAME,
+      source: CHROME_DEVTOOLS_SOURCE,
+      purpose: 'Chrome DevTools MCP for live browser automation, debugging, screenshots, console, network, and performance traces.',
+    },
+  };
+
+  if (platform === 'win32') {
+    return {
+      ...common,
+      command: 'cmd',
+      args: ['/c', 'npx', ...npxArgs],
+      env: {
+        SystemRoot: env.SystemRoot || 'C:\\Windows',
+        PROGRAMFILES: env.PROGRAMFILES || 'C:\\Program Files',
+      },
+    };
+  }
+
+  return {
+    ...common,
+    command: 'npx',
+    args: npxArgs,
+  };
+}
+
+export function getMcpPreset(name, options = []) {
+  if (isChromeDevtoolsPreset(name)) {
+    return createChromeDevtoolsMcpServer(options);
+  }
+  throw new Error(`Unknown MCP preset: ${name}`);
+}
+
+export function ensureMcpConfigShape(config = {}) {
+  config.mcp = config.mcp || { servers: [] };
+  config.mcp.servers = Array.isArray(config.mcp.servers) ? config.mcp.servers : [];
+  config.permissions = config.permissions || { allowlist: {} };
+  config.permissions.allowlist = config.permissions.allowlist || {};
+  config.permissions.allowlist.tools = config.permissions.allowlist.tools || [];
+  config.permissions.allowlist.commands = config.permissions.allowlist.commands || [];
+  config.permissions.allowlist.mcpServers = config.permissions.allowlist.mcpServers || [];
+  return config;
+}
+
+export function upsertMcpServer(config, server) {
+  ensureMcpConfigShape(config);
+  config.mcp.servers = config.mcp.servers.filter(item => item.name !== server.name);
+  config.mcp.servers.push(server);
+  config.permissions.allowlist.mcpServers = [
+    ...new Set([...(config.permissions.allowlist.mcpServers || []), server.name]),
+  ];
+  return config;
+}