@weppy/roblox-mcp 2.2.2 → 2.3.1

package/install.ps1

@@ -4,17 +4,15 @@
 # Usage:
 #   irm https://raw.githubusercontent.com/hope1026/weppy-roblox-mcp/main/install.ps1 | iex
 #
-# Interactive 3 steps:
-#   [1/3] MCP server install (npm)
-#   [2/3] Roblox Studio Plugin install (.rbxm)
-#   [3/3] Register MCP with AI apps (user selection)
+# Interactive 2 steps:
+#   [1/2] Setup — install Roblox Studio Plugin via npx
+#   [2/2] Register MCP with AI apps (user selection)
 #
 
 $ErrorActionPreference = "Stop"
 $script:InstallLogPath = Join-Path ([System.IO.Path]::GetTempPath()) ("wrox-install-{0:yyyyMMdd-HHmmss}.log" -f (Get-Date))
 $script:TranscriptStarted = $false
 $script:NpmCommandPath = $null
-$script:NpmGlobalPrefix = $null
 
 # ── Utilities ──
 function Write-Step($step, $msg) { Write-Host "`n[$step] $msg" -ForegroundColor Cyan -NoNewline; Write-Host "" }
@@ -50,6 +48,10 @@ trap {
 }
 
 function Confirm-Action($prompt) {
+    if ($env:CI -eq 'true') {
+        Write-Host "$prompt (Y/n): Y"
+        return $true
+    }
     $reply = Read-Host "$prompt (Y/n)"
     if ([string]::IsNullOrWhiteSpace($reply)) { $reply = "Y" }
     return $reply -match '^[Yy]'
@@ -69,30 +71,6 @@ function Resolve-NpmCommand() {
     return $script:NpmCommandPath
 }
 
-function Get-NpmGlobalPrefix() {
-    if ($script:NpmGlobalPrefix) {
-        return $script:NpmGlobalPrefix
-    }
-
-    $script:NpmGlobalPrefix = (Invoke-Npm prefix -g 2>$null | Out-String).Trim()
-    return $script:NpmGlobalPrefix
-}
-
-function Invoke-Npm {
-    param(
-        [Parameter(ValueFromRemainingArguments = $true)]
-        [string[]]$Args
-    )
-
-    $npmCommandPath = Resolve-NpmCommand
-    $output = & $npmCommandPath @Args
-    if ($LASTEXITCODE -ne 0) {
-        throw "npm $($Args -join ' ') failed with exit code $LASTEXITCODE"
-    }
-
-    return $output
-}
-
 function Resolve-OptionalCliCommand($commandName) {
     $resolvedCommand = Get-Command $commandName -ErrorAction SilentlyContinue
     if ($resolvedCommand) {
@@ -100,11 +78,6 @@ function Resolve-OptionalCliCommand($commandName) {
     }
 
     $candidatePaths = @()
-    $npmPrefix = Get-NpmGlobalPrefix
-    if ($npmPrefix) {
-        $candidatePaths += (Join-Path $npmPrefix "$commandName.cmd")
-        $candidatePaths += (Join-Path $npmPrefix $commandName)
-    }
 
     if ($env:APPDATA) {
         $appDataNpmDir = Join-Path $env:APPDATA 'npm'
@@ -139,7 +112,7 @@ function Test-McpJsonConfigured($configPath) {
     }
 }
 
-# Add MCP server to Antigravity config (flat top-level keys, no mcpServers wrapper)
+# Antigravity 설정에 canonical mcpServers 래퍼로 MCP 서버를 추가하고 legacy flat key를 정리
 function Add-AntigravityMcpConfig($configPath) {
     $parentDir = Split-Path $configPath -Parent
     if (-not (Test-Path $parentDir)) { New-Item -ItemType Directory -Path $parentDir -Force | Out-Null }
@@ -150,7 +123,20 @@ const fs = require('fs');
 const configPath = process.env.MCP_CONFIG_PATH;
 let config = {};
 try { config = JSON.parse(fs.readFileSync(configPath, 'utf8')); } catch {}
-config['weppy-roblox-mcp'] = { command: 'npx', args: ['-y', '@weppy/roblox-mcp'] };
+if (!config || typeof config !== 'object' || Array.isArray(config)) {
+  config = {};
+}
+const mcpServers = config.mcpServers;
+if (mcpServers !== undefined && (typeof mcpServers !== 'object' || mcpServers === null || Array.isArray(mcpServers))) {
+  throw new Error('Antigravity mcpServers must be an object');
+}
+const next = { ...config };
+delete next['weppy-roblox-mcp'];
+next.mcpServers = {
+  ...(mcpServers || {}),
+  'weppy-roblox-mcp': { command: 'npx', args: ['-y', '@weppy/roblox-mcp'] }
+};
+config = next;
 fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
 "@
     } finally {
@@ -165,7 +151,10 @@ function Test-AntigravityMcpConfigured($configPath) {
 
     try {
         $config = Get-Content -Path $configPath -Raw | ConvertFrom-Json
-        return $null -ne $config.'weppy-roblox-mcp'
+        $hasLegacyFlatKey = $config.PSObject.Properties.Name -contains 'weppy-roblox-mcp'
+        $server = $config.mcpServers.'weppy-roblox-mcp'
+        $hasCanonicalArgs = ($server.args -is [System.Array]) -and ($server.args.Count -eq 2) -and ($server.args[0] -eq '-y') -and ($server.args[1] -eq '@weppy/roblox-mcp')
+        return ($server.command -eq 'npx') -and $hasCanonicalArgs -and (-not $hasLegacyFlatKey)
     }
     catch {
         return $false
@@ -177,7 +166,421 @@ function Test-CodexConfigConfigured($configPath) {
         return $false
     }
 
-    return Select-String -Path $configPath -Pattern '^\s*\[mcp_servers\.weppy-roblox-mcp\]\s*$' -Quiet
+    $env:MCP_CODEX_CONFIG_PATH = $configPath
+    try {
+        node -e @'
+const fs = require('fs');
+
+const configPath = process.env.MCP_CODEX_CONFIG_PATH;
+const serverName = 'weppy-roblox-mcp';
+const expectedCommand = 'npx';
+const expectedArgs = ['-y', '@weppy/roblox-mcp'];
+const headerPattern = new RegExp(
+  '^\\s*\\[\\s*mcp_servers\\.' + serverName.replace(/[.*+?^${}()|[\]\\\\]/g, '\\$&') + '\\s*\\]\\s*(?:#.*)?$'
+);
+
+function stripCommentOutsideStrings(line) {
+  let inSingle = false;
+  let inDouble = false;
+  let escaped = false;
+
+  for (let index = 0; index < line.length; index += 1) {
+    const char = line[index];
+
+    if (char === '"' && !inSingle && !escaped) {
+      inDouble = !inDouble;
+    } else if (char === "'" && !inDouble && !escaped) {
+      inSingle = !inSingle;
+    } else if (char === '#' && !inSingle && !inDouble) {
+      return line.slice(0, index).trimEnd();
+    }
+
+    escaped = char === '\\' && !escaped;
+    if (char !== '\\') {
+      escaped = false;
+    }
+  }
+
+  return line.trimEnd();
+}
+
+function countTripleQuoteToggles(line, quote) {
+  let count = 0;
+  let inSingle = false;
+  let inDouble = false;
+  let escaped = false;
+
+  for (let index = 0; index < line.length; index += 1) {
+    const char = line[index] ?? '';
+    const nextThree = line.slice(index, index + 3);
+    const isOutsideStrings = !inSingle && !inDouble;
+
+    if (isOutsideStrings && nextThree === quote.repeat(3)) {
+      count += 1;
+      index += 2;
+      escaped = false;
+      continue;
+    }
+
+    if (char === '"' && !inSingle && !escaped) {
+      inDouble = !inDouble;
+    } else if (char === "'" && !inDouble && !escaped) {
+      inSingle = !inSingle;
+    } else if (char === '#' && !inSingle && !inDouble) {
+      break;
+    }
+
+    escaped = char === '\\' && !escaped;
+    if (char !== '\\') {
+      escaped = false;
+    }
+  }
+
+  return count;
+}
+
+function advanceTripleQuoteState(line, state) {
+  const next = { ...state };
+  const tripleDoubleCount = countTripleQuoteToggles(line, '"');
+  const tripleSingleCount = countTripleQuoteToggles(line, "'");
+
+  if (!next.inTripleSingle && tripleDoubleCount % 2 === 1) {
+    next.inTripleDouble = !next.inTripleDouble;
+  }
+
+  if (!next.inTripleDouble && tripleSingleCount % 2 === 1) {
+    next.inTripleSingle = !next.inTripleSingle;
+  }
+
+  return next;
+}
+
+function isTomlTableHeaderLine(line) {
+  const normalized = stripCommentOutsideStrings(line).trim();
+
+  if (normalized.length === 0) {
+    return false;
+  }
+
+  return /^\[\[.*\]\]$/.test(normalized) || /^\[.*\]$/.test(normalized);
+}
+
+function findAllCodexBlocks(source) {
+  const lines = source.split('\n');
+  const blocks = [];
+  let activeLines = null;
+  let state = {
+    inTripleDouble: false,
+    inTripleSingle: false,
+  };
+
+  for (const line of lines) {
+    const isHeaderCandidate = !state.inTripleDouble && !state.inTripleSingle && isTomlTableHeaderLine(line);
+    const isCodexHeader = isHeaderCandidate && headerPattern.test(line);
+
+    if (isCodexHeader) {
+      if (activeLines !== null) {
+        blocks.push(activeLines.join('\n').trim());
+      }
+      activeLines = [line];
+    } else if (activeLines !== null && isHeaderCandidate) {
+      blocks.push(activeLines.join('\n').trim());
+      activeLines = null;
+    } else if (activeLines !== null) {
+      activeLines.push(line);
+    }
+
+    state = advanceTripleQuoteState(line, state);
+  }
+
+  if (activeLines !== null) {
+    blocks.push(activeLines.join('\n').trim());
+  }
+
+  return blocks;
+}
+
+function parseStringAssignment(value, key) {
+  const match = new RegExp('^\\s*' + key + '\\s*=\\s*(["\\'])([^"\\']+)\\1\\s*$').exec(value);
+  return match ? match[2] : null;
+}
+
+function parseTomlStringArray(value) {
+  const match = /^\s*args\s*=\s*\[(.*)\]\s*$/ms.exec(value.trim());
+
+  if (match === null) {
+    return null;
+  }
+
+  const body = match[1] ?? '';
+  const values = [];
+  let cursor = 0;
+  let expectValue = true;
+
+  while (cursor < body.length) {
+    while (cursor < body.length && /\s/.test(body[cursor] ?? '')) {
+      cursor += 1;
+    }
+
+    if (cursor >= body.length) {
+      break;
+    }
+
+    if (!expectValue) {
+      if (body[cursor] !== ',') {
+        return null;
+      }
+      cursor += 1;
+      expectValue = true;
+      continue;
+    }
+
+    const quote = body[cursor];
+    if (quote !== '"' && quote !== "'") {
+      return null;
+    }
+
+    cursor += 1;
+    let token = '';
+    let escaped = false;
+
+    while (cursor < body.length) {
+      const char = body[cursor] ?? '';
+
+      if (char === quote && !escaped) {
+        cursor += 1;
+        values.push(token);
+        break;
+      }
+
+      token += char;
+      escaped = char === '\\' && !escaped;
+      if (char !== '\\') {
+        escaped = false;
+      }
+      cursor += 1;
+    }
+
+    if (cursor > body.length) {
+      return null;
+    }
+
+    expectValue = false;
+  }
+
+  const leftover = body.slice(cursor).trim();
+  if (leftover === ',') {
+    return values;
+  }
+
+  return leftover.length === 0 ? values : null;
+}
+
+function collectArrayLines(lines, startIndex) {
+  const collected = [stripCommentOutsideStrings(lines[startIndex] ?? '')];
+  let bracketDepth = 0;
+  let inSingle = false;
+  let inDouble = false;
+  let escaped = false;
+
+  for (let lineIndex = startIndex; lineIndex < lines.length; lineIndex += 1) {
+    const sanitized = stripCommentOutsideStrings(lines[lineIndex] ?? '');
+    if (lineIndex !== startIndex) {
+      collected.push(sanitized);
+    }
+
+    for (let index = 0; index < sanitized.length; index += 1) {
+      const char = sanitized[index] ?? '';
+
+      if (char === '"' && !inSingle && !escaped) {
+        inDouble = !inDouble;
+      } else if (char === "'" && !inDouble && !escaped) {
+        inSingle = !inSingle;
+      } else if (!inSingle && !inDouble) {
+        if (char === '[') {
+          bracketDepth += 1;
+        } else if (char === ']') {
+          bracketDepth -= 1;
+        }
+      }
+
+      escaped = char === '\\' && !escaped;
+      if (char !== '\\') {
+        escaped = false;
+      }
+    }
+
+    if (bracketDepth <= 0) {
+      return {
+        nextIndex: lineIndex,
+        text: collected.join('\n'),
+      };
+    }
+  }
+
+  return null;
+}
+
+function parseCodexBlock(blockContent) {
+  const lines = blockContent.split('\n');
+  let command = null;
+  let args = null;
+  let hasConflict = false;
+  let inTripleDouble = false;
+  let inTripleSingle = false;
+
+  for (let index = 1; index < lines.length; index += 1) {
+    const line = lines[index] ?? '';
+    const sanitized = stripCommentOutsideStrings(line);
+    const trimmed = sanitized.trim();
+
+    if (inTripleDouble) {
+      if (countTripleQuoteToggles(sanitized, '"') % 2 === 1) {
+        inTripleDouble = false;
+      }
+      continue;
+    }
+
+    if (inTripleSingle) {
+      if (countTripleQuoteToggles(sanitized, "'") % 2 === 1) {
+        inTripleSingle = false;
+      }
+      continue;
+    }
+
+    if (countTripleQuoteToggles(sanitized, '"') % 2 === 1) {
+      inTripleDouble = true;
+      continue;
+    }
+
+    if (countTripleQuoteToggles(sanitized, "'") % 2 === 1) {
+      inTripleSingle = true;
+      continue;
+    }
+
+    if (trimmed.length === 0) {
+      continue;
+    }
+
+    if (/^command\s*=/.test(trimmed)) {
+      const parsedCommand = parseStringAssignment(trimmed, 'command');
+      if (command !== null || parsedCommand === null) {
+        hasConflict = true;
+      } else {
+        command = parsedCommand;
+      }
+      continue;
+    }
+
+    if (/^args\s*=/.test(trimmed)) {
+      const collected = collectArrayLines(lines, index);
+      const parsedArgs = collected === null ? null : parseTomlStringArray(collected.text);
+
+      if (args !== null || parsedArgs === null || collected === null) {
+        hasConflict = true;
+      } else {
+        args = parsedArgs;
+        index = collected.nextIndex;
+      }
+    }
+  }
+
+  return {
+    args,
+    command,
+    hasConflict,
+  };
+}
+
+function isStructurallySafe(source) {
+  let bracketDepth = 0;
+  let braceDepth = 0;
+  let inSingle = false;
+  let inDouble = false;
+  let escaped = false;
+  let tripleState = {
+    inTripleDouble: false,
+    inTripleSingle: false,
+  };
+
+  for (const line of source.split('\n')) {
+    tripleState = advanceTripleQuoteState(line, tripleState);
+
+    for (let index = 0; index < line.length; index += 1) {
+      const char = line[index] ?? '';
+
+      if (!inSingle && !inDouble && char === '#') {
+        break;
+      }
+
+      if (char === '"' && !inSingle && !escaped) {
+        inDouble = !inDouble;
+      } else if (char === "'" && !inDouble && !escaped) {
+        inSingle = !inSingle;
+      } else if (!inSingle && !inDouble) {
+        if (char === '[') {
+          bracketDepth += 1;
+        } else if (char === ']') {
+          bracketDepth -= 1;
+          if (bracketDepth < 0) {
+            return false;
+          }
+        } else if (char === '{') {
+          braceDepth += 1;
+        } else if (char === '}') {
+          braceDepth -= 1;
+          if (braceDepth < 0) {
+            return false;
+          }
+        }
+      }
+
+      escaped = char === '\\' && !escaped;
+      if (char !== '\\') {
+        escaped = false;
+      }
+    }
+  }
+
+  return (
+    !tripleState.inTripleDouble &&
+    !tripleState.inTripleSingle &&
+    bracketDepth === 0 &&
+    braceDepth === 0 &&
+    !inSingle &&
+    !inDouble
+  );
+}
+
+try {
+  const source = fs.readFileSync(configPath, 'utf8');
+  if (!isStructurallySafe(source)) {
+    process.exit(1);
+  }
+
+  const blocks = findAllCodexBlocks(source);
+  if (blocks.length !== 1) {
+    process.exit(1);
+  }
+
+  const parsed = parseCodexBlock(blocks[0]);
+  const isConfigured =
+    !parsed.hasConflict &&
+    parsed.command === expectedCommand &&
+    Array.isArray(parsed.args) &&
+    parsed.args.length === expectedArgs.length &&
+    parsed.args.every((entry, index) => entry === expectedArgs[index]);
+
+  process.exit(isConfigured ? 0 : 1);
+} catch {
+  process.exit(1);
+}
+'@
+        return $LASTEXITCODE -eq 0
+    }
+    finally {
+        Remove-Item Env:\MCP_CODEX_CONFIG_PATH -ErrorAction SilentlyContinue
+    }
 }
 
 # Add MCP server to JSON config file (PowerShell 5.1 compatible — edits JSON via node)
@@ -200,11 +603,6 @@ fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
     }
 }
 
-function Test-LfsPointer($filePath) {
-    if (-not (Test-Path $filePath)) { return $false }
-    return Select-String -Path $filePath -Pattern "git-lfs.github.com/spec/v1" -Quiet
-}
-
 # ── Header ──
 Write-Host ""
 Write-Host "WROX Installer" -ForegroundColor White -BackgroundColor DarkCyan
@@ -225,71 +623,37 @@ catch {
 }
 
 # ═══════════════════════════════════
-# [1/3] MCP server install
+# [1/2] Setup — Roblox Studio Plugin
 # ═══════════════════════════════════
-Write-Step "1/3" "Install @weppy/roblox-mcp via npm"
+Write-Step "1/2" "Setup Roblox Studio Plugin"
 
-if (Confirm-Action "  Run npm install -g @weppy/roblox-mcp?") {
+if (Confirm-Action "  Run npx -y @weppy/roblox-mcp --setup?") {
     try {
-        Invoke-Npm install -g "@weppy/roblox-mcp"
-        Write-Ok "Installed @weppy/roblox-mcp"
-    }
-    catch {
-        Abort-Install "npm install failed: $_"
-    }
-}
-else {
-    Write-Warn "MCP server install skipped"
-}
-
-# ═══════════════════════════════════
-# [2/3] Roblox Studio Plugin install
-# ═══════════════════════════════════
-Write-Step "2/3" "Install Roblox Studio Plugin"
-
-$pluginsDir = Join-Path $env:LOCALAPPDATA "Roblox\Plugins"
-$pluginName = "WeppyRobloxMCP.rbxm"
-
-# Search for .rbxm in npm global path
-$npmPrefix = Get-NpmGlobalPrefix
-$bundledPlugin = $null
-$searchPaths = @(
-    (Join-Path $npmPrefix "node_modules\@weppy\roblox-mcp\plugins\weppy-roblox-mcp\roblox-plugin\$pluginName"),
-    (Join-Path $npmPrefix "node_modules\@weppy\roblox-mcp\roblox-plugin\$pluginName")
-)
-foreach ($p in $searchPaths) {
-    if (Test-Path $p) {
-        $bundledPlugin = $p
-        break
-    }
-}
-
-if ($bundledPlugin) {
-    if (Test-LfsPointer $bundledPlugin) {
-        Abort-Install "Bundled plugin payload is invalid (Git LFS pointer detected). Install the plugin from the GitHub release ZIP instead."
-    }
-
-    Write-Host "  → $pluginsDir\$pluginName"
-    if (Confirm-Action "  Copy plugin to Roblox Plugins folder?") {
-        if (-not (Test-Path $pluginsDir)) {
-            New-Item -ItemType Directory -Path $pluginsDir -Force | Out-Null
+        $npmCommandPath = Resolve-NpmCommand
+        $npmDir = Split-Path $npmCommandPath -Parent
+        $npxPath = Join-Path $npmDir "npx.cmd"
+        if (-not (Test-Path $npxPath)) {
+            $npxPath = "npx"
+        }
+        & $npxPath -y "@weppy/roblox-mcp" --setup
+        if ($LASTEXITCODE -ne 0) {
+            Write-Warn "Setup encountered a warning (non-blocking)"
+        } else {
+            Write-Ok "Setup complete"
         }
-        Copy-Item $bundledPlugin -Destination (Join-Path $pluginsDir $pluginName) -Force
-        Write-Ok "Plugin installed → $pluginsDir\$pluginName"
     }
-    else {
-        Write-Warn "Plugin install skipped"
+    catch {
+        Write-Warn "Setup encountered a warning: $_"
     }
 }
 else {
-    Write-Warn "Bundled plugin file not found"
-    Write-Info "Will be installed automatically on first MCP server run"
+    Write-Warn "Setup skipped"
 }
 
 # ═══════════════════════════════════
-# [3/3] Register MCP with AI apps
+# [2/2] Register MCP with AI apps
 # ═══════════════════════════════════
-Write-Step "3/3" "Register MCP with AI apps"
+Write-Step "2/2" "Register MCP with AI apps"
 Write-Host "  Automatic registration: Claude Code, Claude Desktop, Cursor, Codex CLI/App, Gemini CLI, Antigravity"
 
 $detectedNames = @()
@@ -403,7 +767,12 @@ else {
     }
 
     Write-Host ""
-    $selection = Read-Host "  Select apps to register (comma-separated, 'a' for all, 'n' to skip)"
+    if ($env:CI -eq 'true') {
+        Write-Host "  Select apps to register (comma-separated, 'a' for all, 'n' to skip): a"
+        $selection = 'a'
+    } else {
+        $selection = Read-Host "  Select apps to register (comma-separated, 'a' for all, 'n' to skip)"
+    }
     if ([string]::IsNullOrWhiteSpace($selection)) { $selection = "n" }
 
     $selectedIndices = @()
@@ -436,7 +805,8 @@ else {
                     elseif ($claudeCodeCliCommand) {
                         & $claudeCodeCliCommand mcp add weppy-roblox-mcp -- npx -y "@weppy/roblox-mcp"
                         if ($LASTEXITCODE -ne 0) {
-                            throw 'claude mcp add failed'
+                            # CLI 실패 시 (Windows에서 -- 파싱 문제 등) JSON config에 직접 쓰기로 폴백
+                            Add-McpToConfig $claudeGlobalConfig
                         }
                         Write-Ok "Registered: $appName"
                     }