multicorn-shield 0.4.0 → 0.6.1

package/README.md

@@ -1,4 +1,4 @@
-![Multicorn Shield](readme-header.svg)
+![Multicorn Shield](https://multicorn.ai/images/og-image-shield.png)
 
 # Multicorn Shield
 
@@ -38,6 +38,8 @@ npm install -g multicorn-shield
 npx multicorn-proxy init
 ```
 
+The init wizard supports multiple agents. Run it again to add agents on different platforms (OpenClaw, Claude Code, Cursor) without losing existing config. Use `npx multicorn-proxy agents` to see configured agents.
+
 **Step 3: Wrap your MCP server**
 
 ```bash
@@ -194,7 +196,7 @@ With the dashboard you can:
 The dashboard works with both the SDK integration and the MCP proxy. No extra setup needed.
 
 <p align="center">
-  <img src="https://multicorn.ai/images/screenshots/overview-page.png" alt="Dashboard overview showing total actions, blocked count, spend, and live activity feed" width="800" />
+  <img src="https://multicorn.ai/images/og-image-shield.png" alt="Dashboard overview showing total actions, blocked count, spend, and live activity feed" width="800" />
 </p>
 
 <p align="center">

package/dist/multicorn-proxy.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { existsSync } from 'fs';
-import { readFile, mkdir, writeFile, unlink } from 'fs/promises';
+import { readFile, writeFile, mkdir, unlink } from 'fs/promises';
 import { join } from 'path';
 import { homedir } from 'os';
 import { createInterface } from 'readline';
@@ -52,21 +52,99 @@ function stripAnsi(str) {
 function normalizeAgentName(raw) {
   return raw.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "").slice(0, 50);
 }
+function isErrnoException(e) {
+  return typeof e === "object" && e !== null && "code" in e;
+}
 function isProxyConfig(value) {
   if (typeof value !== "object" || value === null) return false;
   const obj = value;
   return typeof obj["apiKey"] === "string" && typeof obj["baseUrl"] === "string";
 }
+function isAgentEntry(value) {
+  if (typeof value !== "object" || value === null) return false;
+  const o = value;
+  return typeof o["name"] === "string" && typeof o["platform"] === "string";
+}
+function getAgentByPlatform(config, platform) {
+  const list = config.agents;
+  if (list === void 0 || list.length === 0) return void 0;
+  return list.find((a) => a.platform === platform);
+}
+function getDefaultAgent(config) {
+  const list = config.agents;
+  if (list === void 0 || list.length === 0) return void 0;
+  const defName = config.defaultAgent;
+  if (typeof defName === "string" && defName.length > 0) {
+    const match = list.find((a) => a.name === defName);
+    if (match !== void 0) return match;
+  }
+  return list[0];
+}
+function collectAgentsFromConfig(cfg) {
+  if (cfg === null) return [];
+  if (cfg.agents !== void 0 && cfg.agents.length > 0) {
+    return cfg.agents.map((a) => ({ name: a.name, platform: a.platform }));
+  }
+  const raw = cfg;
+  const legacyName = raw["agentName"];
+  const legacyPlatform = raw["platform"];
+  if (typeof legacyName === "string" && legacyName.length > 0) {
+    const plat = typeof legacyPlatform === "string" && legacyPlatform.length > 0 ? legacyPlatform : "unknown";
+    return [{ name: legacyName, platform: plat }];
+  }
+  return [];
+}
 async function loadConfig() {
   try {
     const raw = await readFile(CONFIG_PATH, "utf8");
     const parsed = JSON.parse(raw);
     if (!isProxyConfig(parsed)) return null;
-    return parsed;
+    const obj = parsed;
+    const agentNameRaw = obj["agentName"];
+    const agentsRaw = obj["agents"];
+    const hasNonEmptyAgents = Array.isArray(agentsRaw) && agentsRaw.length > 0 && agentsRaw.every((e) => isAgentEntry(e));
+    const needsMigrate = typeof agentNameRaw === "string" && agentNameRaw.length > 0 && !hasNonEmptyAgents;
+    if (!needsMigrate) {
+      return parsed;
+    }
+    const platform = typeof obj["platform"] === "string" && obj["platform"].length > 0 ? obj["platform"] : "unknown";
+    const next = { ...obj };
+    delete next["agentName"];
+    delete next["platform"];
+    next["agents"] = [{ name: agentNameRaw, platform }];
+    next["defaultAgent"] = agentNameRaw;
+    const migrated = next;
+    await saveConfig(migrated);
+    return migrated;
   } catch {
     return null;
   }
 }
+async function deleteAgentByName(name) {
+  const config = await loadConfig();
+  if (config === null) return false;
+  const agents = collectAgentsFromConfig(config);
+  const idx = agents.findIndex((a) => a.name === name);
+  if (idx === -1) return false;
+  const nextAgents = agents.filter((_, i) => i !== idx);
+  let defaultAgent = config.defaultAgent;
+  if (defaultAgent === name) {
+    defaultAgent = void 0;
+  }
+  const raw = { ...config };
+  if (nextAgents.length > 0) {
+    raw["agents"] = nextAgents;
+  } else {
+    delete raw["agents"];
+  }
+  if (defaultAgent !== void 0 && defaultAgent.length > 0) {
+    raw["defaultAgent"] = defaultAgent;
+  } else {
+    delete raw["defaultAgent"];
+  }
+  await saveConfig(raw);
+  return true;
+}
 async function saveConfig(config) {
   await mkdir(CONFIG_DIR, { recursive: true, mode: 448 });
   await writeFile(CONFIG_PATH, JSON.stringify(config, null, 2) + "\n", {
@@ -74,6 +152,111 @@ async function saveConfig(config) {
     mode: 384
   });
 }
+var OPENCLAW_MIN_VERSION = "2026.2.26";
+async function detectOpenClaw() {
+  let raw;
+  try {
+    raw = await readFile(OPENCLAW_CONFIG_PATH, "utf8");
+  } catch (e) {
+    if (isErrnoException(e) && e.code === "ENOENT") {
+      return { status: "not-found", version: null };
+    }
+    throw e;
+  }
+  let obj;
+  try {
+    obj = JSON.parse(raw);
+  } catch {
+    return { status: "parse-error", version: null };
+  }
+  const meta = obj["meta"];
+  if (typeof meta === "object" && meta !== null) {
+    const v = meta["lastTouchedVersion"];
+    if (typeof v === "string" && v.length > 0) {
+      return { status: "detected", version: v };
+    }
+  }
+  return { status: "detected", version: null };
+}
+function isVersionAtLeast(version, minimum) {
+  const vParts = version.split(".").map(Number);
+  const mParts = minimum.split(".").map(Number);
+  const len = Math.max(vParts.length, mParts.length);
+  for (let i = 0; i < len; i++) {
+    const v = vParts[i] ?? 0;
+    const m = mParts[i] ?? 0;
+    if (Number.isNaN(v) || Number.isNaN(m)) return false;
+    if (v > m) return true;
+    if (v < m) return false;
+  }
+  return true;
+}
+async function updateOpenClawConfigIfPresent(apiKey, baseUrl, agentName) {
+  let raw;
+  try {
+    raw = await readFile(OPENCLAW_CONFIG_PATH, "utf8");
+  } catch (e) {
+    if (isErrnoException(e) && e.code === "ENOENT") {
+      return "not-found";
+    }
+    throw e;
+  }
+  let obj;
+  try {
+    obj = JSON.parse(raw);
+  } catch {
+    return "parse-error";
+  }
+  let hooks = obj["hooks"];
+  if (hooks === void 0 || typeof hooks !== "object") {
+    hooks = {};
+    obj["hooks"] = hooks;
+  }
+  let internal = hooks["internal"];
+  if (internal === void 0 || typeof internal !== "object") {
+    internal = { enabled: true, entries: {} };
+    hooks["internal"] = internal;
+  }
+  let entries = internal["entries"];
+  if (entries === void 0 || typeof entries !== "object") {
+    entries = {};
+    internal["entries"] = entries;
+  }
+  let shield = entries["multicorn-shield"];
+  if (shield === void 0 || typeof shield !== "object") {
+    shield = { enabled: true, env: {} };
+    entries["multicorn-shield"] = shield;
+  }
+  let env = shield["env"];
+  if (env === void 0 || typeof env !== "object") {
+    env = {};
+    shield["env"] = env;
+  }
+  env["MULTICORN_API_KEY"] = apiKey;
+  env["MULTICORN_BASE_URL"] = baseUrl;
+  if (agentName !== void 0) {
+    env["MULTICORN_AGENT_NAME"] = agentName;
+    const agentsList = obj["agents"];
+    const list = agentsList?.["list"];
+    if (Array.isArray(list) && list.length > 0) {
+      const first = list[0];
+      if (first["id"] !== agentName) {
+        first["id"] = agentName;
+        first["name"] = agentName;
+      }
+    } else {
+      if (agentsList !== void 0 && typeof agentsList === "object") {
+        agentsList["list"] = [{ id: agentName, name: agentName }];
+      } else {
+        obj["agents"] = { list: [{ id: agentName, name: agentName }] };
+      }
+    }
+  }
+  await writeFile(OPENCLAW_CONFIG_PATH, JSON.stringify(obj, null, 2) + "\n", {
+    encoding: "utf8"
+  });
+  return "updated";
+}
 async function validateApiKey(apiKey, baseUrl) {
   try {
     const response = await fetch(`${baseUrl}/api/v1/agents`, {
@@ -280,14 +463,15 @@ async function createProxyConfig(baseUrl, apiKey, agentName, targetUrl, serverNa
   const data = envelope["data"];
   return typeof data?.["proxy_url"] === "string" ? data["proxy_url"] : "";
 }
-function printPlatformSnippet(platform, routingToken, shortName) {
+function printPlatformSnippet(platform, routingToken, shortName, apiKey) {
+  const authHeader = platform === "cursor" ? `Bearer ${apiKey}` : "Bearer YOUR_SHIELD_API_KEY";
   const mcpSnippet = JSON.stringify(
     {
       mcpServers: {
         [shortName]: {
           url: routingToken,
           headers: {
-            Authorization: "Bearer YOUR_SHIELD_API_KEY"
+            Authorization: authHeader
           }
         }
       }
@@ -303,11 +487,13 @@ function printPlatformSnippet(platform, routingToken, shortName) {
     process.stderr.write("\n" + style.dim("Add this to ~/.cursor/mcp.json:") + "\n\n");
   }
   process.stderr.write(style.cyan(mcpSnippet) + "\n\n");
-  process.stderr.write(
-    style.dim(
-      "Replace YOUR_SHIELD_API_KEY with your API key. Find it in Settings > API keys at https://app.multicorn.ai/settings/api-keys"
-    ) + "\n"
-  );
+  if (platform !== "cursor") {
+    process.stderr.write(
+      style.dim(
+        "Replace YOUR_SHIELD_API_KEY with your API key. Find it in Settings > API keys at https://app.multicorn.ai/settings/api-keys"
+      ) + "\n"
+    );
+  }
   if (platform === "cursor") {
     process.stderr.write(
       style.dim(
@@ -321,27 +507,7 @@ function printPlatformSnippet(platform, routingToken, shortName) {
     );
   }
 }
-function printOpenClawInstructions() {
-  process.stderr.write("\n" + style.green("\u2713") + " Agent registered!\n");
-  process.stderr.write(
-    "\nTo connect this agent, add the Multicorn Shield plugin to your OpenClaw agent:\n"
-  );
-  process.stderr.write("\n  " + style.cyan("openclaw plugins add multicorn-shield") + "\n");
-  process.stderr.write(
-    "\nThen start your agent. Shield will monitor and protect tool calls automatically.\n"
-  );
-}
-function printClaudeCodeInstructions() {
-  process.stderr.write("\n" + style.green("\u2713") + " Agent registered!\n");
-  process.stderr.write(
-    "\nTo connect this agent, install the Multicorn Shield plugin in Claude Code:\n"
-  );
-  process.stderr.write("\n  " + style.cyan("claude plugins install multicorn-shield") + "\n");
-  process.stderr.write(
-    "\nThen start a new Claude Code session. Shield will monitor and protect tool calls automatically.\n"
-  );
-}
-async function runInit(baseUrl = "https://api.multicorn.ai", platform) {
+async function runInit(baseUrl = "https://api.multicorn.ai") {
   if (!process.stdin.isTTY) {
     process.stderr.write(
       style.red("Error: interactive terminal required. Cannot run init with piped input.") + "\n"
@@ -408,23 +574,136 @@ async function runInit(baseUrl = "https://api.multicorn.ai", platform) {
     return null;
   }
   const configuredAgents = [];
+  let currentAgents = collectAgentsFromConfig(existing);
   let lastConfig = {
     apiKey,
     baseUrl,
-    ...{}
+    ...currentAgents.length > 0 ? {
+      agents: currentAgents,
+      defaultAgent: existing !== null && typeof existing.defaultAgent === "string" && existing.defaultAgent.length > 0 ? existing.defaultAgent : currentAgents[currentAgents.length - 1]?.name ?? ""
+    } : {}
   };
   let configuring = true;
   while (configuring) {
     const selection = await promptPlatformSelection(ask);
     const selectedPlatform = PLATFORM_BY_SELECTION[selection] ?? "cursor";
     const selectedLabel = PLATFORM_LABELS[selection - 1] ?? "Cursor";
+    const existingForPlatform = currentAgents.find((a) => a.platform === selectedPlatform);
+    if (existingForPlatform !== void 0) {
+      process.stderr.write(
+        `
+An agent for ${selectedLabel} already exists: ${style.cyan(existingForPlatform.name)}
+`
+      );
+      const replace = await ask("Replace it? (Y/n) ");
+      if (replace.trim().toLowerCase() === "n") {
+        const another2 = await ask("\nConnect another agent? (Y/n) ");
+        if (another2.trim().toLowerCase() === "n") {
+          configuring = false;
+        }
+        continue;
+      }
+    }
     const agentName = await promptAgentName(ask, selectedPlatform);
+    let setupSucceeded = false;
     if (selection === 1) {
-      printOpenClawInstructions();
-      configuredAgents.push({ platformLabel: selectedLabel, agentName });
+      let detection;
+      try {
+        detection = await detectOpenClaw();
+      } catch (error) {
+        const detail = error instanceof Error ? error.message : String(error);
+        process.stderr.write(style.red("\u2717") + ` Failed to read OpenClaw config: ${detail}
+`);
+        rl.close();
+        return null;
+      }
+      if (detection.status === "not-found") {
+        process.stderr.write(
+          style.red("\u2717") + " OpenClaw is not installed. Install OpenClaw first, then run npx multicorn-proxy init again.\n"
+        );
+        rl.close();
+        return null;
+      }
+      if (detection.status === "parse-error") {
+        process.stderr.write(
+          style.red("\u2717") + " Could not update OpenClaw config. Set MULTICORN_API_KEY in ~/.openclaw/openclaw.json manually.\n"
+        );
+      }
+      if (detection.status === "detected") {
+        if (detection.version !== null) {
+          process.stderr.write(
+            style.green("\u2713") + ` OpenClaw detected ${style.dim(`(${detection.version})`)}
+`
+          );
+          if (isVersionAtLeast(detection.version, OPENCLAW_MIN_VERSION)) {
+            process.stderr.write(
+              style.green("\u2713") + " " + style.green("Version compatible") + "\n"
+            );
+          } else {
+            process.stderr.write(
+              style.yellow("\u26A0") + ` Shield has been tested with OpenClaw ${style.cyan(OPENCLAW_MIN_VERSION)} and above. Your version (${detection.version}) may work but is untested. We recommend upgrading to at least ${style.cyan(OPENCLAW_MIN_VERSION)}.
+`
+            );
+            const answer = await ask("Continue anyway? (y/N) ");
+            if (answer.trim().toLowerCase() !== "y") {
+              rl.close();
+              return null;
+            }
+          }
+        } else {
+          process.stderr.write(
+            style.yellow("\u26A0") + " Could not detect OpenClaw version. Continuing anyway.\n"
+          );
+        }
+        const spinner = withSpinner("Updating OpenClaw config...");
+        try {
+          const result = await updateOpenClawConfigIfPresent(apiKey, baseUrl, agentName);
+          if (result === "not-found") {
+            spinner.stop(false, "OpenClaw config disappeared unexpectedly.");
+            rl.close();
+            return null;
+          }
+          if (result === "parse-error") {
+            spinner.stop(
+              false,
+              "Could not update OpenClaw config. Set MULTICORN_API_KEY in ~/.openclaw/openclaw.json manually."
+            );
+          } else {
+            spinner.stop(
+              true,
+              "OpenClaw config updated at " + style.cyan("~/.openclaw/openclaw.json")
+            );
+          }
+        } catch (error) {
+          const detail = error instanceof Error ? error.message : String(error);
+          spinner.stop(false, `Failed to update OpenClaw config: ${detail}`);
+        }
+      }
+      configuredAgents.push({
+        selection,
+        platform: selectedPlatform,
+        platformLabel: selectedLabel,
+        agentName
+      });
+      setupSucceeded = true;
     } else if (selection === 2) {
-      printClaudeCodeInstructions();
-      configuredAgents.push({ platformLabel: selectedLabel, agentName });
+      process.stderr.write("\nTo connect Claude Code to Shield:\n\n");
+      process.stderr.write(
+        "  " + style.bold("Step 1") + " - Add the Multicorn marketplace:\n    " + style.cyan("claude plugin marketplace add Multicorn-AI/multicorn-shield") + "\n\n"
+      );
+      process.stderr.write(
+        "  " + style.bold("Step 2") + " - Install the plugin:\n    " + style.cyan("claude plugin install multicorn-shield@multicorn-shield") + "\n\n"
+      );
+      process.stderr.write(
+        style.dim("Requires Claude Code to be installed. Get it at https://code.claude.com") + "\n"
+      );
+      configuredAgents.push({
+        selection,
+        platform: selectedPlatform,
+        platformLabel: selectedLabel,
+        agentName
+      });
+      setupSucceeded = true;
     } else {
       const { targetUrl, shortName } = await promptProxyConfig(ask, agentName);
       let proxyUrl = "";
@@ -454,23 +733,39 @@ async function runInit(baseUrl = "https://api.multicorn.ai", platform) {
       if (created && proxyUrl.length > 0) {
         process.stderr.write("\n" + style.bold("Your Shield proxy URL:") + "\n");
         process.stderr.write("  " + style.cyan(proxyUrl) + "\n");
-        printPlatformSnippet(selectedPlatform, proxyUrl, shortName);
+        printPlatformSnippet(selectedPlatform, proxyUrl, shortName, apiKey);
         configuredAgents.push({
+          selection,
+          platform: selectedPlatform,
           platformLabel: selectedLabel,
           agentName,
           shortName,
           proxyUrl
         });
+        setupSucceeded = true;
       }
     }
-    lastConfig = { apiKey, baseUrl, agentName, platform: selectedPlatform };
-    try {
-      await saveConfig(lastConfig);
-      process.stderr.write(style.green("\u2713") + ` Config saved to ${style.cyan(CONFIG_PATH)}
-`);
-    } catch (error) {
-      const detail = error instanceof Error ? error.message : String(error);
-      process.stderr.write(style.red(`Failed to save config: ${detail}`) + "\n");
+    if (setupSucceeded) {
+      currentAgents = currentAgents.filter((a) => a.platform !== selectedPlatform);
+      currentAgents.push({ name: agentName, platform: selectedPlatform });
+      const raw = existing !== null ? { ...existing } : {};
+      raw["apiKey"] = apiKey;
+      raw["baseUrl"] = baseUrl;
+      raw["agents"] = currentAgents;
+      raw["defaultAgent"] = agentName;
+      delete raw["agentName"];
+      delete raw["platform"];
+      lastConfig = raw;
+      try {
+        await saveConfig(lastConfig);
+        process.stderr.write(
+          style.green("\u2713") + ` Config saved to ${style.cyan(CONFIG_PATH)}
+`
+        );
+      } catch (error) {
+        const detail = error instanceof Error ? error.message : String(error);
+        process.stderr.write(style.red(`Failed to save config: ${detail}`) + "\n");
+      }
     }
     const another = await ask("\nConnect another agent? (Y/n) ");
     if (another.trim().toLowerCase() === "n") {
@@ -487,6 +782,35 @@ async function runInit(baseUrl = "https://api.multicorn.ai", platform) {
       );
     }
     process.stderr.write("\n");
+    const configuredPlatforms = new Set(configuredAgents.map((a) => a.platform));
+    process.stderr.write("\n" + style.bold(style.violet("Next steps")) + "\n");
+    const blocks = [];
+    if (configuredPlatforms.has("openclaw")) {
+      blocks.push(
+        "\n" + style.bold("To complete your OpenClaw setup:") + "\n  \u2192 Restart your gateway: " + style.cyan("openclaw gateway restart") + "\n  \u2192 Start a session: " + style.cyan("openclaw tui") + "\n"
+      );
+    }
+    if (configuredPlatforms.has("claude-code")) {
+      blocks.push(
+        "\n" + style.bold("To complete your Claude Code setup:") + "\n  \u2192 Add marketplace: " + style.cyan("claude plugin marketplace add Multicorn-AI/multicorn-shield") + "\n  \u2192 Install plugin: " + style.cyan("claude plugin install multicorn-shield@multicorn-shield") + "\n"
+      );
+    }
+    if (configuredPlatforms.has("claude-desktop")) {
+      blocks.push(
+        "\n" + style.bold("To complete your Claude Desktop setup:") + "\n  \u2192 Restart Claude Desktop to pick up config changes\n"
+      );
+    }
+    if (configuredPlatforms.has("cursor")) {
+      blocks.push(
+        "\n" + style.bold("To complete your Cursor setup:") + "\n  \u2192 Restart Cursor to pick up MCP config changes\n"
+      );
+    }
+    if (configuredPlatforms.has("other-mcp")) {
+      blocks.push(
+        "\n" + style.bold("To complete your Other MCP Agent setup:") + "\n  \u2192 Start your agent with: " + style.cyan("npx multicorn-proxy --wrap <your-server> --agent-name <name>") + "\n"
+      );
+    }
+    process.stderr.write(blocks.join("") + "\n");
   }
   return lastConfig;
 }
@@ -1599,10 +1923,23 @@ function parseArgs(argv) {
   let baseUrl = "https://api.multicorn.ai";
   let dashboardUrl = "";
   let agentName = "";
+  let deleteAgentName = "";
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === "init") {
       subcommand = "init";
+    } else if (arg === "agents") {
+      subcommand = "agents";
+    } else if (arg === "delete-agent") {
+      subcommand = "delete-agent";
+      const name = args[i + 1];
+      if (name === void 0 || name.startsWith("-")) {
+        process.stderr.write("Error: delete-agent requires an agent name.\n");
+        process.stderr.write("Example: npx multicorn-proxy delete-agent my-agent\n");
+        process.exit(1);
+      }
+      deleteAgentName = name;
+      i++;
     } else if (arg === "--wrap") {
       subcommand = "wrap";
       const next = args[i + 1];
@@ -1672,7 +2009,16 @@ function parseArgs(argv) {
       }
     }
   }
-  return { subcommand, wrapCommand, wrapArgs, logLevel, baseUrl, dashboardUrl, agentName };
+  return {
+    subcommand,
+    wrapCommand,
+    wrapArgs,
+    logLevel,
+    baseUrl,
+    dashboardUrl,
+    agentName,
+    deleteAgentName
+  };
 }
 function printHelp() {
   process.stderr.write(
@@ -1683,6 +2029,12 @@ function printHelp() {
       "  npx multicorn-proxy init",
       "      Interactive setup. Saves API key to ~/.multicorn/config.json.",
       "",
+      "  npx multicorn-proxy agents",
+      "      List configured agents and show which is the default.",
+      "",
+      "  npx multicorn-proxy delete-agent <name>",
+      "      Remove a saved agent.",
+      "",
       "  npx multicorn-proxy --wrap <command> [args...]",
       "      Start <command> as an MCP server and proxy all tool calls through",
       "      Shield's permission layer.",
@@ -1712,6 +2064,40 @@ async function main() {
     await runInit(cli.baseUrl);
     return;
   }
+  if (cli.subcommand === "agents") {
+    const config2 = await loadConfig();
+    if (config2 === null) {
+      process.stderr.write(
+        "No config found. Run `npx multicorn-proxy init` to set up your API key.\n"
+      );
+      process.exit(1);
+    }
+    const agents = collectAgentsFromConfig(config2);
+    if (agents.length === 0) {
+      process.stderr.write("No agents configured. Run `npx multicorn-proxy init` to add one.\n");
+      process.exit(0);
+    }
+    const def = config2.defaultAgent;
+    process.stdout.write("Configured agents:\n");
+    for (const a of agents) {
+      const mark = a.name === def ? " (default)" : "";
+      process.stdout.write(`${a.name} (${a.platform})${mark}
+`);
+    }
+    return;
+  }
+  if (cli.subcommand === "delete-agent") {
+    const safeName = cli.deleteAgentName.replace(/[^\x20-\x7E]/g, "");
+    const ok = await deleteAgentByName(cli.deleteAgentName);
+    if (!ok) {
+      process.stderr.write(`No agent named "${safeName}" in config.
+`);
+      process.exit(1);
+    }
+    process.stdout.write(`Removed agent "${safeName}".
+`);
+    return;
+  }
   if (!cli.baseUrl.startsWith("https://") && !cli.baseUrl.startsWith("http://localhost") && !cli.baseUrl.startsWith("http://127.0.0.1")) {
     process.stderr.write(
       `Error: --base-url must use HTTPS. Received: "${cli.baseUrl}"
@@ -1727,9 +2113,11 @@ Use https:// or http://localhost for local development.
     );
     process.exit(1);
   }
-  const agentName = cli.agentName.length > 0 ? cli.agentName : config.agentName !== void 0 && config.agentName.length > 0 ? config.agentName : deriveAgentName(cli.wrapCommand);
+  const agentName = resolveWrapAgentName(cli, config);
   const finalBaseUrl = cli.baseUrl !== "https://api.multicorn.ai" ? cli.baseUrl : config.baseUrl;
   const finalDashboardUrl = cli.dashboardUrl !== "" ? cli.dashboardUrl : deriveDashboardUrl(finalBaseUrl);
+  const legacyPlatform = config.platform;
+  const platformForServer = typeof legacyPlatform === "string" && legacyPlatform.length > 0 ? legacyPlatform : "other-mcp";
   const proxy = createProxyServer({
     command: cli.wrapCommand,
     commandArgs: cli.wrapArgs,
@@ -1738,7 +2126,7 @@ Use https:// or http://localhost for local development.
     baseUrl: finalBaseUrl,
     dashboardUrl: finalDashboardUrl,
     logger,
-    platform: config.platform ?? "other-mcp"
+    platform: platformForServer
   });
   async function shutdown() {
     logger.info("Shutting down.");
@@ -1753,6 +2141,26 @@ Use https:// or http://localhost for local development.
   });
   await proxy.start();
 }
+function resolveWrapAgentName(cli, config) {
+  if (cli.agentName.length > 0) {
+    return cli.agentName;
+  }
+  const legacyPlatform = config.platform;
+  const legacyAgentName = config.agentName;
+  const platformKey = typeof legacyPlatform === "string" && legacyPlatform.length > 0 ? legacyPlatform : "other-mcp";
+  const fromPlatform = getAgentByPlatform(config, platformKey);
+  if (fromPlatform !== void 0) {
+    return fromPlatform.name;
+  }
+  const fallbackDefault = getDefaultAgent(config);
+  if (fallbackDefault !== void 0) {
+    return fallbackDefault.name;
+  }
+  if (typeof legacyAgentName === "string" && legacyAgentName.length > 0) {
+    return legacyAgentName;
+  }
+  return deriveAgentName(cli.wrapCommand);
+}
 function deriveAgentName(command) {
   const base = command.split("/").pop() ?? command;
   return base.replace(/\.[cm]?[jt]s$/, "");

package/dist/openclaw-plugin/multicorn-shield.js

@@ -492,11 +492,22 @@ function loadMulticornConfig() {
     return null;
   }
 }
+function agentNameFromOpenclawPlatform(cfg) {
+  if (cfg === null) return void 0;
+  const list = cfg.agents;
+  if (!Array.isArray(list)) return void 0;
+  for (const e of list) {
+    if (typeof e === "object" && e !== null && "platform" in e && "name" in e && e.platform === "openclaw" && typeof e.name === "string") {
+      return e.name;
+    }
+  }
+  return void 0;
+}
 function readConfig() {
   const pc = pluginConfig ?? {};
   const resolvedApiKey = asString(cachedMulticornConfig?.apiKey) ?? asString(process.env["MULTICORN_API_KEY"]) ?? "";
   const resolvedBaseUrl = asString(cachedMulticornConfig?.baseUrl) ?? asString(process.env["MULTICORN_BASE_URL"]) ?? "https://api.multicorn.ai";
-  const agentName = asString(pc["agentName"]) ?? process.env["MULTICORN_AGENT_NAME"] ?? asString(cachedMulticornConfig?.agentName) ?? null;
+  const agentName = asString(pc["agentName"]) ?? process.env["MULTICORN_AGENT_NAME"] ?? agentNameFromOpenclawPlatform(cachedMulticornConfig) ?? asString(cachedMulticornConfig?.agentName) ?? null;
   const failMode = "closed";
   return { apiKey: resolvedApiKey, baseUrl: resolvedBaseUrl, agentName, failMode };
 }

package/dist/shield-extension.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { mkdirSync, appendFileSync } from 'fs';
+import { readFileSync, mkdirSync, appendFileSync } from 'fs';
 import { readFile, mkdir, writeFile, unlink } from 'fs/promises';
 import { homedir } from 'os';
 import { join } from 'path';
@@ -22358,7 +22358,7 @@ async function writeExtensionBackup(claudeDesktopConfigPath, mcpServers) {
 
 // package.json
 var package_default = {
-  version: "0.4.0"};
+  version: "0.6.1"};
 
 // src/package-meta.ts
 var PACKAGE_VERSION = package_default.version;
@@ -23522,8 +23522,27 @@ function readBaseUrl() {
   return raw;
 }
 function readAgentName() {
+  try {
+    const rawFile = readFileSync(getMulticornConfigPath(), "utf8");
+    const obj = JSON.parse(rawFile);
+    const agents = obj["agents"];
+    if (Array.isArray(agents)) {
+      for (const e of agents) {
+        if (typeof e === "object" && e !== null && e.platform === "claude-desktop" && typeof e.name === "string") {
+          const n = e.name.trim();
+          if (n.length > 0) {
+            return n;
+          }
+        }
+      }
+    }
+  } catch {
+  }
   const raw = process.env["MULTICORN_AGENT_NAME"]?.trim();
-  return raw !== void 0 && raw.length > 0 ? raw : "claude-desktop-shield";
+  if (raw !== void 0 && raw.length > 0 && !raw.startsWith("${")) {
+    return raw;
+  }
+  return "claude-desktop-shield";
 }
 function readLogLevel() {
   const raw = process.env["MULTICORN_LOG_LEVEL"]?.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multicorn-shield",
-  "version": "0.4.0",
+  "version": "0.6.1",
   "description": "The control layer for AI agents: permissions, consent, spending limits, and audit logging.",
   "license": "MIT",
   "type": "module",