@xmemo/client 0.4.156 → 0.4.158

package/src/commands/auth.js

@@ -1,4 +1,4 @@
-import { hasFlag, optionValue, parsePositiveInteger } from '../args.js';
+import { hasFlag, optionValue, parsePositiveInteger } from '../core/args.js';
 import {
   formatAccount,
   pollDeviceLogin,
@@ -8,18 +8,18 @@ import {
   storeTokenFromStdin,
   storeTokenValue,
   validateToken
-} from '../auth.js';
-import { baseUrlOption } from '../base-url.js';
+} from '../network/auth.js';
+import { baseUrlOption } from '../network/base-url.js';
 import {
   COMMAND_NAME,
   LEGACY_TOKEN_ENV_VAR,
   PRODUCT_NAME,
   TOKEN_ENV_VAR
-} from '../constants.js';
-import { UsageError } from '../errors.js';
-import { normalizeBaseUrl, verifyTokenWithMcp } from '../http.js';
-import { writeLine } from '../io.js';
-import { readAll } from '../runtime.js';
+} from '../core/constants.js';
+import { UsageError } from '../core/errors.js';
+import { normalizeBaseUrl, verifyTokenWithMcp } from '../network/http.js';
+import { writeLine } from '../core/io.js';
+import { readAll } from '../core/runtime.js';
 
 export async function loginCommand(args, io) {
   const outputJson = hasFlag(args, '--json');
@@ -227,3 +227,4 @@ function writeCredentialStatus(report, io, { mode }) {
   }
   writeLine(io.stdout, report.loggedIn ? 'Credential is ready; token value remains hidden.' : `Run \`${COMMAND_NAME} login\` to sign in.`);
 }
+

package/src/commands/diagnostics.js

@@ -5,30 +5,30 @@ import {
   parsePositiveInteger,
   sameMajorMinor,
   stringValue
-} from '../args.js';
-import { baseUrlOption } from '../base-url.js';
+} from '../core/args.js';
+import { baseUrlOption } from '../network/base-url.js';
 import {
   CLI_VERSION,
   COMMAND_NAME,
   PACKAGE_NAME,
   PRODUCT_NAME
-} from '../constants.js';
-import { UsageError } from '../errors.js';
+} from '../core/constants.js';
+import { UsageError } from '../core/errors.js';
 import {
   agentDiscoveryClientIds,
   bestEffortRootVersion,
   discoveryMcpUrl,
   ensureDiscoveryService
-} from '../discovery.js';
+} from '../network/discovery.js';
 import {
   endpointUrl,
   fetchJson,
   normalizeBaseUrl,
   probe
-} from '../http.js';
-import { writeLine } from '../io.js';
-import { codexSmokeReport } from '../mcp/codex.js';
-import { defaultCodexConfigPath } from '../path-config.js';
+} from '../network/http.js';
+import { writeLine } from '../core/io.js';
+import { codexSmokeReport } from '../mcp/formats/toml.js';
+import { defaultCodexConfigPath } from '../config/paths.js';
 
 export async function doctorCommand(args, io) {
   const baseUrl = normalizeBaseUrl(baseUrlOption(args, io.env));
@@ -194,3 +194,4 @@ export async function smokeCommand(args, io) {
   }
   return report.ok ? 0 : 1;
 }
+

package/src/commands/mcp.js

@@ -1,5 +1,5 @@
-import { hasFlag, optionValue, parsePositiveInteger } from '../args.js';
-import { baseUrlOption } from '../base-url.js';
+import { hasFlag, optionValue, parsePositiveInteger } from '../core/args.js';
+import { baseUrlOption } from '../network/base-url.js';
 import {
   AGENT_INSTANCE_ENV_VAR,
   COMMAND_NAME,
@@ -8,30 +8,30 @@ import {
   MCP_SERVER_NAME,
   PRODUCT_NAME,
   TOKEN_ENV_VAR
-} from '../constants.js';
-import { UsageError } from '../errors.js';
-import { endpointUrl, normalizeBaseUrl } from '../http.js';
-import { writeLine } from '../io.js';
+} from '../core/constants.js';
+import { UsageError } from '../core/errors.js';
+import { endpointUrl, normalizeBaseUrl } from '../network/http.js';
+import { writeLine } from '../core/io.js';
 import {
   MCP_CLIENTS,
   supportedMcpClientIds,
   supportedMcpClients
 } from '../mcp/clients.js';
-import { mcpProxyCommand } from '../mcp/copilot-proxy.js';
+import { mcpProxyCommand } from '../mcp/proxy/copilot.js';
 import {
   agentIdentity,
   envReferenceIdentity
-} from '../mcp/identity.js';
+} from '../mcp/identity/device.js';
 import {
   agentInstanceGenerationPolicy,
   mcpConfigTemplate,
   mcpLocalProxyTemplate
-} from '../mcp/templates.js';
-import { usesClientOAuth } from '../mcp/registry.js';
+} from '../mcp/core/templates.js';
+import { usesClientOAuth } from '../mcp/clients/registry.js';
 import {
   codexMemoryProfile,
   writeCodexMemoryProfile
-} from '../profile.js';
+} from '../config/profile.js';
 
 export async function mcpCommand(args, io) {
   const subcommand = args[0] ?? 'help';
@@ -185,3 +185,4 @@ export async function mcpCommand(args, io) {
   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;
 }
+

package/src/commands/profile.js

@@ -1,7 +1,7 @@
-import { hasFlag, optionValue } from '../args.js';
-import { COMMAND_NAME } from '../constants.js';
-import { UsageError } from '../errors.js';
-import { writeLine } from '../io.js';
+import { hasFlag, optionValue } from '../core/args.js';
+import { COMMAND_NAME } from '../core/constants.js';
+import { UsageError } from '../core/errors.js';
+import { writeLine } from '../core/io.js';
 import { MCP_CLIENTS } from '../mcp/clients.js';
 import {
   defaultProfileTarget,
@@ -11,8 +11,8 @@ import {
   profileUninstallResult,
   supportedProfileClientIds,
   writeProfileResult
-} from '../profile.js';
-import { normalizeSetupClientId } from '../setup.js';
+} from '../config/profile.js';
+import { normalizeSetupClientId } from '../ui/setup.js';
 
 export async function profileCommand(args, io) {
   const subcommand = args[0] ?? 'help';
@@ -54,3 +54,4 @@ export async function profileCommand(args, io) {
   writeProfileResult(subcommand, result, io);
   return 0;
 }
+

package/src/commands/setup.js

@@ -3,38 +3,38 @@ import {
   optionValue,
   parsePositiveInteger,
   stringValue
-} from '../args.js';
-import { baseUrlOption } from '../base-url.js';
+} from '../core/args.js';
+import { baseUrlOption } from '../network/base-url.js';
 import {
   DEFAULT_PROXY_PORT
-} from '../constants.js';
+} from '../core/constants.js';
 import {
   buildSetupPlan,
   ensureDiscoveryService
-} from '../discovery.js';
-import { UsageError } from '../errors.js';
+} from '../network/discovery.js';
+import { UsageError } from '../core/errors.js';
 import {
   endpointUrl,
   fetchJson,
   normalizeBaseUrl
-} from '../http.js';
-import { writeLine } from '../io.js';
+} from '../network/http.js';
+import { writeLine } from '../core/io.js';
 import {
   MCP_CLIENTS,
   supportedMcpClients
 } from '../mcp/clients.js';
-import { mergeCopilotMcpConfig } from '../mcp/copilot-proxy.js';
-import { detectClient } from '../mcp/detect.js';
+import { mergeCopilotMcpConfig } from '../mcp/proxy/copilot.js';
+import { detectClient } from '../mcp/clients/detect.js';
 import {
   agentIdentity,
   envReferenceIdentity
-} from '../mcp/identity.js';
+} from '../mcp/identity/device.js';
 import {
   confirmProfileInstall,
   defaultProfileTarget,
   profileClientConfig,
   profileInstallResult
-} from '../profile.js';
+} from '../config/profile.js';
 import {
   clientSetupPlan,
   copilotSetupPlan,
@@ -42,7 +42,7 @@ import {
   positionalClientArg,
   supportedSetupClientIds,
   writeSetupSummary
-} from '../setup.js';
+} from '../ui/setup.js';
 
 export async function setupCommand(args, io) {
   const positionalClientId = positionalClientArg(args, MCP_CLIENTS);
@@ -188,3 +188,4 @@ export async function setupCommand(args, io) {
   writeSetupSummary(setupPlan, io);
   return 0;
 }
+

package/src/commands/update.js

@@ -1,14 +1,14 @@
-import { hasFlag } from '../args.js';
+import { hasFlag } from '../core/args.js';
 import {
   COMMAND_NAME,
   PACKAGE_NAME
-} from '../constants.js';
-import { UsageError } from '../errors.js';
-import { writeLine } from '../io.js';
+} from '../core/constants.js';
+import { UsageError } from '../core/errors.js';
+import { writeLine } from '../core/io.js';
 import {
   npmExecutable,
   runProcess
-} from '../runtime.js';
+} from '../core/runtime.js';
 
 export async function updateCommand(args, io) {
   const outputJson = hasFlag(args, '--json');
@@ -55,3 +55,4 @@ export async function updateCommand(args, io) {
   }
   return 0;
 }
+

package/src/{env.js → config/env.js}

@@ -1,15 +1,15 @@
-import { hasFlag, optionValue } from './args.js';
-import { baseUrlOption } from './base-url.js';
+import { hasFlag, optionValue } from '../core/args.js';
+import { baseUrlOption } from '../network/base-url.js';
 import {
   AGENT_ID_ENV_VAR,
   AGENT_INSTANCE_ENV_VAR,
   COMMAND_NAME,
   PRODUCT_NAME,
   TOKEN_ENV_VAR
-} from './constants.js';
-import { UsageError } from './errors.js';
-import { normalizeBaseUrl } from './http.js';
-import { writeLine } from './io.js';
+} from '../core/constants.js';
+import { UsageError } from '../core/errors.js';
+import { normalizeBaseUrl } from '../network/http.js';
+import { writeLine } from '../core/io.js';
 
 export function envCommand(args, io) {
   const subcommand = args[0] ?? 'help';
@@ -79,3 +79,4 @@ export function writePrivacy(io) {
   writeLine(io.stdout, '- Legacy `token set` plaintext storage requires explicit --allow-plaintext.');
   writeLine(io.stdout, '- npm publishing is restricted by package.json files whitelist.');
 }
+

package/src/{path-config.js → config/paths.js}

@@ -22,4 +22,5 @@ export {
   defaultTraeSoloConfigPath,
   defaultWindsurfConfigPath,
   defaultZedConfigPath
-} from './mcp/paths.js';
+} from '../mcp/identity/paths.js';
+

package/src/{profile.js → config/profile.js}

@@ -4,6 +4,8 @@ import os from 'node:os';
 import path from 'node:path';
 
 import {
+  CLIENT_PROFILE_MARKER_END,
+  CLIENT_PROFILE_MARKER_START,
   CODEX_PROFILE_MARKER_END,
   CODEX_PROFILE_MARKER_START,
   CODEX_PROFILE_TARGET,
@@ -12,10 +14,10 @@ import {
   PRODUCT_NAME,
   PROFILE_MARKER_PREFIX,
   TOKEN_ENV_VAR
-} from './constants.js';
-import { UsageError } from './errors.js';
-import { writeLine } from './io.js';
-import { readTextIfExists } from './runtime.js';
+} from '../core/constants.js';
+import { UsageError } from '../core/errors.js';
+import { writeLine } from '../core/io.js';
+import { readTextIfExists } from '../core/runtime.js';
 
 export function codexMemoryProfile() {
   return memoryBehaviorProfile('codex');
@@ -51,7 +53,7 @@ function memoryBehaviorProfile(clientId) {
     'After meaningful decisions, bug fixes, release steps, or durable conventions, write a concise XMemo memory with scope, source, and no secret values.',
     'Never store tokens, API keys, cookies, private keys, raw credentials, or sensitive customer data in XMemo.',
     'For routine or low-signal output, skip durable writes. Prefer summarized procedural or semantic memories over verbose logs.',
-    config.authInstruction
+    'Keep XMemo authentication secure (using the XMEMO_KEY environment variable or client-managed OAuth); do not paste token values into prompts, config files, or logs.'
   ];
   return {
     client: clientId,
@@ -69,7 +71,7 @@ function memoryBehaviorProfile(clientId) {
 function profileInstructionText(clientId) {
   const profile = memoryBehaviorProfile(clientId);
   const lines = [
-    `## XMemo ${profile.label} profile`,
+    '## XMemo Agent profile',
     '',
     `MCP server: \`${profile.mcpServerName}\``,
   ];
@@ -80,7 +82,7 @@ function profileInstructionText(clientId) {
     '',
     profile.objective,
     '',
-    `Recommended ${profile.label} behavior:`
+    'Recommended Agent behavior:'
   );
   for (const instruction of profile.instructions) {
     lines.push(`- ${instruction}`);
@@ -96,118 +98,110 @@ export function profileClientConfig(clientId) {
       setupAlias: 'codex',
       profileVersion: 'codex-mcp-depth-v1',
       requiredTokenEnv: TOKEN_ENV_VAR,
-      markerStart: CODEX_PROFILE_MARKER_START,
-      markerEnd: CODEX_PROFILE_MARKER_END,
-      defaultTarget: () => defaultCodexProfileTarget(),
-      authInstruction: `Keep XMemo authentication through the ${TOKEN_ENV_VAR} environment variable; do not paste token values into prompts, config files, or logs.`
+      markerStart: CLIENT_PROFILE_MARKER_START,
+      markerEnd: CLIENT_PROFILE_MARKER_END,
+      defaultTarget: () => defaultCodexProfileTarget()
     },
     cursor: {
       label: 'Cursor',
       setupAlias: 'cursor',
       profileVersion: 'cursor-mcp-depth-v1',
       requiredTokenEnv: TOKEN_ENV_VAR,
-      markerStart: `<!-- ${PROFILE_MARKER_PREFIX}:cursor:start -->`,
-      markerEnd: `<!-- ${PROFILE_MARKER_PREFIX}:cursor:end -->`,
+      markerStart: CLIENT_PROFILE_MARKER_START,
+      markerEnd: CLIENT_PROFILE_MARKER_END,
       defaultTarget: (env) => {
         const isTest = env.HOME && (env.HOME.includes('memory-os-') || env.HOME.includes('test'));
         if (!isTest && (existsSync(path.join(process.cwd(), '.cursor')) || existsSync(path.join(process.cwd(), '.git')) || existsSync(path.join(process.cwd(), 'package.json')))) {
-          return path.join(process.cwd(), '.cursor', 'rules', 'xmemo-memory.md');
+          return path.join(process.cwd(), '.cursor', 'rules', 'AGENTS.md');
         }
         return path.join(userHome(env), '.cursor', 'memory-profile.md');
-      },
-      authInstruction: `Keep XMemo authentication through the ${TOKEN_ENV_VAR} environment variable; do not paste token values into prompts, config files, or logs.`
+      }
     },
     'gemini-cli': {
       label: 'Gemini CLI',
       setupAlias: 'gemini',
       profileVersion: 'gemini-cli-mcp-depth-v1',
-      markerStart: `<!-- ${PROFILE_MARKER_PREFIX}:gemini-cli:start -->`,
-      markerEnd: `<!-- ${PROFILE_MARKER_PREFIX}:gemini-cli:end -->`,
+      markerStart: CLIENT_PROFILE_MARKER_START,
+      markerEnd: CLIENT_PROFILE_MARKER_END,
       defaultTarget: (env) => {
         const isTest = env.HOME && (env.HOME.includes('memory-os-') || env.HOME.includes('test'));
         if (!isTest && (existsSync(path.join(process.cwd(), '.git')) || existsSync(path.join(process.cwd(), 'package.json')))) {
           return path.join(process.cwd(), 'GEMINI.md');
         }
         return path.join(userHome(env), '.gemini', 'GEMINI.md');
-      },
-      authInstruction: 'Use the client-managed MCP OAuth credential; do not paste token values into prompts, config files, or logs.'
+      }
     },
     antigravity: {
       label: 'Antigravity',
       setupAlias: 'antigravity',
       profileVersion: 'antigravity-mcp-depth-v1',
-      markerStart: `<!-- ${PROFILE_MARKER_PREFIX}:antigravity:start -->`,
-      markerEnd: `<!-- ${PROFILE_MARKER_PREFIX}:antigravity:end -->`,
+      markerStart: CLIENT_PROFILE_MARKER_START,
+      markerEnd: CLIENT_PROFILE_MARKER_END,
       defaultTarget: (env) => {
         const isTest = env.HOME && (env.HOME.includes('memory-os-') || env.HOME.includes('test'));
         if (!isTest && (existsSync(path.join(process.cwd(), '.git')) || existsSync(path.join(process.cwd(), 'package.json')))) {
           return path.join(process.cwd(), 'GEMINI.md');
         }
         return path.join(userHome(env), '.gemini', 'antigravity', 'MEMORY.md');
-      },
-      authInstruction: 'Use the client-managed MCP OAuth credential; do not paste token values into prompts, config files, or logs.'
+      }
     },
     qwen: {
       label: 'Qwen',
       setupAlias: 'qwen',
       profileVersion: 'qwen-mcp-depth-v1',
-      markerStart: `<!-- ${PROFILE_MARKER_PREFIX}:qwen:start -->`,
-      markerEnd: `<!-- ${PROFILE_MARKER_PREFIX}:qwen:end -->`,
+      markerStart: CLIENT_PROFILE_MARKER_START,
+      markerEnd: CLIENT_PROFILE_MARKER_END,
       defaultTarget: (env) => {
         const isTest = env.HOME && (env.HOME.includes('memory-os-') || env.HOME.includes('test'));
         if (!isTest && (existsSync(path.join(process.cwd(), '.git')) || existsSync(path.join(process.cwd(), 'package.json')))) {
           return path.join(process.cwd(), 'QWEN.md');
         }
         return path.join(userHome(env), '.qwen', 'QWEN.md');
-      },
-      authInstruction: `Keep XMemo authentication through the ${TOKEN_ENV_VAR} environment variable; do not paste token values into prompts, config files, or logs.`
+      }
     },
     opencode: {
       label: 'OpenCode',
       setupAlias: 'opencode',
       profileVersion: 'opencode-mcp-depth-v1',
-      markerStart: `<!-- ${PROFILE_MARKER_PREFIX}:opencode:start -->`,
-      markerEnd: `<!-- ${PROFILE_MARKER_PREFIX}:opencode:end -->`,
+      markerStart: CLIENT_PROFILE_MARKER_START,
+      markerEnd: CLIENT_PROFILE_MARKER_END,
       defaultTarget: (env) => {
         const isTest = env.HOME && (env.HOME.includes('memory-os-') || env.HOME.includes('test'));
         if (!isTest && (existsSync(path.join(process.cwd(), '.git')) || existsSync(path.join(process.cwd(), 'package.json')))) {
           return path.join(process.cwd(), 'AGENTS.md');
         }
         return path.join(userHome(env), '.config', 'opencode', 'AGENTS.md');
-      },
-      authInstruction: 'Use the client-managed MCP OAuth credential; do not paste token values into prompts, config files, or logs.'
+      }
     },
     trae: {
       label: 'Trae',
       setupAlias: 'trae',
       profileVersion: 'trae-mcp-depth-v1',
       requiredTokenEnv: TOKEN_ENV_VAR,
-      markerStart: `<!-- ${PROFILE_MARKER_PREFIX}:trae:start -->`,
-      markerEnd: `<!-- ${PROFILE_MARKER_PREFIX}:trae:end -->`,
+      markerStart: CLIENT_PROFILE_MARKER_START,
+      markerEnd: CLIENT_PROFILE_MARKER_END,
       defaultTarget: (env) => {
         const isTest = env.HOME && (env.HOME.includes('memory-os-') || env.HOME.includes('test'));
         if (!isTest && (existsSync(path.join(process.cwd(), '.trae')) || existsSync(path.join(process.cwd(), '.git')) || existsSync(path.join(process.cwd(), 'package.json')))) {
-          return path.join(process.cwd(), '.trae', 'rules', 'xmemo-memory.md');
+          return path.join(process.cwd(), '.trae', 'rules', 'AGENTS.md');
         }
         return path.join(userHome(env), '.trae', 'memory-profile.md');
-      },
-      authInstruction: `Keep XMemo authentication through the ${TOKEN_ENV_VAR} environment variable; do not paste token values into prompts, config files, or logs.`
+      }
     },
     'trae-solo': {
       label: 'Trae Solo',
       setupAlias: 'trae-solo',
       profileVersion: 'trae-solo-mcp-depth-v1',
       requiredTokenEnv: TOKEN_ENV_VAR,
-      markerStart: `<!-- ${PROFILE_MARKER_PREFIX}:trae-solo:start -->`,
-      markerEnd: `<!-- ${PROFILE_MARKER_PREFIX}:trae-solo:end -->`,
+      markerStart: CLIENT_PROFILE_MARKER_START,
+      markerEnd: CLIENT_PROFILE_MARKER_END,
       defaultTarget: (env) => {
         const isTest = env.HOME && (env.HOME.includes('memory-os-') || env.HOME.includes('test'));
         if (!isTest && (existsSync(path.join(process.cwd(), '.trae')) || existsSync(path.join(process.cwd(), '.git')) || existsSync(path.join(process.cwd(), 'package.json')))) {
-          return path.join(process.cwd(), '.trae', 'rules', 'xmemo-memory.md');
+          return path.join(process.cwd(), '.trae', 'rules', 'AGENTS.md');
         }
         return path.join(userHome(env), '.trae', 'memory-profile.md');
-      },
-      authInstruction: `Keep XMemo authentication through the ${TOKEN_ENV_VAR} environment variable; do not paste token values into prompts, config files, or logs.`
+      }
     }
   };
   return profileConfigs[clientId] ?? null;
@@ -530,3 +524,4 @@ export function writeProfileResult(action, result, io) {
   }
   writeLine(io.stdout, '  Token value embedded: false');
 }
+

package/src/{constants.js → core/constants.js}

@@ -14,14 +14,14 @@ export const AGENT_INSTANCE_HEADER = 'X-Memory-OS-Agent-Instance-ID';
 export const MCP_SERVER_NAME = 'XMemo';
 export const LEGACY_MCP_SERVER_NAMES = ['memory_os', 'memory-os'];
 export const CODEX_PROFILE_TARGET = 'AGENTS.md';
-export const CODEX_PROFILE_MARKER_START = '<!-- memory-os:codex-profile:start -->';
-export const CODEX_PROFILE_MARKER_END = '<!-- memory-os:codex-profile:end -->';
+export const CODEX_PROFILE_MARKER_START = '<!-- xmemo:profile:start -->';
+export const CODEX_PROFILE_MARKER_END = '<!-- xmemo:profile:end -->';
 export const CLIENT_PROFILE_TARGETS = {
-  cursor: '.cursor/rules/xmemo-memory.md',
+  cursor: '.cursor/rules/AGENTS.md',
   'gemini-cli': 'GEMINI.md',
   antigravity: 'GEMINI.md',
-  trae: '.trae/rules/xmemo-memory.md',
-  'trae-solo': '.trae/rules/xmemo-memory.md'
+  trae: '.trae/rules/AGENTS.md',
+  'trae-solo': '.trae/rules/AGENTS.md'
 };
 export const CLIENT_PROFILE_MARKER_START = '<!-- xmemo:profile:start -->';
 export const CLIENT_PROFILE_MARKER_END = '<!-- xmemo:profile:end -->';

package/src/core/version.js

@@ -0,0 +1,9 @@
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const packageJsonPath = path.join(__dirname, '..', '..', 'package.json');
+const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+
+export const CLI_VERSION = packageJson.version;

package/src/mcp/{detect.js → clients/detect.js}

@@ -1,8 +1,8 @@
 import os from 'node:os';
 import path from 'node:path';
 
-import { fileExists } from '../runtime.js';
-import { defaultCopilotConfigPath } from './paths.js';
+import { fileExists } from '../../core/runtime.js';
+import { defaultCopilotConfigPath } from '../identity/paths.js';
 
 export async function detectClient(clientId, env, mcpClients) {
   let filePaths = [];
@@ -48,3 +48,4 @@ export async function detectClient(clientId, env, mcpClients) {
 
   return { detected: false };
 }
+

package/src/mcp/{registry.js → clients/registry.js}

@@ -1,4 +1,4 @@
-import { JSON_MCP_CLIENT_DEFINITIONS } from './json-clients.js';
+import { JSON_MCP_CLIENT_DEFINITIONS } from '../formats/json.js';
 
 export function createMcpClients(deps) {
   const clients = new Map();
@@ -65,3 +65,4 @@ export function usesClientOAuth(clientId) {
     (definition) => definition.id === clientId && definition.authentication === 'oauth'
   );
 }
+

package/src/mcp/clients.js

@@ -1,16 +1,16 @@
 import {
   appendTomlServerConfig,
   codexTomlSnippet
-} from './codex.js';
+} from './formats/toml.js';
 import {
   hermesYamlSnippet,
   mergeHermesMcpConfig
-} from './hermes.js';
+} from './formats/yaml.js';
 import {
   JSON_MCP_CLIENT_DEFINITIONS,
   jsonClientSnippet,
   mergeJsonClientMcpConfig
-} from './json-clients.js';
+} from './formats/json.js';
 import {
   defaultAntigravity2ConfigPath,
   defaultAntigravityCliConfigPath,
@@ -33,12 +33,12 @@ import {
   defaultTraeSoloConfigPath,
   defaultWindsurfConfigPath,
   defaultZedConfigPath
-} from '../path-config.js';
+} from '../config/paths.js';
 import {
   createMcpClients,
   supportedMcpClientIds as registrySupportedMcpClientIds,
   supportedMcpClients as registrySupportedMcpClients
-} from './registry.js';
+} from './clients/registry.js';
 
 export const MCP_CLIENTS = createMcpClients({
   JSON_MCP_CLIENT_DEFINITIONS,
@@ -78,3 +78,4 @@ export function supportedMcpClients() {
 export function supportedMcpClientIds() {
   return registrySupportedMcpClientIds(MCP_CLIENTS);
 }
+

package/src/mcp/{names.js → core/names.js}

@@ -1,7 +1,7 @@
 import {
   LEGACY_MCP_SERVER_NAMES,
   MCP_SERVER_NAME
-} from '../constants.js';
+} from '../../core/constants.js';
 
 export function knownMcpServerNames() {
   return [MCP_SERVER_NAME, ...LEGACY_MCP_SERVER_NAMES];
@@ -10,3 +10,4 @@ export function knownMcpServerNames() {
 export function existingJsonMcpServerName(mcpServers) {
   return knownMcpServerNames().find((name) => mcpServers[name]);
 }
+

package/src/mcp/{templates.js → core/templates.js}

@@ -6,12 +6,12 @@ import {
   DEFAULT_PROXY_PORT,
   MCP_SERVER_NAME,
   TOKEN_ENV_VAR
-} from '../constants.js';
-import { codexTomlSnippet } from './codex.js';
+} from '../../core/constants.js';
+import { codexTomlSnippet } from '../formats/toml.js';
 import {
   jsonClientConfig,
   jsonMcpClientDefinition
-} from './json-clients.js';
+} from '../formats/json.js';
 
 export function mcpConfigTemplate(clientId, mcpUrl, options = {}) {
   if (clientId === 'codex') {
@@ -153,3 +153,4 @@ function oauthJsonMcpTemplate(clientId, mcpUrl, snippet, options) {
     writesTokenValue: false
   };
 }
+