@distributionos/cli 0.1.15 → 0.1.17

package/src/mcp-config.js

@@ -1,187 +1,319 @@
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { MCP_SERVER_URL } from './constants.js';
-import { pathExists } from './detect.js';
-
-export const PROJECT_MCP_CONFIG_PATH = '.mcp.json';
-export const DISTRIBUTIONOS_MCP_SERVER_NAME = 'distributionos';
-
-export async function buildProjectMcpConfigPlan(cwd, serverUrl = MCP_SERVER_URL) {
-  const target = safeResolve(cwd, PROJECT_MCP_CONFIG_PATH);
-  const base = {
-    path: PROJECT_MCP_CONFIG_PATH,
-    serverName: DISTRIBUTIONOS_MCP_SERVER_NAME,
-    serverUrl,
-    authMode: 'oauth',
-    requiresRestart: true,
-    writesSecrets: false,
-    recommendedConfig: recommendedMcpConfig(serverUrl),
-  };
-
-  if (!(await pathExists(target))) {
-    return {
-      ...base,
-      supported: true,
-      action: 'create',
-      reason: 'Create a project-local MCP config with the DistributionOS remote server URL only.',
-    };
-  }
-
-  let parsed;
-  try {
-    parsed = JSON.parse(await fs.readFile(target, 'utf8'));
-  } catch {
-    return {
-      ...base,
-      supported: false,
-      action: 'manual',
-      reason: 'Existing .mcp.json is not valid JSON, so the CLI will not edit it automatically.',
-    };
-  }
-
-  if (!isRecord(parsed)) {
-    return {
-      ...base,
-      supported: false,
-      action: 'manual',
-      reason: 'Existing .mcp.json is not an object, so the CLI will not edit it automatically.',
-    };
-  }
-
-  if (containsSecretLikeConfig(parsed)) {
-    return {
-      ...base,
-      supported: false,
-      action: 'manual',
-      reason: 'Existing .mcp.json appears to contain secret headers, tokens, or env values. The CLI will not rewrite it.',
-    };
-  }
-
-  const servers = isRecord(parsed.mcpServers) ? parsed.mcpServers : {};
-  const existing = servers[DISTRIBUTIONOS_MCP_SERVER_NAME];
-  const existingUrl = isRecord(existing) && typeof existing.url === 'string'
-    ? existing.url
-    : null;
-  const existingType = isRecord(existing) && typeof existing.type === 'string'
-    ? existing.type
-    : null;
-
-  if (existingUrl === serverUrl && existingType === 'http') {
-    return {
-      ...base,
-      supported: true,
-      action: 'none',
-      reason: 'Project-local MCP config already includes the DistributionOS server.',
-    };
-  }
-
-  if (existingUrl === serverUrl && !existingType) {
-    return {
-      ...base,
-      supported: true,
-      action: 'update',
-      reason: 'Add the Claude-compatible HTTP transport type to the DistributionOS MCP server entry.',
-    };
-  }
-
-  if (existingUrl === serverUrl && existingType !== 'http') {
-    return {
-      ...base,
-      supported: false,
-      action: 'manual',
-      reason: 'Existing distributionos MCP server uses a non-HTTP transport. The CLI will not overwrite it automatically.',
-    };
-  }
-
-  if (existingUrl) {
-    return {
-      ...base,
-      supported: false,
-      action: 'manual',
-      reason: 'Existing distributionos MCP server points to a different URL. The CLI will not overwrite it automatically.',
-    };
-  }
-
-  return {
-    ...base,
-    supported: true,
-    action: 'update',
-    reason: 'Add the DistributionOS remote MCP server to the existing project-local MCP config.',
-  };
-}
-
-export async function applyProjectMcpConfig(cwd, plan) {
-  if (!plan || plan.action === 'none') {
-    return { type: 'mcp', changed: false, file: plan?.path ?? PROJECT_MCP_CONFIG_PATH, reason: plan?.reason ?? 'No MCP config change planned.' };
-  }
-
-  if (plan.action === 'manual' || !plan.supported) {
-    return { type: 'mcp', changed: false, file: plan.path, reason: plan.reason };
-  }
-
-  const target = safeResolve(cwd, plan.path);
-  let existing = {};
-  if (await pathExists(target)) {
-    existing = JSON.parse(await fs.readFile(target, 'utf8'));
-  }
-  if (!isRecord(existing)) {
-    return { type: 'mcp', changed: false, file: plan.path, reason: 'Existing MCP config was not an object.' };
-  }
-
-  const next = {
-    ...existing,
-    mcpServers: {
-      ...(isRecord(existing.mcpServers) ? existing.mcpServers : {}),
-      [DISTRIBUTIONOS_MCP_SERVER_NAME]: {
-        type: 'http',
-        url: plan.serverUrl ?? MCP_SERVER_URL,
-      },
-    },
-  };
-
-  await fs.mkdir(path.dirname(target), { recursive: true });
-  await fs.writeFile(target, `${JSON.stringify(next, null, 2)}\n`, 'utf8');
-  return {
-    type: 'mcp',
-    changed: true,
-    file: plan.path,
-    action: plan.action === 'create' ? 'created' : 'updated',
-  };
-}
-
-function recommendedMcpConfig(serverUrl) {
-  return {
-    mcpServers: {
-      [DISTRIBUTIONOS_MCP_SERVER_NAME]: {
-        type: 'http',
-        url: serverUrl,
-      },
-    },
-  };
-}
-
-function containsSecretLikeConfig(value) {
-  if (Array.isArray(value)) return value.some(containsSecretLikeConfig);
-  if (!isRecord(value)) return false;
-  for (const [key, nested] of Object.entries(value)) {
-    if (/authorization|api[-_]?key|token|secret|password|credential|headers|env/i.test(key)) {
-      if (nested !== null && nested !== undefined && nested !== '') return true;
-    }
-    if (containsSecretLikeConfig(nested)) return true;
-  }
-  return false;
-}
-
-function isRecord(value) {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
-function safeResolve(cwd, relativePath) {
-  const root = path.resolve(cwd);
-  const target = path.resolve(root, relativePath);
-  const relative = path.relative(root, target);
-  if (relative.startsWith('..') || path.isAbsolute(relative)) {
-    throw new Error(`Refusing to write outside repo root: ${relativePath}`);
-  }
-  return target;
-}
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+import { MCP_SERVER_URL } from './constants.js';
+import { pathExists } from './detect.js';
+
+export const PROJECT_MCP_CONFIG_PATH = '.mcp.json';
+export const CODEX_MCP_CONFIG_PATH = '.codex/config.toml';
+export const DISTRIBUTIONOS_MCP_SERVER_NAME = 'distributionos';
+
+export async function buildProjectMcpConfigPlan(cwd, serverUrl = MCP_SERVER_URL) {
+  const target = safeResolve(cwd, PROJECT_MCP_CONFIG_PATH);
+  const base = {
+    path: PROJECT_MCP_CONFIG_PATH,
+    serverName: DISTRIBUTIONOS_MCP_SERVER_NAME,
+    serverUrl,
+    authMode: 'oauth',
+    requiresRestart: true,
+    writesSecrets: false,
+    recommendedConfig: recommendedMcpConfig(serverUrl),
+  };
+
+  if (!(await pathExists(target))) {
+    return {
+      ...base,
+      supported: true,
+      action: 'create',
+      reason: 'Create a project-local MCP config with the DistributionOS remote server URL only.',
+    };
+  }
+
+  let parsed;
+  try {
+    parsed = JSON.parse(await fs.readFile(target, 'utf8'));
+  } catch {
+    return {
+      ...base,
+      supported: false,
+      action: 'manual',
+      reason: 'Existing .mcp.json is not valid JSON, so the CLI will not edit it automatically.',
+    };
+  }
+
+  if (!isRecord(parsed)) {
+    return {
+      ...base,
+      supported: false,
+      action: 'manual',
+      reason: 'Existing .mcp.json is not an object, so the CLI will not edit it automatically.',
+    };
+  }
+
+  if (containsSecretLikeConfig(parsed)) {
+    return {
+      ...base,
+      supported: false,
+      action: 'manual',
+      reason: 'Existing .mcp.json appears to contain secret headers, tokens, or env values. The CLI will not rewrite it.',
+    };
+  }
+
+  const servers = isRecord(parsed.mcpServers) ? parsed.mcpServers : {};
+  const existing = servers[DISTRIBUTIONOS_MCP_SERVER_NAME];
+  const existingUrl = isRecord(existing) && typeof existing.url === 'string'
+    ? existing.url
+    : null;
+  const existingType = isRecord(existing) && typeof existing.type === 'string'
+    ? existing.type
+    : null;
+
+  if (existingUrl === serverUrl && existingType === 'http') {
+    return {
+      ...base,
+      supported: true,
+      action: 'none',
+      reason: 'Project-local MCP config already includes the DistributionOS server.',
+    };
+  }
+
+  if (existingUrl === serverUrl && !existingType) {
+    return {
+      ...base,
+      supported: true,
+      action: 'update',
+      reason: 'Add the Claude-compatible HTTP transport type to the DistributionOS MCP server entry.',
+    };
+  }
+
+  if (existingUrl === serverUrl && existingType !== 'http') {
+    return {
+      ...base,
+      supported: false,
+      action: 'manual',
+      reason: 'Existing distributionos MCP server uses a non-HTTP transport. The CLI will not overwrite it automatically.',
+    };
+  }
+
+  if (existingUrl) {
+    return {
+      ...base,
+      supported: false,
+      action: 'manual',
+      reason: 'Existing distributionos MCP server points to a different URL. The CLI will not overwrite it automatically.',
+    };
+  }
+
+  return {
+    ...base,
+    supported: true,
+    action: 'update',
+    reason: 'Add the DistributionOS remote MCP server to the existing project-local MCP config.',
+  };
+}
+
+export async function applyProjectMcpConfig(cwd, plan) {
+  if (!plan || plan.action === 'none') {
+    return { type: 'mcp', changed: false, file: plan?.path ?? PROJECT_MCP_CONFIG_PATH, reason: plan?.reason ?? 'No MCP config change planned.' };
+  }
+
+  if (plan.action === 'manual' || !plan.supported) {
+    return { type: 'mcp', changed: false, file: plan.path, reason: plan.reason };
+  }
+
+  const target = safeResolve(cwd, plan.path);
+  let existing = {};
+  if (await pathExists(target)) {
+    existing = JSON.parse(await fs.readFile(target, 'utf8'));
+  }
+  if (!isRecord(existing)) {
+    return { type: 'mcp', changed: false, file: plan.path, reason: 'Existing MCP config was not an object.' };
+  }
+
+  const next = {
+    ...existing,
+    mcpServers: {
+      ...(isRecord(existing.mcpServers) ? existing.mcpServers : {}),
+      [DISTRIBUTIONOS_MCP_SERVER_NAME]: {
+        type: 'http',
+        url: plan.serverUrl ?? MCP_SERVER_URL,
+      },
+    },
+  };
+
+  await fs.mkdir(path.dirname(target), { recursive: true });
+  await fs.writeFile(target, `${JSON.stringify(next, null, 2)}\n`, 'utf8');
+  return {
+    type: 'mcp',
+    changed: true,
+    file: plan.path,
+    action: plan.action === 'create' ? 'created' : 'updated',
+  };
+}
+
+export async function buildCodexMcpConfigPlan(cwd, serverUrl = MCP_SERVER_URL) {
+  const target = safeResolve(cwd, CODEX_MCP_CONFIG_PATH);
+  const base = {
+    path: CODEX_MCP_CONFIG_PATH,
+    serverName: DISTRIBUTIONOS_MCP_SERVER_NAME,
+    serverUrl,
+    authMode: 'oauth',
+    requiresRestart: true,
+    writesSecrets: false,
+    recommendedConfig: recommendedCodexConfig(serverUrl),
+  };
+
+  if (!(await pathExists(target))) {
+    return {
+      ...base,
+      supported: true,
+      action: 'create',
+      reason: 'Create a Codex project MCP config with the DistributionOS remote server URL only.',
+    };
+  }
+
+  const existing = await fs.readFile(target, 'utf8');
+  const section = findCodexMcpSection(existing);
+
+  if (!section) {
+    return {
+      ...base,
+      supported: true,
+      action: 'update',
+      reason: 'Add the DistributionOS MCP server to the existing Codex project config.',
+    };
+  }
+
+  if (section.url === serverUrl && section.enabled !== false) {
+    return {
+      ...base,
+      supported: true,
+      action: 'none',
+      reason: 'Codex project config already includes the DistributionOS server.',
+    };
+  }
+
+  if (section.url === serverUrl && section.enabled === false) {
+    return {
+      ...base,
+      supported: true,
+      action: 'update',
+      reason: 'Enable the existing DistributionOS MCP server in the Codex project config.',
+    };
+  }
+
+  return {
+    ...base,
+    supported: false,
+    action: 'manual',
+    reason: 'Existing Codex DistributionOS MCP server points to a different URL or is incomplete. The CLI will not overwrite it automatically.',
+  };
+}
+
+export async function applyCodexMcpConfig(cwd, plan) {
+  if (!plan || plan.action === 'none') {
+    return { type: 'codex-mcp', changed: false, file: plan?.path ?? CODEX_MCP_CONFIG_PATH, reason: plan?.reason ?? 'No Codex MCP config change planned.' };
+  }
+
+  if (plan.action === 'manual' || !plan.supported) {
+    return { type: 'codex-mcp', changed: false, file: plan.path, reason: plan.reason };
+  }
+
+  const target = safeResolve(cwd, plan.path);
+  const block = recommendedCodexConfig(plan.serverUrl ?? MCP_SERVER_URL);
+  const existing = await fs.readFile(target, 'utf8').catch(() => '');
+  const section = findCodexMcpSection(existing);
+  let next;
+
+  if (!existing.trim()) {
+    next = `${block}\n`;
+  } else if (!section) {
+    next = `${existing.replace(/\s*$/, '\n\n')}${block}\n`;
+  } else if (section.url === (plan.serverUrl ?? MCP_SERVER_URL) && section.enabled === false) {
+    const currentSection = existing.slice(section.start, section.end);
+    const updatedSection = currentSection.replace(/^\s*enabled\s*=\s*false\s*$/m, 'enabled = true');
+    next = existing.slice(0, section.start) + updatedSection + existing.slice(section.end);
+    if (!next.endsWith('\n')) next += '\n';
+  } else {
+    next = existing.slice(0, section.start) + block + existing.slice(section.end);
+    if (!next.endsWith('\n')) next += '\n';
+  }
+
+  if (next === existing) {
+    return { type: 'codex-mcp', changed: false, file: plan.path, reason: 'No Codex MCP config text change needed.' };
+  }
+
+  await fs.mkdir(path.dirname(target), { recursive: true });
+  await fs.writeFile(target, next, 'utf8');
+  return {
+    type: 'codex-mcp',
+    changed: true,
+    file: plan.path,
+    action: plan.action === 'create' ? 'created' : 'updated',
+  };
+}
+
+function recommendedMcpConfig(serverUrl) {
+  return {
+    mcpServers: {
+      [DISTRIBUTIONOS_MCP_SERVER_NAME]: {
+        type: 'http',
+        url: serverUrl,
+      },
+    },
+  };
+}
+
+function recommendedCodexConfig(serverUrl) {
+  return [
+    `[mcp_servers.${DISTRIBUTIONOS_MCP_SERVER_NAME}]`,
+    'enabled = true',
+    `url = ${JSON.stringify(serverUrl)}`,
+  ].join('\n');
+}
+
+function findCodexMcpSection(content) {
+  const text = String(content ?? '');
+  const sectionRe = /^\s*\[mcp_servers\.distributionos\]\s*$/m;
+  const match = sectionRe.exec(text);
+  if (!match || match.index === undefined) return null;
+
+  const start = match.index;
+  const afterHeader = start + match[0].length;
+  const nextSection = text.slice(afterHeader).search(/^\s*\[/m);
+  const end = nextSection === -1 ? text.length : afterHeader + nextSection;
+  const body = text.slice(start, end);
+  const url = body.match(/^\s*url\s*=\s*"([^"]+)"\s*$/m)?.[1] ?? null;
+  const enabledValue = body.match(/^\s*enabled\s*=\s*(true|false)\s*$/m)?.[1];
+  return {
+    start,
+    end,
+    url,
+    enabled: enabledValue === undefined ? null : enabledValue === 'true',
+  };
+}
+
+function containsSecretLikeConfig(value) {
+  if (Array.isArray(value)) return value.some(containsSecretLikeConfig);
+  if (!isRecord(value)) return false;
+  for (const [key, nested] of Object.entries(value)) {
+    if (/authorization|api[-_]?key|token|secret|password|credential|headers|env/i.test(key)) {
+      if (nested !== null && nested !== undefined && nested !== '') return true;
+    }
+    if (containsSecretLikeConfig(nested)) return true;
+  }
+  return false;
+}
+
+function isRecord(value) {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function safeResolve(cwd, relativePath) {
+  const root = path.resolve(cwd);
+  const target = path.resolve(root, relativePath);
+  const relative = path.relative(root, target);
+  if (relative.startsWith('..') || path.isAbsolute(relative)) {
+    throw new Error(`Refusing to write outside repo root: ${relativePath}`);
+  }
+  return target;
+}

package/src/mutate.js

@@ -1,6 +1,6 @@
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { applyProjectMcpConfig } from './mcp-config.js';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+import { applyCodexMcpConfig, applyProjectMcpConfig } from './mcp-config.js';
 
 const BOOTSTRAP_BLOCK_RE =
   /<!--\s*DISTRIBUTIONOS:START[\s\S]*?DISTRIBUTIONOS:END\s*-->/i;
@@ -18,16 +18,19 @@ export async function applySetupPlan(plan, options = {}) {
   const bootstrap = await applyBootstrap(plan.cwd, plan.bootstrap);
   if (bootstrap.changed) changes.push(bootstrap);
 
-  if (!options.skipAnalytics) {
-    const analytics = await applyAnalytics(plan.cwd, plan.analytics);
-    if (analytics.changed || analytics.reason) changes.push(analytics);
-  }
-
-  const mcp = await applyProjectMcpConfig(plan.cwd, plan.mcp);
-  if (mcp.changed || mcp.reason) changes.push(mcp);
-
-  return changes;
-}
+  if (!options.skipAnalytics) {
+    const analytics = await applyAnalytics(plan.cwd, plan.analytics);
+    if (analytics.changed || analytics.reason) changes.push(analytics);
+  }
+
+  const codexMcp = await applyCodexMcpConfig(plan.cwd, plan.codexMcp);
+  if (codexMcp.changed || codexMcp.reason) changes.push(codexMcp);
+
+  const mcp = await applyProjectMcpConfig(plan.cwd, plan.mcp);
+  if (mcp.changed || mcp.reason) changes.push(mcp);
+
+  return changes;
+}
 
 async function applyBootstrap(cwd, bootstrap) {
   const targetPath = safeResolve(cwd, bootstrap.target);
@@ -95,9 +98,9 @@ async function applyNextAppRouterAnalytics(cwd, analytics, scriptSrc) {
     contractVersion: analytics.contractVersion,
     configScript: analytics.configScript,
   });
-  const next = ANALYTICS_BLOCK_RE.test(existing)
-    ? existing.replace(ANALYTICS_BLOCK_RE, `\n${block}\n`)
-    : insertIntoNextAppRouterLayout(existing, block);
+  const next = ANALYTICS_BLOCK_RE.test(existing)
+    ? existing.replace(ANALYTICS_BLOCK_RE, `\n${block}\n`)
+    : insertIntoNextAppRouterLayout(existing, block);
 
   if (next === existing) {
     return { type: 'analytics', changed: false, file: analytics.layoutTarget, reason: 'No analytics change needed.' };
@@ -160,33 +163,33 @@ function buildHtmlAnalyticsBlock({ scriptSrc, contractVersion, configScript }) {
   ].join('\n');
 }
 
-function insertBeforeHeadClose(content, block) {
-  const headClose = content.match(/^(\s*)<\/head>/im);
-  if (headClose?.index === undefined) {
-    throw new Error('Could not find </head> in shared layout.');
-  }
-  return `${content.slice(0, headClose.index)}${block}\n${content.slice(headClose.index)}`;
-}
-
-function insertIntoNextAppRouterLayout(content, block) {
-  const headClose = content.match(/^(\s*)<\/head>/im);
-  if (headClose?.index !== undefined) {
-    return `${content.slice(0, headClose.index)}${block}\n${content.slice(headClose.index)}`;
-  }
-
-  const bodyOpen = content.match(/^(\s*)<body(\s|>)/im);
-  if (bodyOpen?.index === undefined) {
-    throw new Error('Could not find <body> in shared layout.');
-  }
-
-  const indent = bodyOpen[1] || '      ';
-  const headBlock = [
-    `${indent}<head>`,
-    block,
-    `${indent}</head>`,
-  ].join('\n');
-  return `${content.slice(0, bodyOpen.index)}${headBlock}\n${content.slice(bodyOpen.index)}`;
-}
+function insertBeforeHeadClose(content, block) {
+  const headClose = content.match(/^(\s*)<\/head>/im);
+  if (headClose?.index === undefined) {
+    throw new Error('Could not find </head> in shared layout.');
+  }
+  return `${content.slice(0, headClose.index)}${block}\n${content.slice(headClose.index)}`;
+}
+
+function insertIntoNextAppRouterLayout(content, block) {
+  const headClose = content.match(/^(\s*)<\/head>/im);
+  if (headClose?.index !== undefined) {
+    return `${content.slice(0, headClose.index)}${block}\n${content.slice(headClose.index)}`;
+  }
+
+  const bodyOpen = content.match(/^(\s*)<body(\s|>)/im);
+  if (bodyOpen?.index === undefined) {
+    throw new Error('Could not find <body> in shared layout.');
+  }
+
+  const indent = bodyOpen[1] || '      ';
+  const headBlock = [
+    `${indent}<head>`,
+    block,
+    `${indent}</head>`,
+  ].join('\n');
+  return `${content.slice(0, bodyOpen.index)}${headBlock}\n${content.slice(bodyOpen.index)}`;
+}
 
 function indentLines(value, prefix) {
   return String(value).split(/\r?\n/).map(line => `${prefix}${line}`).join('\n');