@zivis/cli 0.1.0-alpha.36 → 0.1.0-alpha.38

package/dist/commands/mcp/index.js

@@ -50,38 +50,46 @@ export function registerMcpCommands(program) {
         .command("install")
         .description("write MCP config for a supported IDE client (run from your project root)")
         .option("--client <name>", `target client (${KNOWN_CLIENTS.join(" | ")})`)
-        .option("--with-guidance", "also write IDE guidance files so the AI knows when to suggest security checks (no prompt)")
+        .option("--package <name>", "which ZIVIS MCP package to register: 'builder' (default, @zivis/mcp-builder, citizen-dev surface) or 'appsec' (@zivis/mcp, DevSecOps surface)", "builder")
+        .option("--with-guidance", "also write IDE guidance files so the AI knows when to suggest security checks (no prompt). Only applies to the appsec package; builder ships its own cadence block via zivis_setup.")
         .option("--no-guidance", "skip writing IDE guidance files (no prompt)")
         .action(async (opts) => {
         const client = opts.client?.toLowerCase();
+        const pkgArg = opts.package?.toLowerCase() ?? "builder";
         if (!client) {
             console.error("Specify a client with --client <name>:");
             for (const c of KNOWN_CLIENTS)
                 console.error(`  zivis mcp install --client ${c}`);
             process.exit(1);
         }
+        if (pkgArg !== "appsec" && pkgArg !== "builder") {
+            console.error(`Unknown --package value: ${pkgArg}`);
+            console.error("Supported: appsec, builder");
+            process.exit(1);
+        }
+        const pkg = pkgArg;
         try {
             switch (client) {
                 case "cursor":
-                    await setupCursorWorkspace();
+                    await setupCursorWorkspace(pkg);
                     break;
                 case "claude-code":
-                    printClaudeCodeManual();
+                    printClaudeCodeManual(pkg);
                     break;
                 case "claude-code-cli":
-                    await setupClaudeCodeCli();
+                    await setupClaudeCodeCli(pkg);
                     break;
                 case "cline":
-                    await setupCline();
+                    await setupCline(pkg);
                     break;
                 case "windsurf":
-                    await setupWindsurf();
+                    await setupWindsurf(pkg);
                     break;
                 case "vscode-copilot":
-                    await setupVsCodeCopilot();
+                    await setupVsCodeCopilot(pkg);
                     break;
                 case "vscode-claude":
-                    await setupVsCodeClaude();
+                    await setupVsCodeClaude(pkg);
                     break;
                 default:
                     console.error(`Unknown client: ${client}`);
@@ -95,6 +103,8 @@ export function registerMcpCommands(program) {
         }
         if (client === "claude-code")
             return;
+        if (pkg === "builder")
+            return;
         const guidanceClient = toGuidanceClient(client);
         if (!guidanceClient)
             return;

package/dist/internal/ide-setup.d.ts

@@ -1,3 +1,4 @@
+export type Package = "appsec" | "builder";
 export type GuidanceClient = "cursor" | "claude-code-cli" | "vscode-copilot" | "vscode-claude" | "cline" | "windsurf";
 export interface GuidanceOptions {
     cwd: string;
@@ -5,11 +6,11 @@ export interface GuidanceOptions {
 }
 export declare function writeGuidance(opts: GuidanceOptions): string[];
 export declare function detectIdesInRepo(cwd: string): GuidanceClient[];
-export declare function setupCursor(): Promise<void>;
-export declare function setupCursorWorkspace(): Promise<void>;
-export declare function setupVsCodeCopilot(): Promise<void>;
-export declare function setupVsCodeClaude(): Promise<void>;
-export declare function setupClaudeCodeCli(): Promise<void>;
-export declare function setupCline(): Promise<void>;
-export declare function setupWindsurf(): Promise<void>;
-export declare function printClaudeCodeManual(): void;
+export declare function setupCursor(pkg?: Package): Promise<void>;
+export declare function setupCursorWorkspace(pkg?: Package): Promise<void>;
+export declare function setupVsCodeCopilot(pkg?: Package): Promise<void>;
+export declare function setupVsCodeClaude(pkg?: Package): Promise<void>;
+export declare function setupClaudeCodeCli(pkg?: Package): Promise<void>;
+export declare function setupCline(pkg?: Package): Promise<void>;
+export declare function setupWindsurf(pkg?: Package): Promise<void>;
+export declare function printClaudeCodeManual(pkg?: Package): void;

package/dist/internal/ide-setup.js

@@ -1,6 +1,8 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-const SERVER_NAME = "zivis";
+function getServerName(pkg) {
+    return pkg === "builder" ? "zivis-builder" : "zivis";
+}
 function appendBlock(filePath, blockKey, content) {
     const begin = `<!-- BEGIN ZIVIS:${blockKey} -->`;
     const end = `<!-- END ZIVIS:${blockKey} -->`;
@@ -262,7 +264,18 @@ export function detectIdesInRepo(cwd) {
     }
     return found;
 }
-function buildServerConfig(workspacePath, extra) {
+function buildServerConfig(pkg, workspacePath, extra) {
+    if (pkg === "builder") {
+        const args = ["-y", "@zivis/mcp-builder", "serve"];
+        if (workspacePath) {
+            args.push("--workspace", workspacePath);
+        }
+        return {
+            ...extra,
+            command: "npx",
+            args,
+        };
+    }
     const args = ["mcp", "serve"];
     if (workspacePath) {
         args.push("--workspace", workspacePath);
@@ -294,22 +307,22 @@ async function updateMcpConfig(configPath, serverName, serverConfig, rootKey) {
     servers[serverName] = serverConfig;
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
 }
-export async function setupCursor() {
+export async function setupCursor(pkg = "appsec") {
     const homeDir = process.env.HOME || "";
     const configPath = path.join(homeDir, ".cursor", "mcp.json");
-    await updateMcpConfig(configPath, SERVER_NAME, buildServerConfig(), "mcpServers");
+    await updateMcpConfig(configPath, getServerName(pkg), buildServerConfig(pkg), "mcpServers");
     console.log(`✓ Cursor global MCP config updated: ${configPath}`);
     console.log("  Restart Cursor for changes to take effect");
 }
-export async function setupCursorWorkspace() {
+export async function setupCursorWorkspace(pkg = "appsec") {
     const workspacePath = process.cwd();
     const configPath = path.join(workspacePath, ".cursor", "mcp.json");
-    await updateMcpConfig(configPath, SERVER_NAME, buildServerConfig(workspacePath), "mcpServers");
+    await updateMcpConfig(configPath, getServerName(pkg), buildServerConfig(pkg, workspacePath), "mcpServers");
     console.log(`✓ Cursor workspace MCP config updated: ${configPath}`);
     console.log(`  Workspace: ${workspacePath}`);
     console.log("  Reload Cursor for changes to take effect");
 }
-export async function setupVsCodeCopilot() {
+export async function setupVsCodeCopilot(pkg = "appsec") {
     const workspacePath = process.cwd();
     const localConfigPath = path.join(workspacePath, ".vscode", "mcp.json");
     const globalConfigPath = path.join(process.env.HOME || "", ".vscode", "mcp.json");
@@ -318,20 +331,20 @@ export async function setupVsCodeCopilot() {
     if (!exists && fs.existsSync(globalConfigPath)) {
         configPath = globalConfigPath;
     }
-    await updateMcpConfig(configPath, SERVER_NAME, buildServerConfig(workspacePath, { type: "stdio" }), "servers");
+    await updateMcpConfig(configPath, getServerName(pkg), buildServerConfig(pkg, workspacePath, { type: "stdio" }), "servers");
     console.log(`✓ VS Code (GitHub Copilot) MCP config updated: ${configPath}`);
     console.log(`  Workspace: ${workspacePath}`);
     console.log("  Restart VS Code for changes to take effect");
 }
-export async function setupVsCodeClaude() {
+export async function setupVsCodeClaude(pkg = "appsec") {
     const workspacePath = process.cwd();
     const configPath = path.join(workspacePath, ".vscode", "mcp.json");
-    await updateMcpConfig(configPath, SERVER_NAME, buildServerConfig(workspacePath), "mcpServers");
+    await updateMcpConfig(configPath, getServerName(pkg), buildServerConfig(pkg, workspacePath), "mcpServers");
     console.log(`✓ VS Code (Claude Code) MCP config updated: ${configPath}`);
     console.log(`  Workspace: ${workspacePath}`);
     console.log("  Restart VS Code for changes to take effect");
 }
-export async function setupClaudeCodeCli() {
+export async function setupClaudeCodeCli(pkg = "appsec") {
     const homeDir = process.env.HOME || "";
     const configPath = path.join(homeDir, ".claude.json");
     const workspacePath = process.cwd();
@@ -344,11 +357,7 @@ export async function setupClaudeCodeCli() {
         config.projects ??= {};
         config.projects[workspacePath] ??= {};
         config.projects[workspacePath].mcpServers ??= {};
-        config.projects[workspacePath].mcpServers[SERVER_NAME] = {
-            type: "stdio",
-            command: "zivis",
-            args: ["mcp", "serve", "--workspace", workspacePath],
-        };
+        config.projects[workspacePath].mcpServers[getServerName(pkg)] = buildServerConfig(pkg, workspacePath, { type: "stdio" });
         fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
         console.log("✓ Claude Code CLI MCP config updated: ~/.claude.json");
         console.log(`  Workspace: ${workspacePath}`);
@@ -358,31 +367,31 @@ export async function setupClaudeCodeCli() {
         console.log(`  WARNING: Failed to update ~/.claude.json: ${err instanceof Error ? err.message : err}`);
     }
 }
-export async function setupCline() {
+export async function setupCline(pkg = "appsec") {
     const workspacePath = process.cwd();
     const homeDir = process.env.HOME || "";
     const configPath = process.platform === "darwin"
         ? path.join(homeDir, "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json")
         : path.join(homeDir, ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
-    await updateMcpConfig(configPath, SERVER_NAME, buildServerConfig(workspacePath), "mcpServers");
+    await updateMcpConfig(configPath, getServerName(pkg), buildServerConfig(pkg, workspacePath), "mcpServers");
     console.log(`✓ Cline MCP config updated: ${configPath}`);
     console.log(`  Workspace: ${workspacePath}`);
     console.log("  Restart VS Code for changes to take effect");
 }
-export async function setupWindsurf() {
+export async function setupWindsurf(pkg = "appsec") {
     const workspacePath = process.cwd();
     const homeDir = process.env.HOME || "";
     const configPath = path.join(homeDir, ".codeium", "windsurf", "mcp_config.json");
-    await updateMcpConfig(configPath, SERVER_NAME, buildServerConfig(workspacePath), "mcpServers");
+    await updateMcpConfig(configPath, getServerName(pkg), buildServerConfig(pkg, workspacePath), "mcpServers");
     console.log(`✓ Windsurf MCP config updated: ${configPath}`);
     console.log(`  Workspace: ${workspacePath}`);
     console.log("  Restart Windsurf for changes to take effect");
 }
-export function printClaudeCodeManual() {
+export function printClaudeCodeManual(pkg = "appsec") {
     const workspacePath = process.cwd();
     const serverConfig = {
         mcpServers: {
-            [SERVER_NAME]: buildServerConfig(workspacePath),
+            [getServerName(pkg)]: buildServerConfig(pkg, workspacePath),
         },
     };
     console.log("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zivis/cli",
-  "version": "0.1.0-alpha.36",
+  "version": "0.1.0-alpha.38",
   "description": "ZIVIS CLI — threat modeling, scans, and MCP server for IDE integration",
   "license": "Apache-2.0",
   "homepage": "https://zivis.ai",