@xmemo/client 0.4.156 → 0.4.157

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}

@@ -12,10 +12,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');
@@ -530,3 +530,4 @@ export function writeProfileResult(action, result, io) {
   }
   writeLine(io.stdout, '  Token value embedded: false');
 }
+

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
   };
 }
+

package/src/mcp/{json-clients.js → formats/json.js}

@@ -7,16 +7,16 @@ import {
   AGENT_INSTANCE_HEADER,
   MCP_SERVER_NAME,
   TOKEN_ENV_VAR
-} from '../constants.js';
-import { UsageError } from '../errors.js';
+} from '../../core/constants.js';
+import { UsageError } from '../../core/errors.js';
 import {
   bestEffortChmod,
   isPlainObject,
   parseJsonConfig,
   readTextIfExists
-} from '../runtime.js';
-import { envReferenceIdentity } from './identity.js';
-import { existingJsonMcpServerName } from './names.js';
+} from '../../core/runtime.js';
+import { envReferenceIdentity } from '../identity/device.js';
+import { existingJsonMcpServerName } from '../core/names.js';
 
 export const JSON_MCP_CLIENT_DEFINITIONS = Object.freeze([
   httpClientDefinition('cursor', 'Cursor', 'defaultCursorConfigPath', { urlKey: 'url', authentication: 'env-bearer' }),
@@ -352,3 +352,4 @@ export const claudecodeJsonConfig = (mcpUrl, identity = envReferenceIdentity('cl
 export const claudecodeJsonSnippet = (mcpUrl, identity = envReferenceIdentity('claude-code')) => jsonClientSnippet('claude-code', mcpUrl, identity);
 export const claudecodeJsonServerConfig = (mcpUrl, identity = envReferenceIdentity('claude-code')) => jsonClientServerConfig('claude-code', mcpUrl, identity);
 export const mergeClaudecodeMcpConfig = (configPath, mcpUrl, identity) => mergeJsonClientMcpConfig('claude-code', configPath, mcpUrl, identity);
+

package/src/mcp/{codex.js → formats/toml.js}

@@ -6,8 +6,8 @@ import {
   LEGACY_MCP_SERVER_NAMES,
   MCP_SERVER_NAME,
   TOKEN_ENV_VAR
-} from '../constants.js';
-import { UsageError } from '../errors.js';
+} from '../../core/constants.js';
+import { UsageError } from '../../core/errors.js';
 import {
   bestEffortChmod,
   escapeRegExp,
@@ -15,8 +15,8 @@ import {
   fileExists,
   readTextIfExists,
   unescapeTomlString
-} from '../runtime.js';
-import { agentInstanceIdentityPath } from './identity.js';
+} from '../../core/runtime.js';
+import { agentInstanceIdentityPath } from '../identity/device.js';
 
 export function codexTomlSnippet(mcpUrl) {
   return `[mcp_servers.${MCP_SERVER_NAME}]
@@ -145,3 +145,4 @@ function tomlStringValue(block, key) {
   const match = block.match(pattern);
   return match ? unescapeTomlString(match[1]) : null;
 }
+

package/src/mcp/{hermes.js → formats/yaml.js}

@@ -5,13 +5,13 @@ import {
   AGENT_INSTANCE_ENV_VAR,
   MCP_SERVER_NAME,
   TOKEN_ENV_VAR
-} from '../constants.js';
-import { UsageError } from '../errors.js';
+} from '../../core/constants.js';
+import { UsageError } from '../../core/errors.js';
 import {
   bestEffortChmod,
   readTextIfExists
-} from '../runtime.js';
-import { envReferenceIdentity } from './identity.js';
+} from '../../core/runtime.js';
+import { envReferenceIdentity } from '../identity/device.js';
 
 export function hermesYamlSnippet(mcpUrl, identity = envReferenceIdentity('hermes')) {
   return `mcp_servers:
@@ -69,3 +69,4 @@ export async function mergeHermesMcpConfig(configPath, mcpUrl, identity) {
   }
   await bestEffortChmod(configPath, 0o600);
 }
+

package/src/mcp/{identity.js → identity/device.js}

@@ -1,10 +1,10 @@
 import fs from 'node:fs/promises';
+import os from 'node:os';
 import path from 'node:path';
-import { randomUUID } from 'node:crypto';
 
-import { AGENT_INSTANCE_ENV_VAR } from '../constants.js';
-import { bestEffortChmod, parseJsonConfig, readTextIfExists } from '../runtime.js';
-import { stringValue } from '../args.js';
+import { AGENT_INSTANCE_ENV_VAR } from '../../core/constants.js';
+import { bestEffortChmod, parseJsonConfig, readTextIfExists } from '../../core/runtime.js';
+import { stringValue } from '../../core/args.js';
 import { configRoot } from './paths.js';
 
 function identityClientId(clientId) {
@@ -24,32 +24,47 @@ export async function agentIdentity(clientId, env) {
     };
   }
 
-  const identityPath = agentInstanceIdentityPath(env, targetClientId);
-  const existing = await readAgentInstanceIdentity(identityPath);
+  const identityPath = deviceInstanceIdentityPath(env);
+  const existing = await readDeviceInstanceIdentity(identityPath);
   if (existing) {
     return { agentId: targetClientId, agentInstanceId: existing, path: identityPath };
   }
 
-  const generated = `xmemo-${targetClientId}-${randomUUID()}`;
+  const hostname = os.hostname().toLowerCase().replace(/[^a-z0-9-]/g, '-').substring(0, 32);
+  const generated = `xmemo-${hostname}`;
+  
   await fs.mkdir(path.dirname(identityPath), { recursive: true, mode: 0o700 });
   await bestEffortChmod(path.dirname(identityPath), 0o700);
-  await fs.writeFile(identityPath, `${JSON.stringify({ version: 1, agentId: targetClientId, agentInstanceId: generated }, null, 2)}\n`, { mode: 0o600 });
+  await fs.writeFile(identityPath, `${JSON.stringify({ 
+    version: 1, 
+    deviceInstanceId: generated,
+    hostname: os.hostname(),
+    createdAt: new Date().toISOString()
+  }, null, 2)}\n`, { mode: 0o600 });
   await bestEffortChmod(identityPath, 0o600);
   return { agentId: targetClientId, agentInstanceId: generated, path: identityPath };
 }
 
-export async function readAgentInstanceIdentity(identityPath) {
+export async function readDeviceInstanceIdentity(identityPath) {
   const existing = await readTextIfExists(identityPath);
   if (!existing.trim()) {
     return null;
   }
   const parsed = parseJsonConfig(existing, identityPath);
-  const value = stringValue(parsed, ['agentInstanceId']);
+  const value = stringValue(parsed, ['deviceInstanceId']) || stringValue(parsed, ['agentInstanceId']);
   return value || null;
 }
 
-export function agentInstanceIdentityPath(env, clientId) {
-  return path.join(configRoot(env), 'agent-instances', `${clientId}.json`);
+export function deviceInstanceIdentityPath(env) {
+  return path.join(configRoot(env), 'device-instance.json');
+}
+
+export async function readAgentInstanceIdentity(identityPath) {
+  return readDeviceInstanceIdentity(identityPath);
+}
+
+export function agentInstanceIdentityPath(env) {
+  return deviceInstanceIdentityPath(env);
 }
 
 export function envReferenceIdentity(clientId) {
@@ -60,3 +75,4 @@ export function envReferenceIdentity(clientId) {
     path: `${AGENT_INSTANCE_ENV_VAR} environment variable`
   };
 }
+

package/src/mcp/{paths.js → identity/paths.js}

@@ -152,3 +152,4 @@ export function defaultClaudecodeConfigPath(env) {
   const home = env.USERPROFILE || env.HOME || os.homedir();
   return path.join(home, '.claude.json');
 }
+

package/src/mcp/{copilot-proxy.js → proxy/copilot.js}

@@ -1,16 +1,16 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { MCP_SERVER_NAME } from '../constants.js';
-import { UsageError } from '../errors.js';
+import { MCP_SERVER_NAME } from '../../core/constants.js';
+import { UsageError } from '../../core/errors.js';
 import {
   bestEffortChmod,
   isPlainObject,
   parseJsonConfig,
   readTextIfExists
-} from '../runtime.js';
-import { existingJsonMcpServerName } from './names.js';
-export { mcpProxyCommand } from './proxy.js';
+} from '../../core/runtime.js';
+import { existingJsonMcpServerName } from '../core/names.js';
+export { mcpProxyCommand } from './server.js';
 
 export async function mergeCopilotMcpConfig(configPath, proxyUrl) {
   const existing = await readTextIfExists(configPath);
@@ -41,3 +41,4 @@ export function copilotLocalProxyServerConfig(proxyUrl) {
     url: proxyUrl
   };
 }
+

package/src/mcp/{proxy.js → proxy/server.js}

@@ -1,6 +1,6 @@
 import http from 'node:http';
 
-import { optionValue, parsePositiveInteger } from '../args.js';
+import { optionValue, parsePositiveInteger } from '../../core/args.js';
 import {
   AGENT_ID_HEADER,
   AGENT_INSTANCE_HEADER,
@@ -11,12 +11,12 @@ import {
   DEFAULT_PROXY_PORT,
   PRODUCT_NAME,
   TOKEN_ENV_VAR
-} from '../constants.js';
-import { credentialsPath, resolveCredentialToken, validateToken } from '../auth.js';
-import { endpointUrl, normalizeBaseUrl } from '../http.js';
-import { UsageError } from '../errors.js';
-import { writeLine } from '../io.js';
-import { closeServer, readAll, waitForShutdown } from '../runtime.js';
+} from '../../core/constants.js';
+import { credentialsPath, resolveCredentialToken, validateToken } from '../../network/auth.js';
+import { endpointUrl, normalizeBaseUrl } from '../../network/http.js';
+import { UsageError } from '../../core/errors.js';
+import { writeLine } from '../../core/io.js';
+import { closeServer, readAll, waitForShutdown } from '../../core/runtime.js';
 
 export async function mcpProxyCommand(args, io, { agentIdentity }) {
   const baseUrl = normalizeBaseUrl(baseUrlOption(args, io.env));
@@ -109,3 +109,4 @@ function baseUrlOption(args, env) {
     ?? env.MEMORY_OS_BASE_URL
     ?? DEFAULT_SERVICE_URL;
 }
+