artifacty 0.10.0 → 0.10.2

package/docs/integrations.md

@@ -130,9 +130,29 @@ their password before they can continue to `/account` and issue MCP/API tokens.
 - `--api-token <token>` is written into the generated MCP environment for bridge mode. For central servers, prefer a personal token issued from `/account`.
 - `--url <url>` remains a browser-link override and does not enable central MCP by itself.
 - `--timeout <ms>` adjusts Codex `startup_timeout_sec` and Gemini `timeout`. It does not change Claude Code startup behavior; set `MCP_TIMEOUT` before launching Claude Code if you need a larger value there.
+- Do not use `artifacty install all --config <path>`. Each MCP client uses a
+  different config file shape, so shared config overrides are rejected. Use
+  `artifacty install <agent> --config <path>` only when targeting one agent.
+- JSON-based installers preserve unrelated servers and replace only the
+  `artifacty` entry. If `mcpServers` or `servers` already exists but is not a
+  JSON object, Artifacty stops with an error instead of rewriting the file.
 - `check` starts the local MCP server and verifies required tools, resources, and prompts through MCP discovery methods.
 - `doctor` combines MCP discovery with runtime, storage, server, and service diagnostics.
 
+Codex troubleshooting:
+
+- If Codex reports a duplicate `mcp_servers.artifacty.env` or `artifacty.env`
+  key, update Artifacty and rerun the Codex installer. Older installs could
+  leave a legacy `[mcp_servers.artifacty.env]` child table behind while adding a
+  new inline `env = { ... }` value.
+
+```bash
+npm install -g artifacty@latest
+artifacty install codex \
+  --mcp-url http://10.0.0.50:8787/mcp \
+  --api-token "$ARTIFACTY_PERSONAL_TOKEN"
+```
+
 ## Client Compatibility Matrix
 
 | Client | Config shape | Scope | Timeout behavior | Restart requirement | Notes |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "artifacty",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "Local artifact exchange for heterogeneous LLM agents via HTTP and MCP.",
   "type": "module",
   "keywords": [

package/src/cli.js

@@ -2,42 +2,24 @@
 import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import {
-  archiveArtifact,
-  checkStoreIntegrity,
-  createArtifact,
-  createStore,
-  getArtifact,
-  importUsersFromCsv,
-  listAuditEvents,
-  listArtifactsPage,
-  rebuildSearchIndex,
-  restoreArtifact,
-  updateArtifact
-} from "./lib/storage.js";
-import { exportStore, importStore, defaultBackupPath } from "./lib/backup.js";
-import { convertAgentArtifact } from "./lib/converters.js";
-import { checkMcpTools } from "./lib/check.js";
-import { installAgent } from "./lib/installer.js";
-import { serviceCommand } from "./lib/service.js";
-import { backgroundStatus, startBackgroundServer, stopBackgroundServer } from "./lib/background.js";
-import { resolvePublicBaseUrl } from "./lib/server-state.js";
 import { generateToken } from "./lib/token.js";
-import { runDoctor } from "./lib/doctor.js";
-import { startServer } from "./server.js";
 
 const PACKAGE_ROOT = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
 
 async function main() {
   const [command, ...args] = process.argv.slice(2);
   const options = parseArgs(args);
-  const store = createStore({ home: options.home });
 
   if (!command || command === "help" || command === "--help" || command === "-h") {
     printHelp();
     return;
   }
 
+  if (command === "version" || command === "--version" || command === "-v") {
+    process.stdout.write(`${await packageVersion()}\n`);
+    return;
+  }
+
   if (command === "token" || command === "generate-token") {
     const token = generateToken(options);
     if (options.raw) {
@@ -48,6 +30,29 @@ async function main() {
     return;
   }
 
+  const {
+    archiveArtifact,
+    checkStoreIntegrity,
+    createArtifact,
+    createStore,
+    getArtifact,
+    importUsersFromCsv,
+    listAuditEvents,
+    listArtifactsPage,
+    rebuildSearchIndex,
+    restoreArtifact,
+    updateArtifact
+  } = await import("./lib/storage.js");
+  const { exportStore, importStore, defaultBackupPath } = await import("./lib/backup.js");
+  const { convertAgentArtifact } = await import("./lib/converters.js");
+  const { checkMcpTools } = await import("./lib/check.js");
+  const { installAgent } = await import("./lib/installer.js");
+  const { serviceCommand } = await import("./lib/service.js");
+  const { backgroundStatus, startBackgroundServer, stopBackgroundServer } = await import("./lib/background.js");
+  const { runDoctor } = await import("./lib/doctor.js");
+  const { startServer } = await import("./server.js");
+  const store = createStore({ home: options.home });
+
   if (command === "serve") {
     if (options.detach && options.foreground) {
       throw new Error("Use either --foreground or --detach, not both");
@@ -412,6 +417,7 @@ function shouldReadFileAsBase64(options, filePath) {
 }
 
 async function withUrls(store, artifact) {
+  const { resolvePublicBaseUrl } = await import("./lib/server-state.js");
   const publicBaseUrl = await resolvePublicBaseUrl(store);
   return {
     ...artifact,
@@ -442,10 +448,16 @@ function printJson(data) {
   process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
 }
 
+async function packageVersion() {
+  const packageJson = JSON.parse(await readFile(path.join(PACKAGE_ROOT, "package.json"), "utf8"));
+  return packageJson.version;
+}
+
 function printHelp() {
   process.stdout.write(`Artifacty
 
 Usage:
+  artifacty --version
   artifacty token [--bytes 32] [--raw]
   artifacty serve [--host 127.0.0.1] [--port 8787] [--home ~/.artifacty] [--api-token token] [--generate-token] [--bytes 32] [--mcp-http] [--foreground]
   artifacty serve --foreground [--generate-token]

package/src/lib/installer.js

@@ -14,6 +14,9 @@ export async function installAgent(agent, options = {}) {
   }
 
   if (normalized === "all") {
+    if (options.configPath) {
+      throw new Error("install all does not support --config because each MCP client uses a different config file. Run install per agent when overriding config paths.");
+    }
     const results = [];
     for (const target of INSTALL_TARGETS) {
       results.push(await installAgent(target, options));
@@ -73,11 +76,12 @@ export function createMcpServerConfig(options = {}) {
 export async function installClaude(options = {}) {
   const projectDir = path.resolve(options.projectDir || process.cwd());
   const targetPath = path.resolve(options.configPath || path.join(projectDir, ".mcp.json"));
-  const existing = await readJsonFile(targetPath, {});
+  const existing = await readJsonConfigFile(targetPath);
+  const mcpServers = jsonObjectSection(existing, "mcpServers", targetPath);
   const next = {
     ...existing,
     mcpServers: {
-      ...(existing.mcpServers || {}),
+      ...mcpServers,
       artifacty: createMcpServerConfig(options)
     }
   };
@@ -93,11 +97,12 @@ export async function installClaude(options = {}) {
 export async function installGemini(options = {}) {
   const projectDir = path.resolve(options.projectDir || process.cwd());
   const targetPath = path.resolve(options.configPath || path.join(projectDir, ".gemini", "settings.json"));
-  const existing = await readJsonFile(targetPath, {});
+  const existing = await readJsonConfigFile(targetPath);
+  const mcpServers = jsonObjectSection(existing, "mcpServers", targetPath);
   const next = {
     ...existing,
     mcpServers: {
-      ...(existing.mcpServers || {}),
+      ...mcpServers,
       artifacty: {
         ...createMcpServerConfig(options),
         timeout: normalizeTimeoutMs(options.timeout),
@@ -117,11 +122,12 @@ export async function installGemini(options = {}) {
 export async function installCopilot(options = {}) {
   const projectDir = path.resolve(options.projectDir || process.cwd());
   const targetPath = path.resolve(options.configPath || path.join(projectDir, ".vscode", "mcp.json"));
-  const existing = await readJsonFile(targetPath, {});
+  const existing = await readJsonConfigFile(targetPath);
+  const servers = jsonObjectSection(existing, "servers", targetPath);
   const next = {
     ...existing,
     servers: {
-      ...(existing.servers || {}),
+      ...servers,
       artifacty: {
         type: "stdio",
         ...createMcpServerConfig(options)
@@ -140,11 +146,12 @@ export async function installCopilot(options = {}) {
 export async function installCursor(options = {}) {
   const projectDir = path.resolve(options.projectDir || process.cwd());
   const targetPath = path.resolve(options.configPath || path.join(projectDir, ".cursor", "mcp.json"));
-  const existing = await readJsonFile(targetPath, {});
+  const existing = await readJsonConfigFile(targetPath);
+  const mcpServers = jsonObjectSection(existing, "mcpServers", targetPath);
   const next = {
     ...existing,
     mcpServers: {
-      ...(existing.mcpServers || {}),
+      ...mcpServers,
       artifacty: createMcpServerConfig(options)
     }
   };
@@ -190,11 +197,35 @@ export function codexTomlBlock(config, options = {}) {
 }
 
 export function replaceTomlBlock(existing, dottedName, block) {
-  const trimmed = existing.trimEnd();
-  const pattern = new RegExp(`\\n?\\[${escapeRegExp(dottedName)}\\][\\s\\S]*?(?=\\n\\[[^\\]]+\\]|$)`);
-  if (pattern.test(trimmed)) {
-    return `${trimmed.replace(pattern, `\n${block.trimEnd()}`)}\n`;
+  const trimmedBlock = block.trimEnd();
+  const lines = existing.replace(/\r\n/g, "\n").split("\n");
+  const target = normalizeTomlDottedName(dottedName);
+  const start = lines.findIndex((line) => normalizeTomlDottedName(parseTomlTableHeader(line)) === target);
+
+  if (start !== -1) {
+    let end = lines.length;
+    for (let index = start + 1; index < lines.length; index += 1) {
+      const tableName = normalizeTomlDottedName(parseTomlTableHeader(lines[index]));
+      if (!tableName) {
+        continue;
+      }
+      if (tableName === target || tableName.startsWith(`${target}.`)) {
+        continue;
+      }
+      end = index;
+      break;
+    }
+
+    const prefix = lines.slice(0, start).join("\n").trimEnd();
+    const suffix = lines.slice(end).join("\n").trimStart();
+    return [
+      prefix,
+      trimmedBlock,
+      suffix
+    ].filter(Boolean).join("\n").trimEnd() + "\n";
   }
+
+  const trimmed = existing.trimEnd();
   return `${trimmed}${trimmed ? "\n\n" : ""}${block}`;
 }
 
@@ -216,20 +247,25 @@ async function writeInstallFile({ agent, path: targetPath, dryRun, content }) {
   };
 }
 
-async function readJsonFile(filePath, fallback) {
+async function readJsonConfigFile(filePath) {
   if (!existsSync(filePath)) {
-    return fallback;
+    return {};
   }
 
   const raw = await readTextFile(filePath, "");
   if (!raw.trim()) {
-    return fallback;
+    return {};
   }
+  let parsed;
   try {
-    return JSON.parse(raw);
+    parsed = JSON.parse(raw);
   } catch (error) {
     throw new Error(`Failed to parse ${filePath}: ${error.message}`);
   }
+  if (!isPlainObject(parsed)) {
+    throw new Error(`Invalid MCP config at ${filePath}: expected a JSON object`);
+  }
+  return parsed;
 }
 
 async function readTextFile(filePath, fallback) {
@@ -247,6 +283,20 @@ function normalizeAgent(agent) {
   return normalized;
 }
 
+function jsonObjectSection(config, key, filePath) {
+  if (config[key] === undefined) {
+    return {};
+  }
+  if (!isPlainObject(config[key])) {
+    throw new Error(`Invalid MCP config at ${filePath}: ${key} must be a JSON object`);
+  }
+  return config[key];
+}
+
+function isPlainObject(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
 function normalizeTimeoutMs(value) {
   const timeout = Number(value ?? DEFAULT_MCP_TIMEOUT_MS);
   return Number.isFinite(timeout) && timeout > 0 ? timeout : DEFAULT_MCP_TIMEOUT_MS;
@@ -276,6 +326,47 @@ function quoteTomlString(value) {
   return JSON.stringify(String(value));
 }
 
-function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function parseTomlTableHeader(line) {
+  const match = /^\s*\[([^\][\r\n]+)]\s*(?:#.*)?$/.exec(line);
+  return match ? match[1] : "";
+}
+
+function normalizeTomlDottedName(value) {
+  return splitTomlDottedName(value).join(".");
+}
+
+function splitTomlDottedName(value) {
+  const parts = [];
+  let current = "";
+  let quoted = false;
+  let quote = "";
+  let escaped = false;
+  for (const char of String(value || "").trim()) {
+    if (quoted) {
+      if (escaped) {
+        current += char;
+        escaped = false;
+      } else if (char === "\\" && quote === "\"") {
+        escaped = true;
+      } else if (char === quote) {
+        quoted = false;
+      } else {
+        current += char;
+      }
+      continue;
+    }
+    if (char === "\"" || char === "'") {
+      quoted = true;
+      quote = char;
+    } else if (char === ".") {
+      parts.push(current.trim());
+      current = "";
+    } else if (!/\s/.test(char)) {
+      current += char;
+    }
+  }
+  if (current || parts.length > 0) {
+    parts.push(current.trim());
+  }
+  return parts.filter(Boolean);
 }