@xmemo/client 0.4.137 → 0.4.139

package/README.md

@@ -1,5 +1,7 @@
 # XMemo CLI
 
+[![smithery badge](https://smithery.ai/badge/xmemo/xmemo)](https://smithery.ai/servers/xmemo/xmemo)
+
 `@xmemo/client` is the privacy-first command line entry point for XMemo client
 setup. It is intentionally small: the npm package contains only the CLI and
 setup helper code needed on a user's machine.
@@ -235,7 +237,7 @@ xmemo setup copilot
 xmemo mcp proxy
 ```
 
-`xmemo setup copilot` writes `memory-os` to Copilot CLI's user MCP config and
+`xmemo setup copilot` writes `XMemo` to Copilot CLI's user MCP config and
 does not include token or identity headers. Use `xmemo setup copilot --dry-run`
 to preview without writing. `xmemo mcp proxy` reads the token saved by
 `xmemo login` or `xmemo token add --from-stdin`, adds the XMemo bearer token and
@@ -285,9 +287,9 @@ Write it to the default Codex config path:
 xmemo mcp add codex --url "$XMEMO_URL" --write
 ```
 
-The generated config references `XMEMO_KEY` and does not include the token
-value. Codex custom identity headers are not written until the CLI format is
-verified to support them.
+The generated config references `XMEMO_KEY`, includes the non-secret
+`X-Memory-OS-Agent-ID` / `X-Memory-OS-Agent-Instance-ID` attribution headers,
+and does not include the token value.
 
 Codex MCP-depth checks:
 
@@ -302,12 +304,17 @@ xmemo smoke --client codex
 `xmemo mcp profile codex` prints the recommended memory behavior profile:
 recall/search at the start of non-trivial tasks, write back high-signal
 decisions and fixes, and never store secrets. `xmemo smoke --client codex`
-checks the local Codex TOML config for the `memory_os` MCP server,
+checks the local Codex TOML config for the `XMemo` MCP server,
 `bearer_token_env_var = "XMEMO_KEY"`, token presence in the environment, and
 absence of embedded token values.
 
 ### Cursor
 
+Cursor marketplace plugin assets live in `.cursor-plugin/marketplace.json` and
+`plugins/xmemo/`. The marketplace plugin is OAuth-first and its `mcp.json` stores
+only `https://xmemo.dev/mcp`; it must not contain `Authorization`, `Bearer`, or
+`XMEMO_KEY`.
+
 Recommended Cursor setup:
 
 ```bash
@@ -322,12 +329,15 @@ lower-level equivalent remains:
 xmemo mcp add cursor --url "$XMEMO_URL" --write
 ```
 
-The CLI refuses to overwrite an existing `memory_os` MCP server entry. Edit the
-config manually if you need to rotate the endpoint. Cursor configs include
+The CLI refuses to overwrite an existing `XMemo`, `memory_os`, or `memory-os`
+MCP server entry. Edit the config manually if you need to rotate the endpoint.
+Cursor configs include
 `X-Memory-OS-Agent-ID` and `X-Memory-OS-Agent-Instance-ID`; the instance ID is
 non-secret and stored under the user's XMemo CLI config directory. By default,
 the setup prompt also installs a Cursor behavior profile at
 `~/.cursor/memory-profile.md`; answer `n` or pass `--no-profile` to skip it.
+Use this direct-key setup only for local/manual installs where Cursor OAuth is
+unavailable; public plugin submission should use the OAuth-first plugin config.
 
 ### Gemini CLI
 
@@ -352,8 +362,8 @@ run `/mcp` (or the first XMemo tool call) to complete the OAuth login. By
 default, the setup prompt also installs a Gemini behavior profile at
 `~/.gemini/GEMINI.md`; answer `n` or pass `--no-profile` to skip it.
 
-The CLI refuses to overwrite an existing `memory_os` MCP server entry. Edit the
-config manually if you need to rotate the endpoint.
+The CLI refuses to overwrite an existing `XMemo`, `memory_os`, or `memory-os`
+MCP server entry. Edit the config manually if you need to rotate the endpoint.
 
 ### Antigravity
 
@@ -381,8 +391,8 @@ Use `xmemo setup antigravity` for normal installs because it performs discovery
 and chooses the recommended Antigravity path automatically. Use
 `xmemo mcp add antigravity --write` when you want the generic MCP writer
 directly, for example with `--url` or `--config` in advanced/multi-client setup.
-The CLI refuses to overwrite an existing `memory_os` MCP server entry. Edit the
-config manually if you need to rotate the endpoint.
+The CLI refuses to overwrite an existing `XMemo`, `memory_os`, or `memory-os`
+MCP server entry. Edit the config manually if you need to rotate the endpoint.
 
 ## Release model
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmemo/client",
-  "version": "0.4.137",
+  "version": "0.4.139",
   "description": "Privacy-first CLI and MCP setup helper for XMemo.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -10,7 +10,7 @@ const PACKAGE_NAME = '@xmemo/client';
 const FALLBACK_PACKAGE_NAME = '@yonro/xmemo-client';
 const COMMAND_NAME = 'xmemo';
 const LEGACY_COMMAND_NAME = 'memory-os';
-const CLI_VERSION = '0.4.137';
+const CLI_VERSION = '0.4.139';
 const DEFAULT_SERVICE_URL = 'https://xmemo.dev';
 const TOKEN_ENV_VAR = 'XMEMO_KEY';
 const LEGACY_TOKEN_ENV_VAR = 'MEMORY_OS_MCP_TOKEN';
@@ -18,7 +18,8 @@ const AGENT_ID_ENV_VAR = 'XMEMO_AGENT_ID';
 const AGENT_INSTANCE_ENV_VAR = 'XMEMO_AGENT_INSTANCE_ID';
 const AGENT_ID_HEADER = 'X-Memory-OS-Agent-ID';
 const AGENT_INSTANCE_HEADER = 'X-Memory-OS-Agent-Instance-ID';
-const MCP_SERVER_NAME = 'memory_os';
+const MCP_SERVER_NAME = 'XMemo';
+const LEGACY_MCP_SERVER_NAMES = ['memory_os', 'memory-os'];
 const CODEX_PROFILE_TARGET = 'AGENTS.md';
 const CODEX_PROFILE_MARKER_START = '<!-- memory-os:codex-profile:start -->';
 const CODEX_PROFILE_MARKER_END = '<!-- memory-os:codex-profile:end -->';
@@ -63,6 +64,27 @@ const MCP_CLIENTS = new Map([
     buildSnippet: antigravityJsonSnippet,
     writeConfig: mergeAntigravityMcpConfig,
     configKind: 'json'
+  }],
+  ['antigravity-ide', {
+    label: 'Antigravity IDE',
+    defaultConfigPath: defaultAntigravityIdeConfigPath,
+    buildSnippet: antigravityIdeJsonSnippet,
+    writeConfig: mergeAntigravityIdeMcpConfig,
+    configKind: 'json'
+  }],
+  ['antigravity2', {
+    label: 'Antigravity 2.0',
+    defaultConfigPath: defaultAntigravity2ConfigPath,
+    buildSnippet: antigravity2JsonSnippet,
+    writeConfig: mergeAntigravity2McpConfig,
+    configKind: 'json'
+  }],
+  ['antigravity-cli', {
+    label: 'Antigravity CLI',
+    defaultConfigPath: defaultAntigravityCliConfigPath,
+    buildSnippet: antigravityCliJsonSnippet,
+    writeConfig: mergeAntigravityCliMcpConfig,
+    configKind: 'json'
   }]
 ]);
 
@@ -73,7 +95,10 @@ const SETUP_CLIENT_ALIASES = new Map([
   ['copilot-cli', 'copilot-cli'],
   ['gemini', 'gemini-cli'],
   ['gemini-cli', 'gemini-cli'],
-  ['antigravity', 'antigravity']
+  ['antigravity', 'antigravity'],
+  ['antigravity-ide', 'antigravity-ide'],
+  ['antigravity2', 'antigravity2'],
+  ['antigravity-cli', 'antigravity-cli']
 ]);
 
 class UsageError extends Error {
@@ -190,7 +215,7 @@ function writeHelp(io) {
   writeLine(io.stdout, `  ${COMMAND_NAME} token add --from-stdin`);
   writeLine(io.stdout, `  ${COMMAND_NAME} token set --from-stdin [--allow-plaintext]`);
   writeLine(io.stdout, `  ${COMMAND_NAME} mcp list`);
-  writeLine(io.stdout, `  ${COMMAND_NAME} mcp config --client <codex|cursor|copilot-cli|antigravity|generic> [--base-url <url>] [--json]`);
+  writeLine(io.stdout, `  ${COMMAND_NAME} mcp config --client <codex|cursor|copilot-cli|gemini-cli|antigravity|generic> [--base-url <url>] [--json]`);
   writeLine(io.stdout, `  ${COMMAND_NAME} mcp proxy [--port ${DEFAULT_PROXY_PORT}]`);
   writeLine(io.stdout, `  ${COMMAND_NAME} mcp profile codex [--json]`);
   writeLine(io.stdout, `  ${COMMAND_NAME} profile install <codex|cursor|gemini|antigravity> [--target <path>] [--dry-run|--json]`);
@@ -779,6 +804,15 @@ async function mcpCommand(args, io) {
     } else {
       writeLine(io.stdout, JSON.stringify(template.snippet, null, 2));
     }
+    if (template.optionalEnv?.includes(AGENT_INSTANCE_ENV_VAR)) {
+      writeLine(io.stdout, '');
+      writeLine(io.stdout, `${AGENT_INSTANCE_ENV_VAR} must be stable per local client install.`);
+      if (template.agentInstanceGeneration?.automaticCommand) {
+        writeLine(io.stdout, `Use ${template.agentInstanceGeneration.automaticCommand} to generate and persist it, or set it to a unique value such as xmemo-${clientId}-<uuid>.`);
+      } else {
+        writeLine(io.stdout, `Set it to a unique value such as xmemo-${clientId}-<uuid> and persist it outside git.`);
+      }
+    }
     writeLine(io.stdout, 'Review the template before applying it. Token values are not included.');
     return 0;
   }
@@ -829,6 +863,7 @@ async function mcpCommand(args, io) {
       agentId: identity.agentId,
       agentInstanceId: identity.agentInstanceId,
       agentInstanceIdPath: identity.path,
+      agentInstanceGeneration: agentInstanceGenerationPolicy(target),
       writesTokenValue: false
     }, null, 2));
     return 0;
@@ -857,6 +892,7 @@ async function mcpCommand(args, io) {
   } else {
     writeLine(io.stdout, `Set ${TOKEN_ENV_VAR} in your user environment or secret manager. The token value is not included here.`);
   }
+  writeLine(io.stdout, `${AGENT_INSTANCE_ENV_VAR} must be stable per local ${client.label} install; run ${COMMAND_NAME} mcp add ${target} --write to generate it automatically.`);
   return 0;
 }
 
@@ -1389,10 +1425,15 @@ function mcpConfigTemplate(clientId, mcpUrl) {
         agentInstanceEnvVar: AGENT_INSTANCE_ENV_VAR,
         agentInstanceHeader: AGENT_INSTANCE_HEADER
       },
+      agentInstanceGeneration: agentInstanceGenerationPolicy(clientId),
       writesTokenValue: false
     };
   }
 
+  if (clientId === 'cursor') {
+    return bearerJsonMcpTemplate(clientId, mcpUrl, cursorJsonConfig(mcpUrl));
+  }
+
   if (clientId === 'gemini-cli') {
     return oauthJsonMcpTemplate(clientId, mcpUrl, geminiJsonConfig(mcpUrl));
   }
@@ -1401,14 +1442,25 @@ function mcpConfigTemplate(clientId, mcpUrl) {
     return oauthJsonMcpTemplate(clientId, mcpUrl, antigravityJsonConfig(mcpUrl));
   }
 
-  const serverName = clientId === 'cursor' || clientId === 'gemini-cli' || clientId === 'antigravity' ? 'memory_os' : 'memory-os';
+  if (clientId === 'antigravity-ide') {
+    return oauthJsonMcpTemplate(clientId, mcpUrl, antigravityIdeJsonConfig(mcpUrl));
+  }
+
+  if (clientId === 'antigravity2') {
+    return oauthJsonMcpTemplate(clientId, mcpUrl, antigravity2JsonConfig(mcpUrl));
+  }
+
+  if (clientId === 'antigravity-cli') {
+    return oauthJsonMcpTemplate(clientId, mcpUrl, antigravityCliJsonConfig(mcpUrl));
+  }
+
   return {
     client: clientId,
-    serverName,
+    serverName: MCP_SERVER_NAME,
     snippetFormat: 'json',
     snippet: {
       mcpServers: {
-        [serverName]: {
+        [MCP_SERVER_NAME]: {
           type: 'http',
           url: mcpUrl,
           headers: {
@@ -1427,6 +1479,28 @@ function mcpConfigTemplate(clientId, mcpUrl) {
       agentInstanceEnvVar: AGENT_INSTANCE_ENV_VAR,
       agentInstanceHeader: AGENT_INSTANCE_HEADER
     },
+    agentInstanceGeneration: agentInstanceGenerationPolicy(clientId),
+    writesTokenValue: false
+  };
+}
+
+function bearerJsonMcpTemplate(clientId, mcpUrl, snippet) {
+  return {
+    client: clientId,
+    serverName: MCP_SERVER_NAME,
+    snippetFormat: 'json',
+    snippet,
+    requiresEnv: [TOKEN_ENV_VAR],
+    optionalEnv: [AGENT_INSTANCE_ENV_VAR],
+    authentication: 'env-bearer',
+    agentIdentity: {
+      agentId: clientId,
+      agentIdHeader: AGENT_ID_HEADER,
+      agentInstanceEnvVar: AGENT_INSTANCE_ENV_VAR,
+      agentInstanceHeader: AGENT_INSTANCE_HEADER
+    },
+    agentInstanceGeneration: agentInstanceGenerationPolicy(clientId),
+    mcpUrl,
     writesTokenValue: false
   };
 }
@@ -1446,20 +1520,20 @@ function oauthJsonMcpTemplate(clientId, mcpUrl, snippet) {
       agentInstanceEnvVar: AGENT_INSTANCE_ENV_VAR,
       agentInstanceHeader: AGENT_INSTANCE_HEADER
     },
+    agentInstanceGeneration: agentInstanceGenerationPolicy(clientId),
     mcpUrl,
     writesTokenValue: false
   };
 }
 
 function mcpLocalProxyTemplate(clientId, proxyUrl) {
-  const serverName = clientId === 'cursor' || clientId === 'gemini-cli' || clientId === 'antigravity' ? 'memory_os' : 'memory-os';
   return {
     client: clientId,
-    serverName,
+    serverName: MCP_SERVER_NAME,
     snippetFormat: 'json',
     snippet: {
       mcpServers: {
-        [serverName]: {
+        [MCP_SERVER_NAME]: {
           type: 'http',
           url: proxyUrl
         }
@@ -1473,10 +1547,27 @@ function mcpLocalProxyTemplate(clientId, proxyUrl) {
       agentInstanceEnvVar: AGENT_INSTANCE_ENV_VAR,
       agentInstanceHeader: AGENT_INSTANCE_HEADER
     },
+    agentInstanceGeneration: agentInstanceGenerationPolicy(clientId),
     writesTokenValue: false
   };
 }
 
+function agentInstanceGenerationPolicy(clientId) {
+  const automaticCommand = MCP_CLIENTS.has(clientId)
+    ? `${COMMAND_NAME} mcp add ${clientId} --write`
+    : clientId === 'copilot-cli'
+      ? `${COMMAND_NAME} setup copilot --write`
+      : null;
+  return {
+    requiredForHeaders: true,
+    stablePerInstall: true,
+    automaticCommand,
+    generatedPattern: `xmemo-${clientId}-<uuid>`,
+    storagePath: `~/.config/xmemo/agent-instances/${clientId}.json`,
+    manualEnvVar: AGENT_INSTANCE_ENV_VAR
+  };
+}
+
 function sameMajorMinor(left, right) {
   const leftParts = left.split('.');
   const rightParts = right.split('.');
@@ -2079,7 +2170,8 @@ function writeProfileResult(action, result, io) {
 
 async function codexSmokeReport(configPath, env) {
   const configText = await readTextIfExists(configPath);
-  const block = tomlServerBlock(configText, MCP_SERVER_NAME);
+  const serverBlock = findTomlServerBlock(configText);
+  const block = serverBlock.block;
   const mcpUrl = block ? tomlStringValue(block, 'url') : null;
   const bearerTokenEnvVar = block ? tomlStringValue(block, 'bearer_token_env_var') : null;
   const tokenValue = env[TOKEN_ENV_VAR] ?? '';
@@ -2096,7 +2188,7 @@ async function codexSmokeReport(configPath, env) {
       name: 'memory_os_server_present',
       ok: Boolean(block),
       required: true,
-      detail: block ? `[mcp_servers.${MCP_SERVER_NAME}]` : `missing [mcp_servers.${MCP_SERVER_NAME}]`
+      detail: block ? `[mcp_servers.${serverBlock.name}]` : `missing [mcp_servers.${MCP_SERVER_NAME}]`
     },
     {
       name: 'mcp_url_present',
@@ -2134,7 +2226,7 @@ async function codexSmokeReport(configPath, env) {
     ok: checks.every((check) => !check.required || check.ok),
     client: 'codex',
     configPath,
-    serverName: MCP_SERVER_NAME,
+    serverName: serverBlock.name ?? MCP_SERVER_NAME,
     mcpUrl,
     tokenEnvVar: TOKEN_ENV_VAR,
     agentInstanceIdPath: identityPath,
@@ -2142,6 +2234,26 @@ async function codexSmokeReport(configPath, env) {
   };
 }
 
+function knownMcpServerNames() {
+  return [MCP_SERVER_NAME, ...LEGACY_MCP_SERVER_NAMES];
+}
+
+function existingJsonMcpServerName(mcpServers) {
+  return knownMcpServerNames().find((name) => mcpServers[name]);
+}
+
+function existingTomlMcpServerName(content) {
+  return knownMcpServerNames().find((name) => content.includes(`[mcp_servers.${name}]`));
+}
+
+function findTomlServerBlock(content) {
+  const name = existingTomlMcpServerName(content);
+  return {
+    name: name ?? null,
+    block: name ? tomlServerBlock(content, name) : ''
+  };
+}
+
 function tomlServerBlock(content, serverName) {
   const header = `[mcp_servers.${serverName}]`;
   const lines = content.split(/\r?\n/);
@@ -2174,8 +2286,9 @@ function cursorJsonSnippet(mcpUrl, identity = envReferenceIdentity('cursor')) {
 async function appendTomlServerConfig(configPath, mcpUrl) {
   const snippet = codexTomlSnippet(mcpUrl);
   const existing = await readTextIfExists(configPath);
-  if (existing.includes(`[mcp_servers.${MCP_SERVER_NAME}]`)) {
-    throw new UsageError(`MCP config already contains [mcp_servers.${MCP_SERVER_NAME}]. Edit ${configPath} manually to avoid duplicate server definitions.`);
+  const existingName = existingTomlMcpServerName(existing);
+  if (existingName) {
+    throw new UsageError(`MCP config already contains [mcp_servers.${existingName}]. Edit ${configPath} manually to avoid duplicate server definitions.`);
   }
 
   await fs.mkdir(path.dirname(configPath), { recursive: true, mode: 0o700 });
@@ -2196,8 +2309,9 @@ async function mergeJsonMcpConfig(configPath, mcpUrl, identity) {
     parsed.mcpServers = {};
   }
 
-  if (parsed.mcpServers[MCP_SERVER_NAME]) {
-    throw new UsageError(`MCP config already contains mcpServers.${MCP_SERVER_NAME}. Edit ${configPath} manually to avoid duplicate server definitions.`);
+  const existingName = existingJsonMcpServerName(parsed.mcpServers);
+  if (existingName) {
+    throw new UsageError(`MCP config already contains mcpServers.${existingName}. Edit ${configPath} manually to avoid duplicate server definitions.`);
   }
 
   parsed.mcpServers[MCP_SERVER_NAME] = cursorJsonServerConfig(mcpUrl, identity);
@@ -2240,8 +2354,9 @@ async function mergeAntigravityMcpConfig(configPath, mcpUrl, identity) {
     parsed.mcpServers = {};
   }
 
-  if (parsed.mcpServers[MCP_SERVER_NAME]) {
-    throw new UsageError(`MCP config already contains mcpServers.${MCP_SERVER_NAME}. Edit ${configPath} manually to avoid duplicate server definitions.`);
+  const existingName = existingJsonMcpServerName(parsed.mcpServers);
+  if (existingName) {
+    throw new UsageError(`MCP config already contains mcpServers.${existingName}. Edit ${configPath} manually to avoid duplicate server definitions.`);
   }
 
   parsed.mcpServers[MCP_SERVER_NAME] = antigravityJsonServerConfig(mcpUrl, identity);
@@ -2250,6 +2365,135 @@ async function mergeAntigravityMcpConfig(configPath, mcpUrl, identity) {
   await bestEffortChmod(configPath, 0o600);
 }
 
+function antigravityIdeJsonServerConfig(mcpUrl) {
+  return {
+    type: 'http',
+    url: mcpUrl
+  };
+}
+
+function antigravityIdeJsonConfig(mcpUrl) {
+  return {
+    mcpServers: {
+      [MCP_SERVER_NAME]: antigravityIdeJsonServerConfig(mcpUrl)
+    }
+  };
+}
+
+function antigravityIdeJsonSnippet(mcpUrl, identity = envReferenceIdentity('antigravity-ide')) {
+  return `${JSON.stringify(antigravityIdeJsonConfig(mcpUrl), null, 2)}\n`;
+}
+
+async function mergeAntigravityIdeMcpConfig(configPath, mcpUrl, identity) {
+  const existing = await readTextIfExists(configPath);
+  const parsed = existing.trim().length === 0 ? {} : parseJsonConfig(existing, configPath);
+
+  if (!isPlainObject(parsed)) {
+    throw new UsageError(`MCP JSON config must be an object: ${configPath}`);
+  }
+
+  if (!isPlainObject(parsed.mcpServers)) {
+    parsed.mcpServers = {};
+  }
+
+  const existingName = existingJsonMcpServerName(parsed.mcpServers);
+  if (existingName) {
+    throw new UsageError(`MCP config already contains mcpServers.${existingName}. Edit ${configPath} manually to avoid duplicate server definitions.`);
+  }
+
+  parsed.mcpServers[MCP_SERVER_NAME] = antigravityIdeJsonServerConfig(mcpUrl);
+  await fs.mkdir(path.dirname(configPath), { recursive: true, mode: 0o700 });
+  await fs.writeFile(configPath, `${JSON.stringify(parsed, null, 2)}\n`, { mode: 0o600 });
+  await bestEffortChmod(configPath, 0o600);
+}
+
+function antigravity2JsonServerConfig(mcpUrl) {
+  return {
+    type: 'http',
+    url: mcpUrl
+  };
+}
+
+function antigravity2JsonConfig(mcpUrl) {
+  return {
+    mcpServers: {
+      [MCP_SERVER_NAME]: antigravity2JsonServerConfig(mcpUrl)
+    }
+  };
+}
+
+function antigravity2JsonSnippet(mcpUrl, identity = envReferenceIdentity('antigravity2')) {
+  return `${JSON.stringify(antigravity2JsonConfig(mcpUrl), null, 2)}\n`;
+}
+
+async function mergeAntigravity2McpConfig(configPath, mcpUrl, identity) {
+  const existing = await readTextIfExists(configPath);
+  const parsed = existing.trim().length === 0 ? {} : parseJsonConfig(existing, configPath);
+
+  if (!isPlainObject(parsed)) {
+    throw new UsageError(`MCP JSON config must be an object: ${configPath}`);
+  }
+
+  if (!isPlainObject(parsed.mcpServers)) {
+    parsed.mcpServers = {};
+  }
+
+  const existingName = existingJsonMcpServerName(parsed.mcpServers);
+  if (existingName) {
+    throw new UsageError(`MCP config already contains mcpServers.${existingName}. Edit ${configPath} manually to avoid duplicate server definitions.`);
+  }
+
+  parsed.mcpServers[MCP_SERVER_NAME] = antigravity2JsonServerConfig(mcpUrl);
+  await fs.mkdir(path.dirname(configPath), { recursive: true, mode: 0o700 });
+  await fs.writeFile(configPath, `${JSON.stringify(parsed, null, 2)}\n`, { mode: 0o600 });
+  await bestEffortChmod(configPath, 0o600);
+}
+
+function antigravityCliJsonServerConfig(mcpUrl, identity = envReferenceIdentity('antigravity-cli')) {
+  return {
+    httpUrl: mcpUrl,
+    headers: {
+      [AGENT_ID_HEADER]: identity.agentId,
+      [AGENT_INSTANCE_HEADER]: identity.agentInstanceId
+    }
+  };
+}
+
+function antigravityCliJsonConfig(mcpUrl, identity = envReferenceIdentity('antigravity-cli')) {
+  return {
+    mcpServers: {
+      [MCP_SERVER_NAME]: antigravityCliJsonServerConfig(mcpUrl, identity)
+    }
+  };
+}
+
+function antigravityCliJsonSnippet(mcpUrl, identity = envReferenceIdentity('antigravity-cli')) {
+  return `${JSON.stringify(antigravityCliJsonConfig(mcpUrl, identity), null, 2)}\n`;
+}
+
+async function mergeAntigravityCliMcpConfig(configPath, mcpUrl, identity) {
+  const existing = await readTextIfExists(configPath);
+  const parsed = existing.trim().length === 0 ? {} : parseJsonConfig(existing, configPath);
+
+  if (!isPlainObject(parsed)) {
+    throw new UsageError(`MCP JSON config must be an object: ${configPath}`);
+  }
+
+  if (!isPlainObject(parsed.mcpServers)) {
+    parsed.mcpServers = {};
+  }
+
+  const existingName = existingJsonMcpServerName(parsed.mcpServers);
+  if (existingName) {
+    throw new UsageError(`MCP config already contains mcpServers.${existingName}. Edit ${configPath} manually to avoid duplicate server definitions.`);
+  }
+
+  parsed.mcpServers[MCP_SERVER_NAME] = antigravityCliJsonServerConfig(mcpUrl, identity);
+  await fs.mkdir(path.dirname(configPath), { recursive: true, mode: 0o700 });
+  await fs.writeFile(configPath, `${JSON.stringify(parsed, null, 2)}\n`, { mode: 0o600 });
+  await bestEffortChmod(configPath, 0o600);
+}
+
 
 async function mergeGeminiMcpConfig(configPath, mcpUrl, identity) {
   const existing = await readTextIfExists(configPath);
@@ -2263,8 +2507,9 @@ async function mergeGeminiMcpConfig(configPath, mcpUrl, identity) {
     parsed.mcpServers = {};
   }
 
-  if (parsed.mcpServers[MCP_SERVER_NAME]) {
-    throw new UsageError(`MCP config already contains mcpServers.${MCP_SERVER_NAME}. Edit ${configPath} manually to avoid duplicate server definitions.`);
+  const existingName = existingJsonMcpServerName(parsed.mcpServers);
+  if (existingName) {
+    throw new UsageError(`MCP config already contains mcpServers.${existingName}. Edit ${configPath} manually to avoid duplicate server definitions.`);
   }
 
   parsed.mcpServers[MCP_SERVER_NAME] = geminiJsonServerConfig(mcpUrl, identity);
@@ -2285,7 +2530,12 @@ async function mergeCopilotMcpConfig(configPath, proxyUrl) {
     parsed.mcpServers = {};
   }
 
-  parsed.mcpServers['memory-os'] = copilotLocalProxyServerConfig(proxyUrl);
+  const existingName = existingJsonMcpServerName(parsed.mcpServers);
+  if (existingName) {
+    throw new UsageError(`MCP config already contains mcpServers.${existingName}. Edit ${configPath} manually to avoid duplicate server definitions.`);
+  }
+
+  parsed.mcpServers[MCP_SERVER_NAME] = copilotLocalProxyServerConfig(proxyUrl);
   await fs.mkdir(path.dirname(configPath), { recursive: true, mode: 0o700 });
   await fs.writeFile(configPath, `${JSON.stringify(parsed, null, 2)}\n`, { mode: 0o600 });
   await bestEffortChmod(configPath, 0o600);
@@ -2400,11 +2650,11 @@ function supportedMcpClientIds() {
 }
 
 function supportedSetupClientIds() {
-  return ['codex', 'cursor', 'copilot', 'gemini', 'antigravity'];
+  return ['codex', 'cursor', 'copilot', 'gemini', 'antigravity', 'antigravity-ide', 'antigravity2', 'antigravity-cli'];
 }
 
 function usesClientOAuth(clientId) {
-  return clientId === 'gemini-cli' || clientId === 'antigravity';
+  return clientId === 'gemini-cli' || clientId === 'antigravity' || clientId === 'antigravity-ide' || clientId === 'antigravity2' || clientId === 'antigravity-cli';
 }
 
 function credentialsPath(env) {
@@ -2452,6 +2702,21 @@ function defaultAntigravityConfigPath(env) {
   return path.join(home, '.gemini', 'antigravity', 'mcp_config.json');
 }
 
+function defaultAntigravityIdeConfigPath(env) {
+  const home = env.USERPROFILE || env.HOME || os.homedir();
+  return path.join(home, '.antigravity-ide', 'mcp.json');
+}
+
+function defaultAntigravity2ConfigPath(env) {
+  const home = env.USERPROFILE || env.HOME || os.homedir();
+  return path.join(home, '.antigravity2', 'mcp.json');
+}
+
+function defaultAntigravityCliConfigPath(env) {
+  const home = env.USERPROFILE || env.HOME || os.homedir();
+  return path.join(home, '.antigravity', 'settings.json');
+}
+
 function defaultCopilotConfigPath(env) {
   const home = env.USERPROFILE || env.HOME || os.homedir();
   return path.join(env.COPILOT_HOME ?? path.join(home, '.copilot'), 'mcp-config.json');