@ainote/mcp 1.3.1 → 1.3.3

package/lib/cli/call.js

@@ -0,0 +1,211 @@
+/**
+ * `ainote-mcp call <tool> [--key=value ...] [--json '<obj>']`
+ *
+ * Direct shell invocation of an ainote MCP tool — no agent required. Useful for:
+ *   - one-off CLI use, scripts, alfred/raycast workflows
+ *   - debugging tool responses without spinning up Claude
+ *   - automation that wants a single tool result, not an interactive loop
+ *
+ * Resolves the MCP key from (in order):
+ *   1. AINOTE_API_KEY env
+ *   2. token store (mcpKey written by `ainote-mcp login`)
+ *
+ * Posts JSON-RPC 2.0 `tools/call` to AINOTE_API_URL (default https://api.ainote.dev/api/mcp).
+ *
+ * Argument parsing supports two styles, in priority order:
+ *   --json '{"due_today": true}'    raw JSON object as arguments
+ *   --key=value                      one flag per top-level field; values are
+ *                                    JSON.parse-d (so `--limit=5` is 5, not "5";
+ *                                    `--name=hello` falls back to the raw string
+ *                                    if JSON.parse fails)
+ *
+ * Output:
+ *   default — pretty JSON of the tool's result content
+ *   --raw   — entire JSON-RPC envelope
+ */
+import process from 'node:process';
+import axios from 'axios';
+import { getCredentials } from '../auth/token-store.js';
+
+const DEFAULT_API_URL = 'https://api.ainote.dev';
+
+function parseArgs(argv) {
+  // argv shape: [toolName, ...flags]
+  const toolName = argv[0];
+  const flags = argv.slice(1);
+  const out = { tool: toolName, args: {}, raw: false, help: false };
+
+  for (let i = 0; i < flags.length; i++) {
+    const a = flags[i];
+    if (a === '--raw') { out.raw = true; continue; }
+    if (a === '-h' || a === '--help') { out.help = true; continue; }
+    if (a === '--json') {
+      const next = flags[++i];
+      if (!next) throw new Error('--json requires a JSON object argument');
+      let parsed;
+      try { parsed = JSON.parse(next); }
+      catch (e) { throw new Error(`--json value is not valid JSON: ${e.message}`); }
+      if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        throw new Error('--json value must be a JSON object');
+      }
+      out.args = { ...out.args, ...parsed };
+      continue;
+    }
+    if (a.startsWith('--')) {
+      const eq = a.indexOf('=');
+      let key, rawVal;
+      if (eq > 0) {
+        key = a.slice(2, eq);
+        rawVal = a.slice(eq + 1);
+      } else {
+        key = a.slice(2);
+        rawVal = flags[++i];
+        if (rawVal === undefined) {
+          out.args[key] = true;
+          continue;
+        }
+      }
+      // Try JSON.parse first (numbers, booleans, null, arrays/objects),
+      // fall back to raw string.
+      let value;
+      try { value = JSON.parse(rawVal); }
+      catch { value = rawVal; }
+      out.args[key] = value;
+      continue;
+    }
+    throw new Error(`unexpected positional argument: ${a}`);
+  }
+
+  return out;
+}
+
+function printHelp() {
+  const help = `\
+Usage: ainote-mcp call <tool> [options]
+
+Direct shell invocation of an ainote MCP tool over HTTP. Bypasses any
+running MCP host (Claude Desktop, Cursor, etc.) and posts directly to
+api.ainote.dev — useful for scripts and one-off queries.
+
+Authentication:
+  - AINOTE_API_KEY env var, OR
+  - mcp key from \`ainote-mcp login\` (stored in OS keychain)
+
+Options:
+  --key=value           pass an argument to the tool (JSON.parse-d, falls
+                        back to string). Repeatable.
+  --json '<obj>'        pass the entire arguments object as JSON. Merged
+                        with any --key=value flags (--key=value wins on
+                        conflict).
+  --raw                 print the full JSON-RPC envelope instead of just
+                        the result content.
+  -h, --help            this help.
+
+Examples:
+  ainote-mcp call list_tasks --due_today=true
+  ainote-mcp call list_tasks --limit=5 --status=pending
+  ainote-mcp call handoff_save \\
+    --json '{"project":"demo","topic":"poc","content":"..."}'
+  ainote-mcp call handoff_get --project=demo --topic=poc
+  ainote-mcp call list_dev_categories
+`;
+  process.stdout.write(help);
+}
+
+export async function run(argv) {
+  // argv: everything after the `call` subcommand
+  if (!argv || argv.length === 0) {
+    printHelp();
+    process.exit(1);
+    return;
+  }
+
+  let parsed;
+  try { parsed = parseArgs(argv); }
+  catch (e) {
+    console.error(`error: ${e.message}\n`);
+    printHelp();
+    process.exit(2);
+    return;
+  }
+
+  if (parsed.help || !parsed.tool || parsed.tool.startsWith('-')) {
+    printHelp();
+    process.exit(parsed.help ? 0 : 1);
+    return;
+  }
+
+  const apiUrl = (process.env.AINOTE_API_URL || DEFAULT_API_URL).replace(/\/+$/, '');
+
+  let mcpKey = process.env.AINOTE_API_KEY;
+  if (!mcpKey) {
+    const creds = await getCredentials(apiUrl);
+    mcpKey = creds?.mcpKey;
+  }
+  if (!mcpKey) {
+    console.error('error: no MCP key. Run `ainote-mcp login` or set AINOTE_API_KEY.');
+    process.exit(3);
+    return;
+  }
+
+  const body = {
+    jsonrpc: '2.0',
+    id: 1,
+    method: 'tools/call',
+    params: { name: parsed.tool, arguments: parsed.args }
+  };
+
+  let response;
+  try {
+    response = await axios.post(`${apiUrl}/api/mcp`, body, {
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `McpKey ${mcpKey}`,
+        Accept: 'application/json'
+      },
+      timeout: 60000,
+      validateStatus: () => true
+    });
+  } catch (e) {
+    console.error(`error: request failed: ${e.message}`);
+    process.exit(4);
+    return;
+  }
+
+  if (response.status >= 400 && response.status !== 200) {
+    console.error(`error: HTTP ${response.status}`);
+    console.error(JSON.stringify(response.data, null, 2));
+    process.exit(5);
+    return;
+  }
+
+  const env = response.data || {};
+  if (env.error) {
+    console.error(`error: ${env.error.message || 'unknown'} (code ${env.error.code})`);
+    if (env.error.data) console.error(JSON.stringify(env.error.data, null, 2));
+    process.exit(6);
+    return;
+  }
+
+  if (parsed.raw) {
+    console.log(JSON.stringify(env, null, 2));
+    return;
+  }
+
+  // Default: print just the result.content[] payload(s) so shell pipelines
+  // can grep / jq directly without the JSON-RPC envelope noise.
+  const content = env?.result?.content;
+  if (Array.isArray(content)) {
+    for (const block of content) {
+      if (block && typeof block === 'object' && 'text' in block) {
+        console.log(block.text);
+      } else {
+        console.log(JSON.stringify(block, null, 2));
+      }
+    }
+    return;
+  }
+
+  // Fallback — some tools may emit a non-standard shape; dump result.
+  console.log(JSON.stringify(env.result ?? env, null, 2));
+}

package/lib/cli/login.js

@@ -1,238 +1,238 @@
-/**
- * `ainote-mcp login` — interactive device-authorization grant flow.
- *
- * UX:
- *   1. Request device code from server.
- *   2. Display the user_code in an ASCII box.
- *   3. Print verification URL and try to open it in a browser (unless --no-browser).
- *   4. Spin while polling for token.
- *   5. On success, persist to keychain/file.
- *
- * Flags:
- *   --scope=mcp,read,write   Comma-separated scope list (default: mcp,read,write).
- *   --no-browser             Don't auto-open the verification URL.
- *   --client-name=<name>     Override client_name shown on the consent screen.
- *
- * SIGINT cancels the in-flight authorization (best effort) and exits 1.
- */
-import process from 'node:process';
-import os from 'node:os';
-import {
-  requestDeviceCode,
-  pollForToken,
-  cancel,
-  DeviceAccessDeniedError,
-  DeviceExpiredError,
-  DevicePkceError,
-  DeviceNetworkError
-} from '../auth/device-flow.js';
-import { setCredentials, _credentialsLocations } from '../auth/token-store.js';
-
-const DEFAULT_API_URL = 'https://ainote-5muq.onrender.com';
-const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-
-function parseArgs(argv) {
-  const args = {
-    scope: 'mcp,read,write',
-    noBrowser: false,
-    clientName: `ainote-mcp CLI (${os.hostname()})`
-  };
-  for (const arg of argv) {
-    if (arg === '--no-browser') {
-      args.noBrowser = true;
-    } else if (arg.startsWith('--scope=')) {
-      args.scope = arg.slice('--scope='.length);
-    } else if (arg === '--scope') {
-      // next-token form is not supported in this minimal parser
-      args.scope = args.scope;
-    } else if (arg.startsWith('--client-name=')) {
-      args.clientName = arg.slice('--client-name='.length);
-    }
-  }
-  return args;
-}
-
-function drawUserCodeBox(userCode) {
-  const padded = `   ${userCode}   `;
-  const width = padded.length;
-  const top = `┌${'─'.repeat(width)}┐`;
-  const mid = `│${padded}│`;
-  const bot = `└${'─'.repeat(width)}┘`;
-  return `${top}\n${mid}\n${bot}`;
-}
-
-class Spinner {
-  constructor() {
-    this.frame = 0;
-    this.suffix = '';
-    this.timer = null;
-    this.active = false;
-  }
-
-  start(initialSuffix = '') {
-    if (this.active) return;
-    this.active = true;
-    this.suffix = initialSuffix;
-    this.timer = setInterval(() => this._render(), 100);
-    this._render();
-  }
-
-  update(suffix) {
-    this.suffix = suffix;
-  }
-
-  _render() {
-    const frame = SPINNER_FRAMES[this.frame % SPINNER_FRAMES.length];
-    this.frame += 1;
-    if (process.stderr.isTTY) {
-      process.stderr.write(`\r${frame} ${this.suffix}\x1b[K`);
-    }
-  }
-
-  stop(finalLine) {
-    if (!this.active) return;
-    this.active = false;
-    if (this.timer) {
-      clearInterval(this.timer);
-      this.timer = null;
-    }
-    if (process.stderr.isTTY) {
-      process.stderr.write('\r\x1b[K');
-    }
-    if (finalLine) {
-      process.stderr.write(`${finalLine}\n`);
-    }
-  }
-}
-
-async function tryOpenBrowser(uri) {
-  try {
-    const mod = await import('open');
-    const open = mod.default || mod;
-    await open(uri);
-    return true;
-  } catch (err) {
-    return false;
-  }
-}
-
-export async function run(argv = process.argv.slice(3)) {
-  const apiUrl = (process.env.AINOTE_API_URL || DEFAULT_API_URL).replace(/\/+$/, '');
-  const args = parseArgs(argv);
-  const scopes = args.scope.split(',').map((s) => s.trim()).filter(Boolean);
-
-  console.log('');
-  console.log(`  AI Note MCP — Login`);
-  console.log(`  API: ${apiUrl}`);
-  console.log('');
-
-  let device;
-  try {
-    device = await requestDeviceCode({
-      apiUrl,
-      clientName: args.clientName,
-      scopes
-    });
-  } catch (err) {
-    if (err instanceof DeviceNetworkError) {
-      console.error(`  Network error: ${err.message}`);
-    } else {
-      console.error(`  Failed to start login: ${err.message}`);
-    }
-    process.exit(1);
-    return;
-  }
-
-  console.log(`  Visit the URL below and enter the code:`);
-  console.log('');
-  console.log(drawUserCodeBox(device.user_code));
-  console.log('');
-  console.log(`  ${device.verification_uri}`);
-  if (device.verification_uri_complete && device.verification_uri_complete !== device.verification_uri) {
-    console.log(`  (direct link: ${device.verification_uri_complete})`);
-  }
-  console.log('');
-
-  if (!args.noBrowser) {
-    const target = device.verification_uri_complete || device.verification_uri;
-    const opened = await tryOpenBrowser(target);
-    if (opened) {
-      console.log('  Opening your browser…');
-    } else {
-      console.log('  (Could not open browser automatically — please open the URL above.)');
-    }
-    console.log('');
-  }
-
-  const spinner = new Spinner();
-  spinner.start(`Waiting for authorization… (0s elapsed, next poll in ${device.interval}s)`);
-
-  let cancelled = false;
-  const sigintHandler = async () => {
-    if (cancelled) return;
-    cancelled = true;
-    spinner.stop('Cancelled.');
-    await cancel({ apiUrl, deviceCode: device.device_code });
-    process.exit(1);
-  };
-  process.once('SIGINT', sigintHandler);
-
-  try {
-    const tokens = await pollForToken({
-      apiUrl,
-      deviceCode: device.device_code,
-      codeVerifier: device.code_verifier,
-      interval: device.interval,
-      expiresIn: device.expires_in,
-      onTick: ({ elapsed, interval }) => {
-        spinner.update(`Waiting for authorization… (${elapsed}s elapsed, next poll in ${interval}s)`);
-      }
-    });
-
-    spinner.stop();
-    process.removeListener('SIGINT', sigintHandler);
-
-    const expiresAt = tokens.expires_in
-      ? Date.now() + Number(tokens.expires_in) * 1000
-      : undefined;
-
-    const persisted = await setCredentials(apiUrl, {
-      mcpKey: tokens.mcp_key,
-      accessToken: tokens.access_token,
-      refreshToken: tokens.refresh_token,
-      expiresAt
-    });
-
-    const email = tokens.user?.email;
-    const locationDesc = persisted.storage === 'keychain'
-      ? 'OS keychain'
-      : persisted.storage === 'mixed'
-        ? `OS keychain + ${persisted.file}`
-        : persisted.file || _credentialsLocations().file;
-
-    console.log('');
-    if (email) {
-      console.log(`  ✓ Logged in as ${email}.`);
-    } else {
-      console.log(`  ✓ Logged in.`);
-    }
-    console.log(`  Credentials saved to ${locationDesc}.`);
-    console.log('');
-  } catch (err) {
-    spinner.stop();
-    process.removeListener('SIGINT', sigintHandler);
-
-    if (err instanceof DeviceAccessDeniedError) {
-      console.error('  Access denied. The authorization request was rejected.');
-    } else if (err instanceof DeviceExpiredError) {
-      console.error('  Code expired. Please run `ainote-mcp login` again.');
-    } else if (err instanceof DevicePkceError) {
-      console.error('  Authentication failed (PKCE mismatch). Please retry.');
-    } else if (err instanceof DeviceNetworkError) {
-      console.error(`  Network error: ${err.message}`);
-    } else {
-      console.error(`  Login failed: ${err.message}`);
-    }
-    process.exit(1);
-  }
-}
+/**
+ * `ainote-mcp login` — interactive device-authorization grant flow.
+ *
+ * UX:
+ *   1. Request device code from server.
+ *   2. Display the user_code in an ASCII box.
+ *   3. Print verification URL and try to open it in a browser (unless --no-browser).
+ *   4. Spin while polling for token.
+ *   5. On success, persist to keychain/file.
+ *
+ * Flags:
+ *   --scope=mcp,read,write   Comma-separated scope list (default: mcp,read,write).
+ *   --no-browser             Don't auto-open the verification URL.
+ *   --client-name=<name>     Override client_name shown on the consent screen.
+ *
+ * SIGINT cancels the in-flight authorization (best effort) and exits 1.
+ */
+import process from 'node:process';
+import os from 'node:os';
+import {
+  requestDeviceCode,
+  pollForToken,
+  cancel,
+  DeviceAccessDeniedError,
+  DeviceExpiredError,
+  DevicePkceError,
+  DeviceNetworkError
+} from '../auth/device-flow.js';
+import { setCredentials, _credentialsLocations } from '../auth/token-store.js';
+
+const DEFAULT_API_URL = 'https://ainote-5muq.onrender.com';
+const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+
+function parseArgs(argv) {
+  const args = {
+    scope: 'mcp,read,write',
+    noBrowser: false,
+    clientName: `ainote-mcp CLI (${os.hostname()})`
+  };
+  for (const arg of argv) {
+    if (arg === '--no-browser') {
+      args.noBrowser = true;
+    } else if (arg.startsWith('--scope=')) {
+      args.scope = arg.slice('--scope='.length);
+    } else if (arg === '--scope') {
+      // next-token form is not supported in this minimal parser
+      args.scope = args.scope;
+    } else if (arg.startsWith('--client-name=')) {
+      args.clientName = arg.slice('--client-name='.length);
+    }
+  }
+  return args;
+}
+
+function drawUserCodeBox(userCode) {
+  const padded = `   ${userCode}   `;
+  const width = padded.length;
+  const top = `┌${'─'.repeat(width)}┐`;
+  const mid = `│${padded}│`;
+  const bot = `└${'─'.repeat(width)}┘`;
+  return `${top}\n${mid}\n${bot}`;
+}
+
+class Spinner {
+  constructor() {
+    this.frame = 0;
+    this.suffix = '';
+    this.timer = null;
+    this.active = false;
+  }
+
+  start(initialSuffix = '') {
+    if (this.active) return;
+    this.active = true;
+    this.suffix = initialSuffix;
+    this.timer = setInterval(() => this._render(), 100);
+    this._render();
+  }
+
+  update(suffix) {
+    this.suffix = suffix;
+  }
+
+  _render() {
+    const frame = SPINNER_FRAMES[this.frame % SPINNER_FRAMES.length];
+    this.frame += 1;
+    if (process.stderr.isTTY) {
+      process.stderr.write(`\r${frame} ${this.suffix}\x1b[K`);
+    }
+  }
+
+  stop(finalLine) {
+    if (!this.active) return;
+    this.active = false;
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+    if (process.stderr.isTTY) {
+      process.stderr.write('\r\x1b[K');
+    }
+    if (finalLine) {
+      process.stderr.write(`${finalLine}\n`);
+    }
+  }
+}
+
+async function tryOpenBrowser(uri) {
+  try {
+    const mod = await import('open');
+    const open = mod.default || mod;
+    await open(uri);
+    return true;
+  } catch (err) {
+    return false;
+  }
+}
+
+export async function run(argv = process.argv.slice(3)) {
+  const apiUrl = (process.env.AINOTE_API_URL || DEFAULT_API_URL).replace(/\/+$/, '');
+  const args = parseArgs(argv);
+  const scopes = args.scope.split(',').map((s) => s.trim()).filter(Boolean);
+
+  console.log('');
+  console.log(`  AI Note MCP — Login`);
+  console.log(`  API: ${apiUrl}`);
+  console.log('');
+
+  let device;
+  try {
+    device = await requestDeviceCode({
+      apiUrl,
+      clientName: args.clientName,
+      scopes
+    });
+  } catch (err) {
+    if (err instanceof DeviceNetworkError) {
+      console.error(`  Network error: ${err.message}`);
+    } else {
+      console.error(`  Failed to start login: ${err.message}`);
+    }
+    process.exit(1);
+    return;
+  }
+
+  console.log(`  Visit the URL below and enter the code:`);
+  console.log('');
+  console.log(drawUserCodeBox(device.user_code));
+  console.log('');
+  console.log(`  ${device.verification_uri}`);
+  if (device.verification_uri_complete && device.verification_uri_complete !== device.verification_uri) {
+    console.log(`  (direct link: ${device.verification_uri_complete})`);
+  }
+  console.log('');
+
+  if (!args.noBrowser) {
+    const target = device.verification_uri_complete || device.verification_uri;
+    const opened = await tryOpenBrowser(target);
+    if (opened) {
+      console.log('  Opening your browser…');
+    } else {
+      console.log('  (Could not open browser automatically — please open the URL above.)');
+    }
+    console.log('');
+  }
+
+  const spinner = new Spinner();
+  spinner.start(`Waiting for authorization… (0s elapsed, next poll in ${device.interval}s)`);
+
+  let cancelled = false;
+  const sigintHandler = async () => {
+    if (cancelled) return;
+    cancelled = true;
+    spinner.stop('Cancelled.');
+    await cancel({ apiUrl, deviceCode: device.device_code });
+    process.exit(1);
+  };
+  process.once('SIGINT', sigintHandler);
+
+  try {
+    const tokens = await pollForToken({
+      apiUrl,
+      deviceCode: device.device_code,
+      codeVerifier: device.code_verifier,
+      interval: device.interval,
+      expiresIn: device.expires_in,
+      onTick: ({ elapsed, interval }) => {
+        spinner.update(`Waiting for authorization… (${elapsed}s elapsed, next poll in ${interval}s)`);
+      }
+    });
+
+    spinner.stop();
+    process.removeListener('SIGINT', sigintHandler);
+
+    const expiresAt = tokens.expires_in
+      ? Date.now() + Number(tokens.expires_in) * 1000
+      : undefined;
+
+    const persisted = await setCredentials(apiUrl, {
+      mcpKey: tokens.mcp_key,
+      accessToken: tokens.access_token,
+      refreshToken: tokens.refresh_token,
+      expiresAt
+    });
+
+    const email = tokens.user?.email;
+    const locationDesc = persisted.storage === 'keychain'
+      ? 'OS keychain'
+      : persisted.storage === 'mixed'
+        ? `OS keychain + ${persisted.file}`
+        : persisted.file || _credentialsLocations().file;
+
+    console.log('');
+    if (email) {
+      console.log(`  ✓ Logged in as ${email}.`);
+    } else {
+      console.log(`  ✓ Logged in.`);
+    }
+    console.log(`  Credentials saved to ${locationDesc}.`);
+    console.log('');
+  } catch (err) {
+    spinner.stop();
+    process.removeListener('SIGINT', sigintHandler);
+
+    if (err instanceof DeviceAccessDeniedError) {
+      console.error('  Access denied. The authorization request was rejected.');
+    } else if (err instanceof DeviceExpiredError) {
+      console.error('  Code expired. Please run `ainote-mcp login` again.');
+    } else if (err instanceof DevicePkceError) {
+      console.error('  Authentication failed (PKCE mismatch). Please retry.');
+    } else if (err instanceof DeviceNetworkError) {
+      console.error(`  Network error: ${err.message}`);
+    } else {
+      console.error(`  Login failed: ${err.message}`);
+    }
+    process.exit(1);
+  }
+}