spacecode 2.5.6 → 2.5.7

package/dist/repl.mjs

@@ -4988,6 +4988,76 @@ var init_skill_file = __esm({
   }
 });
 
+// ../agent/src/import/claude-json-mcp.ts
+function normalizeClaudeJsonMcp(text, projectPaths) {
+  const errors = [];
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch (err) {
+    if (!(err instanceof SyntaxError)) throw err;
+    return { servers: [], errors: ["not valid JSON"] };
+  }
+  const root = asObject(parsed) ?? {};
+  const serverMap = /* @__PURE__ */ new Map();
+  const processEntry = (name, raw, scope) => {
+    const entry = asObject(raw);
+    if (!entry) {
+      errors.push(`${name}: not an object`);
+      return;
+    }
+    const hasUrl = typeof entry.url === "string";
+    const hasCommand = typeof entry.command === "string";
+    let transport;
+    let url = "";
+    let command = "";
+    let args = [];
+    if (hasUrl && !hasCommand) {
+      transport = "http";
+      url = entry.url;
+    } else if (hasCommand) {
+      transport = "stdio";
+      command = entry.command;
+      if (Array.isArray(entry.args)) args = entry.args.filter((a) => typeof a === "string");
+    } else {
+      errors.push(`${name}: needs a command or a url`);
+      return;
+    }
+    const rawEnv = transport === "http" ? asObject(entry.headers) : asObject(entry.env);
+    const env3 = {};
+    const literalKeys = /* @__PURE__ */ new Set();
+    if (rawEnv) {
+      for (const [k2, v2] of Object.entries(rawEnv)) {
+        if (typeof v2 !== "string") continue;
+        if (v2.includes("${")) {
+          env3[k2] = v2;
+        } else {
+          env3[k2] = "${" + literalVarName(name, k2) + "}";
+          literalKeys.add(k2);
+        }
+      }
+    }
+    serverMap.set(name, { name, scope, transport, command, args, url, env: env3, literalKeys: [...literalKeys].sort() });
+  };
+  for (const [name, raw] of Object.entries(asObject(root.mcpServers) ?? {})) processEntry(name, raw, "user");
+  const projects = asObject(root.projects) ?? {};
+  for (const p of projectPaths) {
+    const servers = asObject(asObject(projects[p])?.mcpServers);
+    if (!servers) continue;
+    for (const [name, raw] of Object.entries(servers)) processEntry(name, raw, "project");
+  }
+  return { servers: [...serverMap.values()].sort((a, b2) => a.name < b2.name ? -1 : a.name > b2.name ? 1 : 0), errors };
+}
+var sanitize, literalVarName, asObject;
+var init_claude_json_mcp = __esm({
+  "../agent/src/import/claude-json-mcp.ts"() {
+    "use strict";
+    sanitize = (s) => s.toUpperCase().replace(/[^A-Z0-9_]/g, "_");
+    literalVarName = (server, key) => `MCP_${sanitize(server)}_${sanitize(key)}`;
+    asObject = (v2) => v2 && typeof v2 === "object" && !Array.isArray(v2) ? v2 : void 0;
+  }
+});
+
 // ../agent/src/import/tool-names.ts
 function translateToolNames(text) {
   const counts = /* @__PURE__ */ new Map();
@@ -5169,6 +5239,7 @@ async function readClaudeAssets({ fs: fs6, home, projectDirs }) {
   }
   await readCommands(fs6, home, report);
   await readSkills(fs6, home, report);
+  await readMcpServers(fs6, home, projectDirs, report);
   for (const dir of projectDirs) {
     const memDir = `${home}/.claude/projects/${claudeProjectSlug(dir)}/memory`;
     let entries;
@@ -5311,12 +5382,51 @@ async function readSkills(fs6, home, report) {
     report.assets.push({ kind: "skill", name: parsed.name, description: parsed.description, content: text, source: skillPath }, ...siblings);
   }
 }
+async function readMcpServers(fs6, home, projectDirs, report) {
+  const path12 = `${home}/.claude.json`;
+  const text = await readOptional(fs6, path12, report);
+  if (text === null) return;
+  const { servers, errors } = normalizeClaudeJsonMcp(text, projectDirs);
+  for (const e of errors) report.errors.push({ path: path12, message: e });
+  const seen = /* @__PURE__ */ new Set();
+  for (const s of servers) {
+    if (!NAME_RE3.test(s.name)) {
+      report.errors.push({ path: path12, message: `MCP server name "${s.name}" must use only letters, digits, . _ - (max 100)` });
+      continue;
+    }
+    if (seen.has(s.name.toLowerCase())) {
+      report.errors.push({ path: path12, message: `MCP server name collision on "${s.name}" (names are case-insensitive)` });
+      continue;
+    }
+    seen.add(s.name.toLowerCase());
+    const { literalKeys, ...def } = s;
+    const content = JSON.stringify(def, null, 2);
+    if (Buffer.byteLength(content, "utf8") > MAX_ASSET_BYTES) {
+      report.errors.push({ path: path12, message: `MCP server "${s.name}" skipped: over the ${MAX_ASSET_BYTES} byte asset limit` });
+      continue;
+    }
+    if (literalKeys.length > 0) {
+      report.notes.push(`MCP server "${s.name}": literal values for ${literalKeys.join(", ")} were NOT imported; set ${literalKeys.map((k2) => literalVarName(s.name, k2)).join(", ")} in your environment`);
+    }
+    if (s.transport === "http" && /[?@]/.test(s.url.replace(/^https?:\/\//, ""))) {
+      report.notes.push(`MCP server "${s.name}": its url contains a query string or credentials, which are stored as written; move any token into a header or environment variable`);
+    }
+    report.assets.push({
+      kind: "mcp",
+      name: s.name,
+      description: s.transport === "stdio" ? `stdio: ${s.command}` : `http: ${s.url}`,
+      content,
+      source: `${path12} (${s.scope})`
+    });
+  }
+}
 var MAX_ASSET_BYTES, NAME_RE3, COMMAND_NAME_RE, SKILL_NAME_RE, MAX_SKILL_FILES;
 var init_claude_sources = __esm({
   "../agent/src/import/claude-sources.ts"() {
     "use strict";
     init_command_file();
     init_skill_file();
+    init_claude_json_mcp();
     init_skill_source();
     MAX_ASSET_BYTES = 256 * 1024;
     NAME_RE3 = /^[A-Za-z0-9._-]{1,100}$/;
@@ -6135,6 +6245,13 @@ var init_mcp_json_summary = __esm({
   }
 });
 
+// ../agent/src/import/mcp-env-expand.ts
+var init_mcp_env_expand = __esm({
+  "../agent/src/import/mcp-env-expand.ts"() {
+    "use strict";
+  }
+});
+
 // ../agent/src/index.ts
 var init_src = __esm({
   "../agent/src/index.ts"() {
@@ -6184,6 +6301,8 @@ var init_src = __esm({
     init_skill_tool();
     init_skill_source();
     init_mcp_json_summary();
+    init_mcp_env_expand();
+    init_claude_json_mcp();
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spacecode",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "description": "SpaceCode - launch cloud dev environments with AI coding agents",
   "license": "MIT",
   "type": "commonjs",