@xmemo/client 0.4.156 → 0.4.158

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' }),
@@ -30,7 +30,7 @@ export const JSON_MCP_CLIENT_DEFINITIONS = Object.freeze([
   nestedTransportClientDefinition('continue', 'Continue', 'defaultContinueConfigPath'),
   commandClientDefinition('claude-desktop', 'Claude Desktop', 'defaultClaudeConfigPath'),
   httpClientDefinition('openclaw', 'OpenClaw', 'defaultOpenclawConfigPath', { urlKey: 'url', authentication: 'env-bearer' }),
-  httpClientDefinition('kiro', 'Kiro', 'defaultKiroConfigPath', { urlKey: 'url', authentication: 'env-bearer' }),
+  httpClientDefinition('kiro', 'Kiro', 'defaultKiroConfigPath', { urlKey: 'url', section: 'powers.mcpServers', authentication: 'oauth' }),
   commandClientDefinition('zed', 'Zed', 'defaultZedConfigPath', { section: 'context_servers' }),
   nestedTransportClientDefinition('jetbrains', 'JetBrains', 'defaultJetbrainsConfigPath'),
   remoteClientDefinition('opencode', 'OpenCode', 'defaultOpencodeConfigPath'),
@@ -182,6 +182,10 @@ function headersForDefinition(definition, identity) {
 
   if (definition.authentication === 'env-bearer') {
     headers.Authorization = authorizationHeader(definition.bearerSyntax);
+  } else if (definition.id === 'kiro') {
+    if (process.env[TOKEN_ENV_VAR]) {
+      headers.Authorization = authorizationHeader(definition.bearerSyntax ?? 'env-colon');
+    }
   }
 
   return orderedHeaders(headers);
@@ -352,3 +356,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;
 }
+

package/src/{auth.js → network/auth.js}

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
-import { stringValue } from './args.js';
+import { stringValue } from '../core/args.js';
 import {
   CLI_VERSION,
   DEVICE_LOGIN_START_PATH,
@@ -10,16 +10,16 @@ import {
   LEGACY_TOKEN_ENV_VAR,
   PACKAGE_NAME,
   TOKEN_ENV_VAR
-} from './constants.js';
+} from '../core/constants.js';
 import { endpointUrl, postJson } from './http.js';
-import { UsageError } from './errors.js';
+import { UsageError } from '../core/errors.js';
 import {
   bestEffortChmod,
   parseJsonConfig,
   readAll,
   readTextIfExists,
   sleep
-} from './runtime.js';
+} from '../core/runtime.js';
 
 export async function startDeviceLogin(baseUrl, timeoutMs, io) {
   const payload = await postJson(endpointUrl(baseUrl, DEVICE_LOGIN_START_PATH), {
@@ -197,3 +197,4 @@ export function validateToken(token) {
     throw new UsageError('Token is too short to be a production credential.');
   }
 }
+

package/src/{base-url.js → network/base-url.js}

@@ -1,5 +1,5 @@
-import { optionValue } from './args.js';
-import { DEFAULT_SERVICE_URL } from './constants.js';
+import { optionValue } from '../core/args.js';
+import { DEFAULT_SERVICE_URL } from '../core/constants.js';
 
 export function baseUrlOption(args, env) {
   return optionValue(args, '--base-url')
@@ -10,3 +10,4 @@ export function baseUrlOption(args, env) {
     ?? env.MEMORY_OS_URL
     ?? DEFAULT_SERVICE_URL;
 }
+

package/src/{discovery.js → network/discovery.js}

@@ -1,8 +1,8 @@
-import { arrayValue, booleanValue, stringValue } from './args.js';
-import { TOKEN_ENV_VAR } from './constants.js';
-import { UsageError } from './errors.js';
+import { arrayValue, booleanValue, stringValue } from '../core/args.js';
+import { TOKEN_ENV_VAR } from '../core/constants.js';
+import { UsageError } from '../core/errors.js';
 import { endpointUrl, fetchJson } from './http.js';
-import { isPlainObject } from './runtime.js';
+import { isPlainObject } from '../core/runtime.js';
 
 export function ensureDiscoveryService(discovery, discoveryUrl) {
   const service = stringValue(discovery, ['service']);
@@ -100,3 +100,4 @@ export function discoveryMcpClients(discovery) {
     }));
 }
 
+

package/src/{http.js → network/http.js}

@@ -1,8 +1,8 @@
 import {
   CLI_VERSION,
   COMMAND_NAME
-} from './constants.js';
-import { UsageError } from './errors.js';
+} from '../core/constants.js';
+import { UsageError } from '../core/errors.js';
 
 export async function verifyTokenWithMcp(baseUrl, token, timeoutMs, io) {
   const url = endpointUrl(baseUrl, '/mcp');
@@ -158,3 +158,4 @@ export function endpointUrl(baseUrl, pathname) {
   url.search = '';
   return url.toString();
 }
+

package/src/{help.js → ui/help.js}

@@ -4,8 +4,8 @@ import {
   LEGACY_COMMAND_NAME,
   PACKAGE_NAME,
   PRODUCT_NAME
-} from './constants.js';
-import { writeLine } from './io.js';
+} from '../core/constants.js';
+import { writeLine } from '../core/io.js';
 
 export function writeHelp(io) {
   writeLine(io.stdout, `======================================================================`);
@@ -56,3 +56,4 @@ export function writeHelp(io) {
   writeLine(io.stdout, '  - AST Merge Safety: Config writes only touch and append the XMemo keys, preserving all other servers.');
   writeLine(io.stdout, '======================================================================');
 }
+

package/src/{setup.js → ui/setup.js}

@@ -1,17 +1,17 @@
-import { optionValue } from './args.js';
+import { optionValue } from '../core/args.js';
 import {
   COMMAND_NAME,
   DEFAULT_PROXY_HOST,
   MCP_SERVER_NAME,
   PRODUCT_NAME,
   TOKEN_ENV_VAR
-} from './constants.js';
-import { UsageError } from './errors.js';
-import { writeLine } from './io.js';
-import { supportedMcpClientIds, usesClientOAuth } from './mcp/registry.js';
-import { mcpLocalProxyTemplate } from './mcp/templates.js';
-import { defaultCopilotConfigPath } from './path-config.js';
-import { profileClientConfig } from './profile.js';
+} from '../core/constants.js';
+import { UsageError } from '../core/errors.js';
+import { writeLine } from '../core/io.js';
+import { supportedMcpClientIds, usesClientOAuth } from '../mcp/clients/registry.js';
+import { mcpLocalProxyTemplate } from '../mcp/core/templates.js';
+import { defaultCopilotConfigPath } from '../mcp/identity/paths.js';
+import { profileClientConfig } from '../config/profile.js';
 
 const SETUP_CLIENT_ALIASES = new Map([
   ['codex', 'codex'],
@@ -241,3 +241,4 @@ export function writeSetupSummary(plan, io) {
   writeLine(io.stdout, `  2. Configure a client, for example: ${COMMAND_NAME} setup codex --url ${plan.baseUrl}`);
   writeLine(io.stdout, `  3. Run ${COMMAND_NAME} status to smoke-test the service without sending the token.`);
 }
+

package/src/version.js

@@ -1 +0,0 @@
-export const CLI_VERSION = '0.4.156';