openuispec 0.1.36 → 0.1.38

package/README.md

@@ -52,7 +52,7 @@ cd your-project
 openuispec init
 ```
 
-This scaffolds a spec directory, starter tokens, adds rules to `CLAUDE.md` / `AGENTS.md`, and configures the MCP server in `.claude.json` so AI assistants track spec changes automatically.
+This scaffolds a spec directory, starter tokens, adds rules to `CLAUDE.md` / `AGENTS.md`, and configures the MCP server so AI assistants track spec changes automatically.
 Use `openuispec init --no-configure-targets` if you want to scaffold first and choose target stacks later.
 
 Then hand your spec to any AI code generator:
@@ -251,8 +251,9 @@ OpenUISpec includes an MCP (Model Context Protocol) server that exposes CLI comm
 
 ### Setup
 
-`openuispec init` automatically configures the MCP server in `.claude.json`. For existing projects, add it manually:
+`openuispec init` automatically configures the MCP server for your coding agent. For existing projects, run `openuispec update-rules` or add the config manually:
 
+**Claude Code** (`.mcp.json`), **VS Code / Copilot** (`.vscode/mcp.json`):
 ```json
 {
   "mcpServers": {

package/cli/init.ts

@@ -14,6 +14,7 @@ import {
   readdirSync,
   existsSync,
   appendFileSync,
+  unlinkSync,
 } from "node:fs";
 import { join, relative, dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -263,7 +264,7 @@ Do NOT guess the file format — skipping this step will produce invalid YAML th
 
 ## MCP Tools (recommended for AI assistants)
 
-When the openuispec MCP server is configured (see \`.claude.json\`), AI assistants should use these tools instead of CLI commands:
+When the openuispec MCP server is configured, AI assistants should use these tools instead of CLI commands:
 
 | Tool | When to use |
 |------|-------------|
@@ -471,28 +472,82 @@ export function updateRules(): void {
   }
 
   // Ensure MCP server is configured
-  const claudeJsonPath = join(cwd, ".claude.json");
-  const mcpConfig = {
-    command: "npx",
-    args: ["openuispec-mcp"],
-  };
+  configureMcp(cwd, true);
+}
+
+// ── shared MCP config ───────────────────────────────────────────────
+
+const EXPECTED_MCP_CONFIG = {
+  command: "openuispec",
+  args: ["mcp"],
+};
+
+/**
+ * MCP config files by agent:
+ *   .mcp.json              — Claude Code (project scope)
+ *   .vscode/mcp.json       — VS Code / Copilot Chat
+ *
+ * All use the same { mcpServers: { openuispec: { command, args } } } shape.
+ */
+const MCP_CONFIG_PATHS = [
+  ".mcp.json",
+  join(".vscode", "mcp.json"),
+];
+
+function configureMcp(cwd: string, showRestart: boolean, quiet: boolean = false): void {
+  for (const relPath of MCP_CONFIG_PATHS) {
+    const configPath = join(cwd, relPath);
+
+    // .vscode/mcp.json: only write if .vscode/ already exists
+    if (relPath.startsWith(".vscode") && !existsSync(join(cwd, ".vscode"))) continue;
 
-  try {
-    let claudeJson: Record<string, any> = {};
     try {
-      claudeJson = JSON.parse(readFileSync(claudeJsonPath, "utf-8"));
+      let config: Record<string, any> = {};
+      try {
+        config = JSON.parse(readFileSync(configPath, "utf-8"));
+      } catch {
+        // file doesn't exist or isn't valid JSON — start fresh
+      }
+
+      if (!config.mcpServers) config.mcpServers = {};
+
+      const existing = config.mcpServers.openuispec;
+      const needsUpdate =
+        !existing ||
+        existing.command !== EXPECTED_MCP_CONFIG.command ||
+        JSON.stringify(existing.args) !== JSON.stringify(EXPECTED_MCP_CONFIG.args);
+
+      if (needsUpdate) {
+        config.mcpServers.openuispec = { ...EXPECTED_MCP_CONFIG };
+        writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
+        if (!quiet) console.log(`  ${existing ? "update" : "create"} ${relPath} (MCP server configured)`);
+      } else {
+        if (!quiet) console.log(`  skip ${relPath} (openuispec MCP already configured)`);
+      }
     } catch {
-      // file doesn't exist or isn't valid JSON — start fresh
+      if (!quiet) console.log(`  skip ${relPath} (could not configure MCP server)`);
     }
-    if (!claudeJson.mcpServers) claudeJson.mcpServers = {};
-    if (!claudeJson.mcpServers.openuispec) {
-      claudeJson.mcpServers.openuispec = mcpConfig;
-      writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2) + "\n");
-      console.log(`  create .claude.json (MCP server configured)`);
-      console.log(`\n  Restart Claude Code to activate the MCP server.`);
+  }
+
+  if (showRestart) console.log(`\n  Restart your AI coding agent to activate the MCP server.`);
+
+  // Clean up stale .claude.json MCP config from older versions
+  const claudeJsonPath = join(cwd, ".claude.json");
+  try {
+    const claudeJson = JSON.parse(readFileSync(claudeJsonPath, "utf-8"));
+    if (claudeJson.mcpServers?.openuispec) {
+      delete claudeJson.mcpServers.openuispec;
+      if (Object.keys(claudeJson.mcpServers).length === 0) delete claudeJson.mcpServers;
+      if (Object.keys(claudeJson).length === 0) {
+        unlinkSync(claudeJsonPath);
+        if (!quiet) console.log(`  remove .claude.json (migrated MCP config)`);
+      } else {
+        writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2) + "\n");
+        if (!quiet) console.log(`  update .claude.json (removed stale MCP config)`);
+      }
     }
   } catch {
-    // non-critical — skip silently
+    // .claude.json doesn't exist or not parseable — nothing to clean up
   }
 }
 
@@ -761,30 +816,7 @@ export async function init(argv: string[] = []): Promise<void> {
 
     // ── MCP server configuration ────────────────────────────────────
 
-    const claudeJsonPath = join(cwd, ".claude.json");
-    const mcpConfig = {
-      command: "openuispec",
-      args: ["mcp"],
-    };
-
-    try {
-      let claudeJson: Record<string, any> = {};
-      try {
-        claudeJson = JSON.parse(readFileSync(claudeJsonPath, "utf-8"));
-      } catch {
-        // file doesn't exist or isn't valid JSON — start fresh
-      }
-      if (!claudeJson.mcpServers) claudeJson.mcpServers = {};
-      if (!claudeJson.mcpServers.openuispec) {
-        claudeJson.mcpServers.openuispec = mcpConfig;
-        writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2) + "\n");
-        if (!quiet) console.log(`  create .claude.json (MCP server configured)`);
-      } else {
-        if (!quiet) console.log(`  skip .claude.json (openuispec MCP already configured)`);
-      }
-    } catch {
-      if (!quiet) console.log(`  skip .claude.json (could not configure MCP server)`);
-    }
+    configureMcp(cwd, false, quiet);
 
     if (answers.configureTargets) {
       if (!quiet) console.log("\nConfiguring target stacks...\n");
@@ -831,7 +863,7 @@ Commands:
   openuispec drift --snapshot --target ios   Save current state + git baseline after target output exists
 
 AI rules have been added to CLAUDE.md and AGENTS.md.
-MCP server configured in .claude.json (AI assistants will use openuispec tools automatically).
+MCP server configured (AI assistants will use openuispec tools automatically).
 
 Docs: https://openuispec.rsteam.uz
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openuispec",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "license": "MIT",
   "type": "module",
   "description": "A semantic UI specification format for AI-native, platform-native app development",