@piotr-agier/google-drive-mcp 1.7.3 → 1.7.5

package/README.md

@@ -194,7 +194,7 @@ Run the container with your credentials and tokens mounted:
 ```bash
 docker run -it \
   -v /path/to/gcp-oauth.keys.json:/config/gcp-oauth.keys.json:ro \
-  -v ~/.config/google-drive-mcp/tokens.json:/config/tokens.json \
+  -v "$HOME/.config/google-drive-mcp/tokens.json":/config/tokens.json \
   google-drive-mcp
 ```
 
@@ -206,7 +206,35 @@ docker run -it \
 
 ### Docker Configuration for Claude Desktop
 
-Add this configuration to use the Docker container with Claude Desktop:
+#### Option A: Reusable container (recommended)
+
+Uses a wrapper script that keeps a single named container running and reuses it across client restarts — faster startup and no container churn:
+
+```json
+{
+  "mcpServers": {
+    "google-drive": {
+      "command": "/path/to/google-drive-mcp/scripts/docker-mcp.sh",
+      "env": {
+        "GOOGLE_DRIVE_OAUTH_CREDENTIALS": "$HOME/gcp-oauth.keys.json",
+        "GOOGLE_DRIVE_MCP_TOKEN_PATH": "$HOME/.config/google-drive-mcp/tokens.json"
+      }
+    }
+  }
+}
+```
+
+The script will:
+- Create the container on first run
+- Reuse the existing container on subsequent runs
+- Automatically restart it if it was stopped
+
+**Note:** The container stays running in the background until explicitly stopped.
+To stop it: `docker stop google-drive-mcp`
+
+#### Option B: Fresh container each time
+
+Creates and removes a new container on every client restart:
 
 ```json
 {
@@ -240,13 +268,20 @@ Add this configuration to use the Docker container with Claude Desktop:
 
 The server supports multiple methods for providing OAuth credentials (in order of priority):
 
-#### 1. **Environment Variable** (Recommended)
+#### 1. **Environment Variable** (Highest Priority)
 ```bash
 export GOOGLE_DRIVE_OAUTH_CREDENTIALS="/path/to/your/gcp-oauth.keys.json"
 ```
 
-#### 2. **Default File Location**
-Place `gcp-oauth.keys.json` in the project root directory
+#### 2. **Config Directory** (Recommended)
+Place `gcp-oauth.keys.json` in the XDG config directory:
+```
+~/.config/google-drive-mcp/gcp-oauth.keys.json
+```
+This is the recommended location — it works reliably with `npx`, global installs, and local setups.
+
+#### 3. **Project Root** (Legacy Fallback)
+Place `gcp-oauth.keys.json` in the project root directory. This still works for local development but is unreliable with `npx` or global installs.
 
 ### OAuth Scope Configuration
 
@@ -943,15 +978,15 @@ After revoking access, you'll need to re-authenticate the next time you use the
 #### "OAuth credentials not found"
 ```
 OAuth credentials not found. Please provide credentials using one of these methods:
-1. Environment variable:
+1. Config directory (recommended):
+   Place your gcp-oauth.keys.json file in: ~/.config/google-drive-mcp/
+2. Environment variable:
    export GOOGLE_DRIVE_OAUTH_CREDENTIALS="/path/to/gcp-oauth.keys.json"
-2. Default file path:
-   Place your gcp-oauth.keys.json file in the package root directory.
 ```
 
 **Solution:**
 - Download credentials from Google Cloud Console
-- Either set the environment variable or place the file in the project root
+- Place the file in `~/.config/google-drive-mcp/gcp-oauth.keys.json` (recommended), or set the environment variable
 - Ensure the file has proper read permissions
 
 #### "Authentication failed" or Browser doesn't open
@@ -1049,7 +1084,7 @@ ls -la ~/.config/google-drive-mcp/tokens.json
 # 3. Run Docker with tokens mounted
 docker run -it \
   -v $(pwd)/gcp-oauth.keys.json:/config/gcp-oauth.keys.json:ro \
-  -v ~/.config/google-drive-mcp/tokens.json:/config/tokens.json \
+  -v "$HOME/.config/google-drive-mcp/tokens.json":/config/tokens.json \
   google-drive-mcp
 ```
 
@@ -1074,10 +1109,10 @@ The Dockerfile expects the `dist/` directory to exist from your local build.
 **Solution:** Ensure the token file is mounted with write permissions:
 ```bash
 # Correct: tokens can be updated
--v ~/.config/google-drive-mcp/tokens.json:/config/tokens.json
+-v "$HOME/.config/google-drive-mcp/tokens.json":/config/tokens.json
 
 # Wrong: read-only mount prevents token refresh
--v ~/.config/google-drive-mcp/tokens.json:/config/tokens.json:ro
+-v "$HOME/.config/google-drive-mcp/tokens.json":/config/tokens.json:ro
 ```
 
 ### Debug Mode
@@ -1156,7 +1191,8 @@ npm run typecheck # Type checking without compilation
 | Variable | Description | Example |
 |----------|-------------|---------|
 | `GOOGLE_DRIVE_OAUTH_CREDENTIALS` | Path to your OAuth credentials JSON file | `/home/user/secrets/oauth.json` |
-| *(or place file at)* | Default location: `gcp-oauth.keys.json` in project root | `./gcp-oauth.keys.json` |
+| *(or place file at)* | Config directory (recommended): `~/.config/google-drive-mcp/gcp-oauth.keys.json` | `~/.config/google-drive-mcp/gcp-oauth.keys.json` |
+| *(or place file at)* | Project root (legacy fallback): `gcp-oauth.keys.json` | `./gcp-oauth.keys.json` |
 
 **Optional** (for customization):
 | Variable | Description | Default | Example |

package/dist/index.js

@@ -29,14 +29,16 @@ function getProjectRoot() {
   const projectRoot = path.join(__dirname2, "..", "..");
   return path.resolve(projectRoot);
 }
+function getConfigDir() {
+  const configHome = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
+  return path.join(configHome, "google-drive-mcp");
+}
 function getSecureTokenPath() {
   const customTokenPath = process.env.GOOGLE_DRIVE_MCP_TOKEN_PATH;
   if (customTokenPath) {
     return path.resolve(customTokenPath);
   }
-  const configHome = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
-  const tokenDir = path.join(configHome, "google-drive-mcp");
-  return path.join(tokenDir, "tokens.json");
+  return path.join(getConfigDir(), "tokens.json");
 }
 function getLegacyTokenPath() {
   const projectRoot = getProjectRoot();
@@ -49,26 +51,29 @@ function getAdditionalLegacyPaths() {
     path.join(process.cwd(), ".gcp-saved-tokens.json")
   ].filter(Boolean);
 }
-function getKeysFilePath() {
+function getKeysFilePaths() {
+  const paths = [];
   const envCredentialsPath = process.env.GOOGLE_DRIVE_OAUTH_CREDENTIALS;
   if (envCredentialsPath) {
-    return path.resolve(envCredentialsPath);
+    paths.push(path.resolve(envCredentialsPath));
   }
+  paths.push(path.join(getConfigDir(), "gcp-oauth.keys.json"));
   const projectRoot = getProjectRoot();
-  const keysPath = path.join(projectRoot, "gcp-oauth.keys.json");
-  return keysPath;
+  paths.push(path.join(projectRoot, "gcp-oauth.keys.json"));
+  return paths;
 }
 function generateCredentialsErrorMessage() {
+  const configDir = getConfigDir();
   return `
 OAuth credentials not found. Please provide credentials using one of these methods:
 
-1. Environment variable:
+1. Config directory (recommended):
+   Place your gcp-oauth.keys.json file in: ${configDir}/
+
+2. Environment variable:
    Set GOOGLE_DRIVE_OAUTH_CREDENTIALS to the path of your credentials file:
    export GOOGLE_DRIVE_OAUTH_CREDENTIALS="/path/to/gcp-oauth.keys.json"
 
-2. Default file path:
-   Place your gcp-oauth.keys.json file in the package root directory.
-
 Token storage:
 - Tokens are saved to: ${getSecureTokenPath()}
 - To use a custom token location, set GOOGLE_DRIVE_MCP_TOKEN_PATH environment variable
@@ -83,9 +88,7 @@ To get OAuth credentials:
 }
 
 // src/auth/client.ts
-async function loadCredentialsFromFile() {
-  const keysContent = await fs.readFile(getKeysFilePath(), "utf-8");
-  const keys = JSON.parse(keysContent);
+function parseCredentialsFile(keys) {
   if (keys.installed) {
     const { client_id, client_secret, redirect_uris } = keys.installed;
     return { client_id, client_secret, redirect_uris };
@@ -102,6 +105,21 @@ async function loadCredentialsFromFile() {
     throw new Error('Invalid credentials file format. Expected either "installed", "web" object or direct client_id field.');
   }
 }
+async function loadCredentialsFromFile() {
+  const paths = getKeysFilePaths();
+  for (const keysPath of paths) {
+    try {
+      const keysContent = await fs.readFile(keysPath, "utf-8");
+      const keys = JSON.parse(keysContent);
+      return parseCredentialsFile(keys);
+    } catch (err) {
+      if (err instanceof SyntaxError || err instanceof Error && err.message.includes("Invalid credentials")) {
+        throw new Error(`Invalid credentials file at ${keysPath}: ${err.message}`);
+      }
+    }
+  }
+  throw new Error(`Credentials file not found. Searched: ${paths.join(", ")}`);
+}
 async function loadCredentialsWithFallback() {
   try {
     return await loadCredentialsFromFile();