@ainote/mcp 1.3.4 → 1.3.6

package/lib/cli/signup.js

@@ -1,118 +1,130 @@
-import * as readline from 'node:readline/promises';
-import { stdin as input, stdout as output } from 'node:process';
-import axios from 'axios';
-import { getConfig } from '../core/config-manager.js';
-
-/**
- * Interactive CLI signup for AI Note MCP.
- * Usage: ainote-mcp signup
- */
-export async function runSignup() {
-  const config = getConfig();
-  const rl = readline.createInterface({ input, output });
-
-  console.log('\n  AI Note MCP — Sign Up\n');
-
-  try {
-    const email = await rl.question('  Email: ');
-    const password = await rl.question('  Password (min 6 chars): ');
-    const name = await rl.question('  Name (optional, press Enter to skip): ');
-
-    if (!email.trim() || !password.trim()) {
-      console.error('\n  Error: Email and password are required.\n');
-      process.exit(1);
-    }
-
-    if (password.trim().length < 6) {
-      console.error('\n  Error: Password must be at least 6 characters.\n');
-      process.exit(1);
-    }
-
-    console.log('\n  Creating account...');
-
-    const rpcRequest = {
-      jsonrpc: '2.0',
-      id: 1,
-      method: 'tools/call',
-      params: {
-        name: 'signup_and_get_key',
-        arguments: {
-          email: email.trim(),
-          password: password.trim(),
-          ...(name.trim() ? { name: name.trim() } : {})
-        }
-      }
-    };
-
-    const response = await axios.post(`${config.api.url}/api/mcp`, rpcRequest, {
-      headers: { 'Content-Type': 'application/json' },
-      timeout: 30000
-    });
-
-    const data = response.data?.data;
-
-    // Check for JSON-RPC error
-    if (data?.error) {
-      console.error(`\n  Error: ${data.error.message}`);
-      if (data.error.data?.suggestion) {
-        console.log(`  Hint: ${data.error.data.suggestion}`);
-      }
-      console.log();
-      process.exit(1);
-    }
-
-    // Extract MCP key from structured resource data
-    const content = data?.result?.content;
-    let mcpKey = null;
-
-    if (Array.isArray(content)) {
-      for (const item of content) {
-        if (item.type === 'resource' && item.resource?.text) {
-          try {
-            const resourceData = JSON.parse(item.resource.text);
-            mcpKey = resourceData.mcp_key;
-          } catch { /* ignore */ }
-        }
-      }
-    }
-
-    if (mcpKey) {
-      console.log('\n  Account created successfully!\n');
-      console.log(`  Your MCP API Key:\n`);
-      console.log(`    ${mcpKey}\n`);
-      console.log('  Add this to your MCP config:\n');
-      console.log('  {');
-      console.log('    "mcpServers": {');
-      console.log('      "ainote": {');
-      console.log('        "command": "npx",');
-      console.log('        "args": ["-y", "@ainote/mcp"],');
-      console.log('        "env": {');
-      console.log(`          "AINOTE_API_KEY": "${mcpKey}"`);
-      console.log('        }');
-      console.log('      }');
-      console.log('    }');
-      console.log('  }\n');
-      console.log('  Then restart Claude Desktop.\n');
-    } else {
-      // Fallback: print text content
-      if (Array.isArray(content)) {
-        for (const item of content) {
-          if (item.type === 'text') {
-            console.log(`\n${item.text}\n`);
-          }
-        }
-      } else {
-        console.log('\n  Account created! Check the response for your API key.\n');
-      }
-    }
-  } catch (error) {
-    if (error.response?.data) {
-      console.error(`\n  Error: ${JSON.stringify(error.response.data)}\n`);
-    } else {
-      console.error(`\n  Error: ${error.message}\n`);
-    }
-    process.exit(1);
-  } finally {
-    rl.close();
-  }
-}
+import * as readline from 'node:readline/promises';
+import { stdin as input, stdout as output } from 'node:process';
+import axios from 'axios';
+import { getConfig } from '../core/config-manager.js';
+
+/**
+ * Interactive CLI signup for AI Note MCP.
+ * Usage: ainote-mcp signup
+ */
+export async function runSignup() {
+  const config = getConfig();
+  const rl = readline.createInterface({ input, output });
+
+  console.log('\n  AI Note MCP — Sign Up\n');
+
+  try {
+    const email = await rl.question('  Email: ');
+    const password = await rl.question('  Password (min 6 chars): ');
+    const name = await rl.question('  Name (optional, press Enter to skip): ');
+
+    if (!email.trim() || !password.trim()) {
+      console.error('\n  Error: Email and password are required.\n');
+      process.exit(1);
+    }
+
+    if (password.trim().length < 6) {
+      console.error('\n  Error: Password must be at least 6 characters.\n');
+      process.exit(1);
+    }
+
+    console.log('\n  Creating account...');
+
+    const rpcRequest = {
+      jsonrpc: '2.0',
+      id: 1,
+      method: 'tools/call',
+      params: {
+        name: 'signup_and_get_key',
+        arguments: {
+          email: email.trim(),
+          password: password.trim(),
+          ...(name.trim() ? { name: name.trim() } : {})
+        }
+      }
+    };
+
+    const response = await axios.post(`${config.api.url}/api/mcp`, rpcRequest, {
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json, text/event-stream'
+      },
+      timeout: 30000
+    });
+
+    // /api/mcp 는 JSON-RPC 를 봉투 없이 그대로 돌려준다. 옛 서버의
+    // { success, data: {...} } 봉투도 함께 받는다.
+    const data = response.data?.data ?? response.data;
+
+    // Check for JSON-RPC error
+    if (data?.error) {
+      console.error(`\n  Error: ${data.error.message}`);
+      if (data.error.data?.suggestion) {
+        console.log(`  Hint: ${data.error.data.suggestion}`);
+      }
+      console.log();
+      process.exit(1);
+    }
+
+    // Extract MCP key from structured resource data
+    const content = data?.result?.content;
+
+    // 도구 오류는 result.isError 로 내려온다 (이메일 중복·비밀번호 규칙 등)
+    if (data?.result?.isError) {
+      const message = Array.isArray(content) ? content.find((item) => item.type === 'text')?.text : null;
+      console.error(`\n  Error: ${message || 'Signup failed'}\n`);
+      process.exit(1);
+    }
+    let mcpKey = null;
+
+    if (Array.isArray(content)) {
+      for (const item of content) {
+        if (item.type === 'resource' && item.resource?.text) {
+          try {
+            const resourceData = JSON.parse(item.resource.text);
+            mcpKey = resourceData.mcp_key;
+          } catch { /* ignore */ }
+        }
+      }
+    }
+
+    if (mcpKey) {
+      console.log('\n  Account created successfully!\n');
+      console.log(`  Your MCP API Key:\n`);
+      console.log(`    ${mcpKey}\n`);
+      console.log('  Add this to your MCP config:\n');
+      console.log('  {');
+      console.log('    "mcpServers": {');
+      console.log('      "ainote": {');
+      console.log('        "command": "npx",');
+      console.log('        "args": ["-y", "@ainote/mcp"],');
+      console.log('        "env": {');
+      console.log(`          "AINOTE_API_KEY": "${mcpKey}"`);
+      console.log('        }');
+      console.log('      }');
+      console.log('    }');
+      console.log('  }\n');
+      console.log('  Then restart Claude Desktop.\n');
+    } else {
+      // Fallback: print text content
+      if (Array.isArray(content)) {
+        for (const item of content) {
+          if (item.type === 'text') {
+            console.log(`\n${item.text}\n`);
+          }
+        }
+      } else {
+        console.log('\n  Account created! Check the response for your API key.\n');
+      }
+    }
+  } catch (error) {
+    if (error.response?.data) {
+      console.error(`\n  Error: ${JSON.stringify(error.response.data)}\n`);
+    } else {
+      console.error(`\n  Error: ${error.message}\n`);
+    }
+    process.exit(1);
+  } finally {
+    rl.close();
+  }
+}

package/lib/cli/whoami.js

@@ -1,76 +1,76 @@
-/**
- * `ainote-mcp whoami` — show the currently authenticated user.
- *
- * Strategy:
- *   1. Read credentials from the token store.
- *   2. If we have an access_token, hit GET /api/users/me with Bearer auth and
- *      print the response.
- *   3. If the API call fails (404, 401, network) but we have a stored mcp_key,
- *      print a minimal local-only summary so the user at least sees that
- *      credentials exist for this host.
- */
-import process from 'node:process';
-import axios from 'axios';
-import { getCredentials } from '../auth/token-store.js';
-import { resolveApiUrl } from '../core/config-manager.js';
-
-function summarizeUser(user) {
-  if (!user || typeof user !== 'object') return null;
-  const parts = [];
-  if (user.email) parts.push(user.email);
-  else if (user.name) parts.push(user.name);
-  else if (user.id) parts.push(`user #${user.id}`);
-  return parts.join(' ');
-}
-
-export async function run() {
-  const apiUrl = resolveApiUrl();
-  const creds = await getCredentials(apiUrl);
-
-  if (!creds) {
-    console.error('  Not logged in. Run `ainote-mcp login`.');
-    process.exit(1);
-    return;
-  }
-
-  let identity = null;
-
-  if (creds.accessToken) {
-    try {
-      const response = await axios.get(`${apiUrl}/api/users/me`, {
-        headers: {
-          Authorization: `Bearer ${creds.accessToken}`,
-          Accept: 'application/json'
-        },
-        timeout: 15000,
-        validateStatus: () => true
-      });
-      if (response.status >= 200 && response.status < 300) {
-        const body = response.data || {};
-        identity = summarizeUser(body.user || body.data || body) || summarizeUser(body);
-      }
-    } catch {
-      // fall through to local-only fallback below
-    }
-  }
-
-  if (identity) {
-    console.log(`  Logged in as ${identity}`);
-  } else {
-    // Local-only fallback: report what we have.
-    const host = (() => {
-      try { return new URL(apiUrl).host; } catch { return apiUrl; }
-    })();
-    console.log(`  Credentials present for ${host}`);
-    if (creds.mcpKey) console.log(`  MCP key: ${creds.mcpKey.slice(0, 8)}…`);
-    if (creds.expiresAt) {
-      const remaining = Math.floor((creds.expiresAt - Date.now()) / 1000);
-      if (remaining > 0) console.log(`  Access token expires in ~${remaining}s`);
-      else console.log(`  Access token expired (refresh on next call).`);
-    }
-    if (!creds.accessToken && !creds.mcpKey) {
-      console.error('  Could not verify identity. Try `ainote-mcp login` again.');
-      process.exit(1);
-    }
-  }
-}
+/**
+ * `ainote-mcp whoami` — show the currently authenticated user.
+ *
+ * Strategy:
+ *   1. Read credentials from the token store.
+ *   2. If we have an access_token, hit GET /api/users/me with Bearer auth and
+ *      print the response.
+ *   3. If the API call fails (404, 401, network) but we have a stored mcp_key,
+ *      print a minimal local-only summary so the user at least sees that
+ *      credentials exist for this host.
+ */
+import process from 'node:process';
+import axios from 'axios';
+import { getCredentials } from '../auth/token-store.js';
+import { resolveApiUrl } from '../core/config-manager.js';
+
+function summarizeUser(user) {
+  if (!user || typeof user !== 'object') return null;
+  const parts = [];
+  if (user.email) parts.push(user.email);
+  else if (user.name) parts.push(user.name);
+  else if (user.id) parts.push(`user #${user.id}`);
+  return parts.join(' ');
+}
+
+export async function run() {
+  const apiUrl = resolveApiUrl();
+  const creds = await getCredentials(apiUrl);
+
+  if (!creds) {
+    console.error('  Not logged in. Run `ainote-mcp login`.');
+    process.exit(1);
+    return;
+  }
+
+  let identity = null;
+
+  if (creds.accessToken) {
+    try {
+      const response = await axios.get(`${apiUrl}/api/users/me`, {
+        headers: {
+          Authorization: `Bearer ${creds.accessToken}`,
+          Accept: 'application/json'
+        },
+        timeout: 15000,
+        validateStatus: () => true
+      });
+      if (response.status >= 200 && response.status < 300) {
+        const body = response.data || {};
+        identity = summarizeUser(body.user || body.data || body) || summarizeUser(body);
+      }
+    } catch {
+      // fall through to local-only fallback below
+    }
+  }
+
+  if (identity) {
+    console.log(`  Logged in as ${identity}`);
+  } else {
+    // Local-only fallback: report what we have.
+    const host = (() => {
+      try { return new URL(apiUrl).host; } catch { return apiUrl; }
+    })();
+    console.log(`  Credentials present for ${host}`);
+    if (creds.mcpKey) console.log(`  MCP key: ${creds.mcpKey.slice(0, 8)}…`);
+    if (creds.expiresAt) {
+      const remaining = Math.floor((creds.expiresAt - Date.now()) / 1000);
+      if (remaining > 0) console.log(`  Access token expires in ~${remaining}s`);
+      else console.log(`  Access token expired (refresh on next call).`);
+    }
+    if (!creds.accessToken && !creds.mcpKey) {
+      console.error('  Could not verify identity. Try `ainote-mcp login` again.');
+      process.exit(1);
+    }
+  }
+}

package/lib/core/api-client.js

@@ -1 +1 @@
-export * from '../utils/api-client.js';
+export * from '../utils/api-client.js';

package/lib/core/config-manager.js

@@ -1,126 +1,126 @@
-/**
- * Single source of truth for the default AI Note backend URL.
- *
- * Every entry point (MCP server, `login`, `logout`, `whoami`, `call`) must
- * resolve the API URL through resolveApiUrl(). Credentials written by
- * `ainote-mcp login` are namespaced by API host in the token store, so any
- * divergence here makes the other commands look up the wrong host.
- *
- * (api.ainote.dev is currently a CNAME to this same Render service, but it is
- * a different token-store key, so the default must stay identical everywhere.)
- */
-export const DEFAULT_API_URL = 'https://ainote-5muq.onrender.com';
-
-/**
- * Resolve the effective API base URL: AINOTE_API_URL env override, else the
- * default. Trailing slashes are stripped so "${url}/api/..." joins cleanly.
- */
-export function resolveApiUrl(env = process.env) {
-  return (env.AINOTE_API_URL || DEFAULT_API_URL).replace(/\/+$/, '');
-}
-
-const DEFAULT_HTTP_PORT = 3030;
-
-const parseBoolean = (value, fallback) => {
-  if (value === undefined) {
-    return fallback;
-  }
-  if (typeof value === 'boolean') {
-    return value;
-  }
-  const normalized = `${value}`.trim().toLowerCase();
-  if (['1', 'true', 'yes', 'y', 'on'].includes(normalized)) {
-    return true;
-  }
-  if (['0', 'false', 'no', 'n', 'off'].includes(normalized)) {
-    return false;
-  }
-  return fallback;
-};
-
-const parseNumber = (value, fallback) => {
-  if (value === undefined) {
-    return fallback;
-  }
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : fallback;
-};
-
-const parseList = (value) => {
-  if (!value) {
-    return [];
-  }
-  if (Array.isArray(value)) {
-    return value;
-  }
-  return value
-    .split(',')
-    .map((item) => item.trim())
-    .filter((item) => item.length > 0);
-};
-
-/**
- * Synchronous config snapshot. Reads env vars only — used by the JSON-RPC
- * stdio entry path that cannot await.
- *
- * Note: stored CLI credentials (mcp_key from `ainote-mcp login`) are loaded
- * asynchronously by `getConfigAsync()` below. Callers that can await should
- * prefer the async form.
- */
-export function getConfig() {
-  const features = {
-    chatgptSupport: parseBoolean(process.env.AINOTE_ENABLE_CHATGPT_SUPPORT, true),
-    oauthAuth: parseBoolean(process.env.AINOTE_ENABLE_OAUTH_AUTH, false),
-    sseTransport: parseBoolean(process.env.AINOTE_ENABLE_SSE_TRANSPORT, true)
-  };
-
-  return {
-    api: {
-      key: process.env.AINOTE_API_KEY,
-      url: resolveApiUrl()
-    },
-    http: {
-      port: parseNumber(process.env.AINOTE_MCP_HTTP_PORT, DEFAULT_HTTP_PORT),
-      endpoint: process.env.AINOTE_MCP_HTTP_ENDPOINT || '/sse',
-      messageEndpoint: process.env.AINOTE_MCP_HTTP_MESSAGES_ENDPOINT || '/messages',
-      allowedOrigins: parseList(process.env.AINOTE_MCP_ALLOWED_ORIGINS),
-      allowedHosts: parseList(process.env.AINOTE_MCP_ALLOWED_HOSTS)
-    },
-    features,
-    requiresLogin: !process.env.AINOTE_API_KEY
-  };
-}
-
-/**
- * Async config that consults the local token store for an mcp_key when the
- * environment variable is unset. Used by the stdio entry path that runs
- * `await getConfigAsync()` at startup.
- */
-export async function getConfigAsync() {
-  const base = getConfig();
-
-  if (base.api.key) {
-    return { ...base, requiresLogin: false };
-  }
-
-  try {
-    const { getCredentials } = await import('../auth/token-store.js');
-    const creds = await getCredentials(base.api.url);
-    if (creds && creds.mcpKey) {
-      return {
-        ...base,
-        api: { ...base.api, key: creds.mcpKey },
-        requiresLogin: false,
-        api_key_source: 'token-store'
-      };
-    }
-  } catch (err) {
-    process.stderr.write(`[ainote-mcp] token store unavailable: ${err.message}\n`);
-  }
-
-  return { ...base, requiresLogin: true };
-}
-
-export function getFeatureFlags() {
-  return getConfig().features;
-}
+/**
+ * Single source of truth for the default AI Note backend URL.
+ *
+ * Every entry point (MCP server, `login`, `logout`, `whoami`, `call`) must
+ * resolve the API URL through resolveApiUrl(). Credentials written by
+ * `ainote-mcp login` are namespaced by API host in the token store, so any
+ * divergence here makes the other commands look up the wrong host.
+ *
+ * (api.ainote.dev is currently a CNAME to this same Render service, but it is
+ * a different token-store key, so the default must stay identical everywhere.)
+ */
+export const DEFAULT_API_URL = 'https://ainote-5muq.onrender.com';
+
+/**
+ * Resolve the effective API base URL: AINOTE_API_URL env override, else the
+ * default. Trailing slashes are stripped so "${url}/api/..." joins cleanly.
+ */
+export function resolveApiUrl(env = process.env) {
+  return (env.AINOTE_API_URL || DEFAULT_API_URL).replace(/\/+$/, '');
+}
+
+const DEFAULT_HTTP_PORT = 3030;
+
+const parseBoolean = (value, fallback) => {
+  if (value === undefined) {
+    return fallback;
+  }
+  if (typeof value === 'boolean') {
+    return value;
+  }
+  const normalized = `${value}`.trim().toLowerCase();
+  if (['1', 'true', 'yes', 'y', 'on'].includes(normalized)) {
+    return true;
+  }
+  if (['0', 'false', 'no', 'n', 'off'].includes(normalized)) {
+    return false;
+  }
+  return fallback;
+};
+
+const parseNumber = (value, fallback) => {
+  if (value === undefined) {
+    return fallback;
+  }
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : fallback;
+};
+
+const parseList = (value) => {
+  if (!value) {
+    return [];
+  }
+  if (Array.isArray(value)) {
+    return value;
+  }
+  return value
+    .split(',')
+    .map((item) => item.trim())
+    .filter((item) => item.length > 0);
+};
+
+/**
+ * Synchronous config snapshot. Reads env vars only — used by the JSON-RPC
+ * stdio entry path that cannot await.
+ *
+ * Note: stored CLI credentials (mcp_key from `ainote-mcp login`) are loaded
+ * asynchronously by `getConfigAsync()` below. Callers that can await should
+ * prefer the async form.
+ */
+export function getConfig() {
+  const features = {
+    chatgptSupport: parseBoolean(process.env.AINOTE_ENABLE_CHATGPT_SUPPORT, true),
+    oauthAuth: parseBoolean(process.env.AINOTE_ENABLE_OAUTH_AUTH, false),
+    sseTransport: parseBoolean(process.env.AINOTE_ENABLE_SSE_TRANSPORT, true)
+  };
+
+  return {
+    api: {
+      key: process.env.AINOTE_API_KEY,
+      url: resolveApiUrl()
+    },
+    http: {
+      port: parseNumber(process.env.AINOTE_MCP_HTTP_PORT, DEFAULT_HTTP_PORT),
+      endpoint: process.env.AINOTE_MCP_HTTP_ENDPOINT || '/sse',
+      messageEndpoint: process.env.AINOTE_MCP_HTTP_MESSAGES_ENDPOINT || '/messages',
+      allowedOrigins: parseList(process.env.AINOTE_MCP_ALLOWED_ORIGINS),
+      allowedHosts: parseList(process.env.AINOTE_MCP_ALLOWED_HOSTS)
+    },
+    features,
+    requiresLogin: !process.env.AINOTE_API_KEY
+  };
+}
+
+/**
+ * Async config that consults the local token store for an mcp_key when the
+ * environment variable is unset. Used by the stdio entry path that runs
+ * `await getConfigAsync()` at startup.
+ */
+export async function getConfigAsync() {
+  const base = getConfig();
+
+  if (base.api.key) {
+    return { ...base, requiresLogin: false };
+  }
+
+  try {
+    const { getCredentials } = await import('../auth/token-store.js');
+    const creds = await getCredentials(base.api.url);
+    if (creds && creds.mcpKey) {
+      return {
+        ...base,
+        api: { ...base.api, key: creds.mcpKey },
+        requiresLogin: false,
+        api_key_source: 'token-store'
+      };
+    }
+  } catch (err) {
+    process.stderr.write(`[ainote-mcp] token store unavailable: ${err.message}\n`);
+  }
+
+  return { ...base, requiresLogin: true };
+}
+
+export function getFeatureFlags() {
+  return getConfig().features;
+}

package/lib/core/config.js

@@ -1 +1 @@
-export * from './config-manager.js';
+export * from './config-manager.js';