gmcp 0.2.1 → 0.3.0

package/README.md

@@ -10,7 +10,6 @@
 <p align="center">
 <a href="https://www.npmjs.com/package/gmcp" rel="nofollow"><img src="https://img.shields.io/npm/v/gmcp.svg" alt="npm"></a>
 <a href="https://hub.docker.com/r/johnie/gmcp" rel="nofollow"><img src="https://img.shields.io/docker/pulls/johnie/gmcp" alt="Docker Pulls"></a>
-<a href="https://opensource.org/licenses/MIT" rel="nofollow"><img src="https://img.shields.io/github/license/johnie/gmcp" alt="License"></a>
 <a href="https://github.com/johnie/gmcp" rel="nofollow"><img src="https://img.shields.io/github/stars/johnie/gmcp" alt="stars"></a>
 </p>
 
@@ -61,10 +60,10 @@ bun install
 
 ```bash
 # If installed globally
-gmcp-auth
+gmcp auth
 
 # Or with npx
-npx gmcp-auth
+npx gmcp auth
 
 # Or from source
 bun run auth
@@ -76,10 +75,11 @@ Follow the prompts to authorize. The browser will show "connection refused" afte
 
 ```bash
 # Globally installed
-gmcp
+gmcp start
+# or just: gmcp
 
 # With npx
-npx gmcp
+npx gmcp start
 
 # From source
 bun run start
@@ -135,7 +135,7 @@ Add to `~/Library/Application Support/Claude/claude_desktop_config.json`:
   "mcpServers": {
     "gmcp": {
       "command": "bun",
-      "args": ["run", "/path/to/gmcp/src/index.ts"],
+      "args": ["run", "/path/to/gmcp/src/cli.ts"],
       "env": {
         "GOOGLE_CREDENTIALS_PATH": "/path/to/credentials.json",
         "GOOGLE_TOKEN_PATH": "/path/to/token.json",
@@ -210,6 +210,20 @@ GOOGLE_SCOPES=gmail.readonly,calendar.readonly
 GOOGLE_SCOPES=gmail.readonly,gmail.modify,gmail.send,calendar.events
 ```
 
+## CLI Reference
+
+```
+gmcp [command]
+
+Commands:
+  start    Start MCP server (default)
+  auth     Run OAuth2 authentication flow
+
+Options:
+  --help, -h       Show usage
+  --version, -v    Show version
+```
+
 ## Testing
 
 ```bash

package/dist/auth-cli.js

@@ -10,19 +10,8 @@ import {
 import"./shared/chunk-3s189drz.js";
 
 // src/auth-cli.ts
-import { createInterface } from "node:readline";
-function readLine() {
-  const rl = createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  return new Promise((resolve) => {
-    rl.on("line", (line) => {
-      rl.close();
-      resolve(line.trim());
-    });
-  });
-}
+import { input } from "@inquirer/prompts";
+import kleur from "kleur";
 async function runAuth() {
   console.log(`GMCP Server - OAuth2 Authentication
 `);
@@ -39,7 +28,7 @@ async function runAuth() {
 ========================================`);
   console.log("STEP 1: Visit this URL to authorize:");
   console.log("========================================");
-  console.log("\x1B[36m%s\x1B[0m", authUrl);
+  console.log(kleur.cyan(authUrl));
   console.log(`
 ========================================`);
   console.log("STEP 2: After authorizing:");
@@ -54,24 +43,30 @@ Copy the entire code after "code=" (the long string before "&scope")`);
   console.log(`
 ========================================`);
   console.log("STEP 3: Paste the authorization code below:");
-  console.log("========================================");
-  const code = await readLine();
-  if (!code) {
-    console.error("Error: No authorization code provided");
-    process.exit(1);
-  }
+  console.log(`========================================
+`);
+  const code = await input({
+    message: "Authorization code:",
+    required: true,
+    validate: (value) => {
+      if (value.length < 10) {
+        return "Authorization code appears too short";
+      }
+      return true;
+    }
+  });
   console.log(`
 Exchanging authorization code for tokens...`);
   try {
     const tokens = await getTokensFromCode(oauth2Client, code);
     await saveTokens(tokenPath, tokens);
-    console.log("\x1B[32m%s\x1B[0m", `
-Success! Tokens saved to`, tokenPath);
+    console.log(kleur.green(`
+Success! Tokens saved to ${tokenPath}`));
     console.log(`
 You can now run the MCP server with: npx gmcp`);
   } catch (error) {
-    console.error("\x1B[31m%s\x1B[0m", `
-Error exchanging code for tokens:`);
+    console.error(kleur.red(`
+Error exchanging code for tokens:`));
     console.error(error);
     process.exit(1);
   }

package/dist/cli.js

@@ -7,56 +7,51 @@ import {
 } from "./shared/chunk-3s189drz.js";
 
 // src/cli.ts
-var USAGE = `
-Usage: gmcp [command]
+import { run } from "@stricli/core";
 
-Commands:
-  start    Start the MCP server (default)
-  auth     Run OAuth2 authentication flow
+// src/cli/app.ts
+import { buildApplication, buildRouteMap } from "@stricli/core";
 
-Options:
-  --help, -h       Show this help message
-  --version, -v    Show version number
+// src/cli/commands/auth.ts
+import { buildCommand } from "@stricli/core";
+var authCommand = buildCommand({
+  func: async () => {
+    const { runAuth } = await import("./auth-cli.js");
+    await runAuth();
+  },
+  parameters: {},
+  docs: { brief: "Run OAuth2 authentication flow" }
+});
 
-Examples:
-  npx gmcp         Start the MCP server
-  npx gmcp start   Start the MCP server
-  npx gmcp auth    Run OAuth2 authentication
-`.trim();
-function showHelp() {
-  console.log(USAGE);
-}
-async function showVersion() {
-  const version = await getVersion();
-  console.log(`gmcp v${version}`);
-}
-async function main() {
-  const args = process.argv.slice(2);
-  const command = args[0];
-  if (command === "--help" || command === "-h") {
-    showHelp();
-    return;
-  }
-  if (command === "--version" || command === "-v") {
-    await showVersion();
-    return;
-  }
-  if (!command || command === "start") {
+// src/cli/commands/start.ts
+import { buildCommand as buildCommand2 } from "@stricli/core";
+var startCommand = buildCommand2({
+  func: async () => {
     const { startServer } = await import("./index.js");
     await startServer();
-    return;
-  }
-  if (command === "auth") {
-    const { runAuth } = await import("./auth-cli.js");
-    await runAuth();
-    return;
-  }
-  console.error(`Unknown command: ${command}
-`);
-  showHelp();
-  process.exit(1);
-}
-main().catch((error) => {
-  console.error("Fatal error:", error);
-  process.exit(1);
+  },
+  parameters: {},
+  docs: { brief: "Start the MCP server" }
+});
+
+// src/cli/app.ts
+var routes = buildRouteMap({
+  routes: {
+    start: startCommand,
+    auth: authCommand
+  },
+  docs: { brief: "GMCP - Gmail and Calendar MCP Server" }
 });
+async function createApp() {
+  const version = await getVersion();
+  return buildApplication(routes, {
+    name: "gmcp",
+    versionInfo: { currentVersion: version }
+  });
+}
+
+// src/cli.ts
+var app = await createApp();
+var args = process.argv.slice(2);
+var effectiveArgs = args.length === 0 ? ["start"] : args;
+await run(app, effectiveArgs, { process });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gmcp",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "GMCP Server for Google Workspace with OAuth2 authentication",
   "module": "src/index.ts",
   "main": "dist/index.js",
@@ -44,9 +44,12 @@
     "anthropic"
   ],
   "dependencies": {
+    "@inquirer/prompts": "^8.2.0",
     "@modelcontextprotocol/sdk": "^1.25.3",
+    "@stricli/core": "^1.2.5",
     "googleapis": "^170.1.0",
     "json2md": "^2.0.3",
+    "kleur": "^4.1.5",
     "pino": "^9.7.0",
     "pino-pretty": "^13.0.0",
     "zod": "^4.3.6"