dropbox-mcp-server 2.1.0 → 2.2.0

package/dist/index.js

@@ -84,41 +84,143 @@ function isNotFoundError(err) {
         return false;
     }
 }
+function isPermissionError(err) {
+    return err?.status === 403;
+}
+function isBadRequestError(err) {
+    return err?.status === 400;
+}
 // ------------------------------------------------------------------
-// 3. MCP Server Initialization
+// 3. Environment & Client
 // ------------------------------------------------------------------
 const DROPBOX_APP_KEY = process.env.DROPBOX_APP_KEY;
 const DROPBOX_REFRESH_TOKEN = process.env.DROPBOX_REFRESH_TOKEN;
-const DROPBOX_SHARED_URL = process.env.DROPBOX_SHARED_URL;
+const DROPBOX_SHARED_URL = process.env.DROPBOX_SHARED_URL; // optional
 if (!DROPBOX_APP_KEY || !DROPBOX_REFRESH_TOKEN) {
-    console.error("Missing DROPBOX_APP_KEY or DROPBOX_REFRESH_TOKEN environment variables.");
+    console.error("Missing required environment variables:");
+    console.error("  - DROPBOX_APP_KEY");
+    console.error("  - DROPBOX_REFRESH_TOKEN");
+    console.error("Note: DROPBOX_SHARED_URL is optional.");
     process.exit(1);
 }
 const rawClient = new Dropbox({
     clientId: DROPBOX_APP_KEY,
-    refreshToken: DROPBOX_REFRESH_TOKEN
+    refreshToken: DROPBOX_REFRESH_TOKEN,
 });
 const client = throttleClient(rawClient);
-const server = new Server({ name: "dropbox-agent-mcp", version: "2.1.0" }, { capabilities: { tools: {} } });
+const server = new Server({ name: "dropbox-agent-mcp", version: "2.0.0" }, { capabilities: { tools: {} } });
+// ------------------------------------------------------------------
+// 4. Helpers
+// ------------------------------------------------------------------
+/** Normalise a path for use with a shared link: strip leading "/" and handle root. */
+function normalizeSharedPath(path) {
+    if (!path || path === "/")
+        return "";
+    return path.replace(/^\/+/, "");
+}
+/** Check if a filename likely belongs to a text file. */
+function isTextFile(pathOrName) {
+    const fileName = pathOrName.split('/').pop() || '';
+    const ext = fileName.split('.').pop()?.toLowerCase() || '';
+    const textExtensions = [
+        'csv', 'tsv', 'txt', 'json', 'md', 'log',
+        'xml', 'yaml', 'yml', 'html', 'htm', 'css',
+        'js', 'ts', 'py', 'java', 'c', 'cpp', 'h'
+    ];
+    return textExtensions.includes(ext);
+}
+/**
+ * Download a file from Dropbox.
+ * - If DROPBOX_SHARED_URL is set, uses shared link APIs with relative paths.
+ * - Otherwise, uses the regular filesDownload with absolute paths.
+ * Returns UTF‑8 text, or throws if binary.
+ */
+async function downloadHelper(identifier) {
+    let result;
+    let fileName;
+    // If the identifier is a full URL, we always treat it as a shared link.
+    if (identifier.startsWith("http://") || identifier.startsWith("https://")) {
+        const response = await client.sharingGetSharedLinkFile({ url: identifier });
+        result = response.result;
+        fileName = result.name || identifier.split('/').pop();
+    }
+    // Otherwise, decide based on DROPBOX_SHARED_URL.
+    else if (DROPBOX_SHARED_URL) {
+        // Shared link mode – identifier is a relative path.
+        const path = normalizeSharedPath(identifier);
+        const response = await client.sharingGetSharedLinkFile({
+            url: DROPBOX_SHARED_URL,
+            path: path,
+        });
+        result = response.result;
+        fileName = result.name || identifier;
+    }
+    else {
+        // Regular mode – identifier is an absolute path.
+        const response = await client.filesDownload({ path: identifier });
+        result = response.result;
+        fileName = result.name || identifier;
+    }
+    if (!result.fileBinary) {
+        throw new Error("Download succeeded but no file content was returned.");
+    }
+    const fileRef = fileName || identifier;
+    if (!isTextFile(fileRef)) {
+        throw new Error(`File "${fileRef}" appears to be a binary file. ` +
+            `This tool only supports text‑based files (CSV, JSON, TXT, etc.).`);
+    }
+    return Buffer.from(result.fileBinary).toString('utf-8');
+}
+/**
+ * Parse a CSV header line, handling quoted fields and trimming.
+ * Returns an array of clean column names.
+ */
+function parseCsvHeader(headerLine) {
+    const fields = [];
+    let current = '';
+    let insideQuotes = false;
+    for (let i = 0; i < headerLine.length; i++) {
+        const ch = headerLine[i];
+        if (ch === '"') {
+            insideQuotes = !insideQuotes;
+            continue;
+        }
+        if (ch === ',' && !insideQuotes) {
+            fields.push(current.trim());
+            current = '';
+            continue;
+        }
+        current += ch;
+    }
+    fields.push(current.trim());
+    return fields.map(f => f.replace(/^"|"$/g, '').trim());
+}
 // ------------------------------------------------------------------
-// 4. Tool Schemas
+// 5. Tool Definitions
 // ------------------------------------------------------------------
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
     tools: [
         {
             name: "list_folder",
-            description: "List folders and files in a specific Dropbox path.",
+            description: DROPBOX_SHARED_URL
+                ? "List folders and files inside the shared Dropbox folder. Path must be relative to the shared root (e.g., '' for root, 'Data' for /Data)."
+                : "List folders and files in a specific Dropbox path (absolute, e.g., '/Data' or '' for root).",
             inputSchema: {
                 type: "object",
                 properties: {
-                    path: { type: "string", description: "Path to list, e.g., '' for root or '/Data'" }
+                    path: {
+                        type: "string",
+                        description: DROPBOX_SHARED_URL
+                            ? "Relative path inside the shared folder (e.g., '' or 'Data')."
+                            : "Absolute path to list (e.g., '' for root or '/Data')."
+                    }
                 },
                 required: ["path"]
             }
         },
         {
             name: "search_files",
-            description: "Search for files by name, extension, or content across the Dropbox account.",
+            description: "Search for files by name, extension, or content across the entire Dropbox account.",
             inputSchema: {
                 type: "object",
                 properties: {
@@ -129,33 +231,47 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
         },
         {
             name: "get_file_metadata",
-            description: "Retrieve metadata (size, modified date) for a file to check constraints before downloading.",
+            description: DROPBOX_SHARED_URL
+                ? "Retrieve metadata (size, modified date) for a file inside the shared folder. Path is relative to the shared root."
+                : "Retrieve metadata (size, modified date) for a file at an absolute Dropbox path.",
             inputSchema: {
                 type: "object",
                 properties: {
-                    path: { type: "string", description: "Exact Dropbox file path" }
+                    path: {
+                        type: "string", description: DROPBOX_SHARED_URL
+                            ? "Relative path to the file inside the shared folder."
+                            : "Exact Dropbox file path (e.g., '/Data/file.csv')."
+                    }
                 },
                 required: ["path"]
             }
         },
         {
             name: "describe_table",
-            description: "Display the schema (columns/headers) of a tabular file (CSV).",
+            description: "Display the schema (columns/headers) of a CSV or TSV file.",
             inputSchema: {
                 type: "object",
                 properties: {
-                    identifier: { type: "string", description: "Dropbox path or shared link to the table" }
+                    identifier: {
+                        type: "string", description: DROPBOX_SHARED_URL
+                            ? "Relative path to the table file (e.g., 'data.csv') or a shared link URL."
+                            : "Dropbox path (e.g., '/Data/file.csv') or shared link URL."
+                    }
                 },
                 required: ["identifier"]
             }
         },
         {
             name: "read_data",
-            description: "Download and read data from a file or table. Automatically handles paths and shared links.",
+            description: "Download and read the content of a text file (CSV, JSON, TXT, etc.).",
             inputSchema: {
                 type: "object",
                 properties: {
-                    identifier: { type: "string", description: "The Dropbox path (e.g., /data.csv) or shared link URL." }
+                    identifier: {
+                        type: "string", description: DROPBOX_SHARED_URL
+                            ? "Relative path (e.g., 'data.csv') or a shared link URL."
+                            : "Dropbox path (e.g., '/Data/file.csv') or shared link URL."
+                    }
                 },
                 required: ["identifier"]
             }
@@ -163,83 +279,137 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
     ]
 }));
 // ------------------------------------------------------------------
-// 5. Tool Execution Logic
+// 6. Tool Handlers
 // ------------------------------------------------------------------
-async function downloadHelper(identifier) {
-    let result;
-    if (identifier.startsWith("http://") || identifier.startsWith("https://")) {
-        const response = await client.sharingGetSharedLinkFile({ url: identifier });
-        result = response.result;
-    }
-    else if (DROPBOX_SHARED_URL) {
-        const response = await client.sharingGetSharedLinkFile({ url: DROPBOX_SHARED_URL, path: identifier });
-        result = response.result;
-    }
-    else {
-        const response = await client.filesDownload({ path: identifier });
-        result = response.result;
-    }
-    if (!result.fileBinary)
-        throw new Error("Download succeeded but no file content was returned.");
-    return Buffer.from(result.fileBinary).toString('utf-8');
-}
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
     try {
         const name = request.params.name;
         const args = request.params.arguments || {};
+        // --- list_folder ---
         if (name === "list_folder") {
-            const path = args.path === "/" ? "" : args.path;
-            const requestArgs = { path };
+            let path = args.path || "";
+            let requestArgs;
             if (DROPBOX_SHARED_URL) {
-                requestArgs.shared_link = { url: DROPBOX_SHARED_URL };
+                path = normalizeSharedPath(path);
+                requestArgs = {
+                    path: path,
+                    shared_link: { url: DROPBOX_SHARED_URL }
+                };
+            }
+            else {
+                // Absolute path: if "/" then empty string for root
+                requestArgs = { path: path === "/" ? "" : path };
             }
             const response = await client.filesListFolder(requestArgs);
-            const entries = response.result.entries.map(e => `[${e['.tag'].toUpperCase()}] ${e.name} (Path: ${e.path_display})`);
-            return { content: [{ type: "text", text: entries.join("\n") || "Folder is empty." }] };
+            const entries = response.result.entries.map((e) => `[${e['.tag'].toUpperCase()}] ${e.name} (Path: ${e.path_display})`);
+            return {
+                content: [{ type: "text", text: entries.join("\n") || "Folder is empty." }]
+            };
         }
+        // --- search_files ---
         if (name === "search_files") {
             const response = await client.filesSearchV2({ query: args.query });
-            const matches = response.result.matches.map(m => {
+            const matches = response.result.matches.map((m) => {
                 const meta = m.metadata.metadata;
                 return `[${meta['.tag'].toUpperCase()}] ${meta.name} (Path: ${meta.path_display})`;
             });
-            return { content: [{ type: "text", text: matches.join("\n") || "No matches found." }] };
+            return {
+                content: [{ type: "text", text: matches.join("\n") || "No matches found." }]
+            };
         }
+        // --- get_file_metadata ---
         if (name === "get_file_metadata") {
             let response;
+            const rawPath = args.path || "";
             if (DROPBOX_SHARED_URL) {
-                response = await client.sharingGetSharedLinkMetadata({ url: DROPBOX_SHARED_URL, path: args.path });
+                const path = normalizeSharedPath(rawPath);
+                response = await client.sharingGetSharedLinkMetadata({
+                    url: DROPBOX_SHARED_URL,
+                    path: path
+                });
             }
             else {
-                response = await client.filesGetMetadata({ path: args.path });
+                response = await client.filesGetMetadata({ path: rawPath });
             }
-            return { content: [{ type: "text", text: JSON.stringify(response.result, null, 2) }] };
+            return {
+                content: [{ type: "text", text: JSON.stringify(response.result, null, 2) }]
+            };
         }
+        // --- read_data ---
         if (name === "read_data") {
             try {
                 const text = await downloadHelper(args.identifier);
-                return { content: [{ type: "text", text: text.substring(0, 100000) }] };
+                const truncated = text.length > 100000
+                    ? text.substring(0, 100000) + "\n... (truncated)"
+                    : text;
+                return { content: [{ type: "text", text: truncated }] };
             }
             catch (err) {
                 if (isNotFoundError(err)) {
-                    return { content: [{ type: "text", text: `Error: File not found at ${args.identifier}` }] };
+                    return {
+                        content: [{ type: "text", text: `File not found at "${args.identifier}".` }],
+                        isError: true
+                    };
+                }
+                if (isPermissionError(err)) {
+                    return {
+                        content: [{ type: "text", text: `Permission denied for "${args.identifier}".` }],
+                        isError: true
+                    };
+                }
+                if (isBadRequestError(err)) {
+                    return {
+                        content: [{ type: "text", text: `Invalid request. Check the path/identifier: "${args.identifier}".` }],
+                        isError: true
+                    };
+                }
+                if (err.message && err.message.includes("binary file")) {
+                    return { content: [{ type: "text", text: err.message }], isError: true };
                 }
                 throw err;
             }
         }
+        // --- describe_table ---
         if (name === "describe_table") {
             try {
                 const text = await downloadHelper(args.identifier);
                 const lines = text.split(/\r?\n/).filter(line => line.trim().length > 0);
-                if (lines.length === 0)
+                if (lines.length === 0) {
                     return { content: [{ type: "text", text: "File is empty." }] };
-                const headers = lines[0].split(',').map(h => h.trim());
-                const schemaStr = `Columns detected:\n- ${headers.join('\n- ')}\n\nTotal rows: ${lines.length - 1}`;
+                }
+                let headers;
+                let totalRows = lines.length - 1;
+                const firstLine = lines[0];
+                const commaCount = (firstLine.match(/,/g) || []).length;
+                if (commaCount > 0) {
+                    headers = parseCsvHeader(firstLine);
+                    if (headers.length < 2) {
+                        headers = lines.map((_, i) => `Column ${i + 1}`);
+                        totalRows = lines.length;
+                    }
+                }
+                else {
+                    headers = lines.map((_, i) => `Column ${i + 1}`);
+                    totalRows = lines.length;
+                }
+                const schemaStr = `Columns detected:\n- ${headers.join('\n- ')}\n\nTotal rows: ${totalRows}`;
                 return { content: [{ type: "text", text: schemaStr }] };
             }
             catch (err) {
                 if (isNotFoundError(err)) {
-                    return { content: [{ type: "text", text: `Error: File not found at ${args.identifier}` }] };
+                    return {
+                        content: [{ type: "text", text: `File not found at "${args.identifier}".` }],
+                        isError: true
+                    };
+                }
+                if (isPermissionError(err)) {
+                    return {
+                        content: [{ type: "text", text: `Permission denied for "${args.identifier}".` }],
+                        isError: true
+                    };
+                }
+                if (err.message && err.message.includes("binary file")) {
+                    return { content: [{ type: "text", text: err.message }], isError: true };
                 }
                 throw err;
             }
@@ -254,11 +424,11 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     }
 });
 // ------------------------------------------------------------------
-// 6. Execution
+// 7. Start the Server
 // ------------------------------------------------------------------
 async function run() {
     const transport = new StdioServerTransport();
     await server.connect(transport);
-    console.error("Dropbox MCP Server running on stdio");
+    console.error(`Dropbox MCP Server running on stdio ${DROPBOX_SHARED_URL ? '(shared link mode)' : '(full account mode)'}`);
 }
 run().catch(console.error);

package/index.ts

@@ -87,48 +87,161 @@ function isNotFoundError(err: any): boolean {
     }
 }
 
+function isPermissionError(err: any): boolean {
+    return err?.status === 403;
+}
+
+function isBadRequestError(err: any): boolean {
+    return err?.status === 400;
+}
+
 // ------------------------------------------------------------------
-// 3. MCP Server Initialization
+// 3. Environment & Client
 // ------------------------------------------------------------------
 const DROPBOX_APP_KEY = process.env.DROPBOX_APP_KEY;
 const DROPBOX_REFRESH_TOKEN = process.env.DROPBOX_REFRESH_TOKEN;
-const DROPBOX_SHARED_URL = process.env.DROPBOX_SHARED_URL;
+const DROPBOX_SHARED_URL = process.env.DROPBOX_SHARED_URL; // optional
 
 if (!DROPBOX_APP_KEY || !DROPBOX_REFRESH_TOKEN) {
-    console.error("Missing DROPBOX_APP_KEY or DROPBOX_REFRESH_TOKEN environment variables.");
+    console.error("Missing required environment variables:");
+    console.error("  - DROPBOX_APP_KEY");
+    console.error("  - DROPBOX_REFRESH_TOKEN");
+    console.error("Note: DROPBOX_SHARED_URL is optional.");
     process.exit(1);
 }
 
 const rawClient = new Dropbox({
     clientId: DROPBOX_APP_KEY,
-    refreshToken: DROPBOX_REFRESH_TOKEN
+    refreshToken: DROPBOX_REFRESH_TOKEN,
 });
 const client = throttleClient(rawClient);
 
 const server = new Server(
-    { name: "dropbox-agent-mcp", version: "2.1.0" },
+    { name: "dropbox-agent-mcp", version: "2.0.0" },
     { capabilities: { tools: {} } }
 );
 
 // ------------------------------------------------------------------
-// 4. Tool Schemas
+// 4. Helpers
+// ------------------------------------------------------------------
+
+/** Normalise a path for use with a shared link: strip leading "/" and handle root. */
+function normalizeSharedPath(path: string): string {
+    if (!path || path === "/") return "";
+    return path.replace(/^\/+/, "");
+}
+
+/** Check if a filename likely belongs to a text file. */
+function isTextFile(pathOrName: string): boolean {
+    const fileName = pathOrName.split('/').pop() || '';
+    const ext = fileName.split('.').pop()?.toLowerCase() || '';
+    const textExtensions = [
+        'csv', 'tsv', 'txt', 'json', 'md', 'log',
+        'xml', 'yaml', 'yml', 'html', 'htm', 'css',
+        'js', 'ts', 'py', 'java', 'c', 'cpp', 'h'
+    ];
+    return textExtensions.includes(ext);
+}
+
+/**
+ * Download a file from Dropbox.
+ * - If DROPBOX_SHARED_URL is set, uses shared link APIs with relative paths.
+ * - Otherwise, uses the regular filesDownload with absolute paths.
+ * Returns UTF‑8 text, or throws if binary.
+ */
+async function downloadHelper(identifier: string): Promise<string> {
+    let result: any;
+    let fileName: string | undefined;
+
+    // If the identifier is a full URL, we always treat it as a shared link.
+    if (identifier.startsWith("http://") || identifier.startsWith("https://")) {
+        const response = await client.sharingGetSharedLinkFile({ url: identifier });
+        result = response.result;
+        fileName = result.name || identifier.split('/').pop();
+    }
+    // Otherwise, decide based on DROPBOX_SHARED_URL.
+    else if (DROPBOX_SHARED_URL) {
+        // Shared link mode – identifier is a relative path.
+        const path = normalizeSharedPath(identifier);
+        const response = await client.sharingGetSharedLinkFile({
+            url: DROPBOX_SHARED_URL,
+            path: path,
+        });
+        result = response.result;
+        fileName = result.name || identifier;
+    } else {
+        // Regular mode – identifier is an absolute path.
+        const response = await client.filesDownload({ path: identifier });
+        result = response.result;
+        fileName = result.name || identifier;
+    }
+
+    if (!result.fileBinary) {
+        throw new Error("Download succeeded but no file content was returned.");
+    }
+
+    const fileRef = fileName || identifier;
+    if (!isTextFile(fileRef)) {
+        throw new Error(
+            `File "${fileRef}" appears to be a binary file. ` +
+            `This tool only supports text‑based files (CSV, JSON, TXT, etc.).`
+        );
+    }
+
+    return Buffer.from(result.fileBinary).toString('utf-8');
+}
+
+/**
+ * Parse a CSV header line, handling quoted fields and trimming.
+ * Returns an array of clean column names.
+ */
+function parseCsvHeader(headerLine: string): string[] {
+    const fields: string[] = [];
+    let current = '';
+    let insideQuotes = false;
+    for (let i = 0; i < headerLine.length; i++) {
+        const ch = headerLine[i];
+        if (ch === '"') {
+            insideQuotes = !insideQuotes;
+            continue;
+        }
+        if (ch === ',' && !insideQuotes) {
+            fields.push(current.trim());
+            current = '';
+            continue;
+        }
+        current += ch;
+    }
+    fields.push(current.trim());
+    return fields.map(f => f.replace(/^"|"$/g, '').trim());
+}
+
+// ------------------------------------------------------------------
+// 5. Tool Definitions
 // ------------------------------------------------------------------
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
     tools: [
         {
             name: "list_folder",
-            description: "List folders and files in a specific Dropbox path.",
+            description: DROPBOX_SHARED_URL
+                ? "List folders and files inside the shared Dropbox folder. Path must be relative to the shared root (e.g., '' for root, 'Data' for /Data)."
+                : "List folders and files in a specific Dropbox path (absolute, e.g., '/Data' or '' for root).",
             inputSchema: {
                 type: "object",
                 properties: {
-                    path: { type: "string", description: "Path to list, e.g., '' for root or '/Data'" }
+                    path: {
+                        type: "string",
+                        description: DROPBOX_SHARED_URL
+                            ? "Relative path inside the shared folder (e.g., '' or 'Data')."
+                            : "Absolute path to list (e.g., '' for root or '/Data')."
+                    }
                 },
                 required: ["path"]
             }
         },
         {
             name: "search_files",
-            description: "Search for files by name, extension, or content across the Dropbox account.",
+            description: "Search for files by name, extension, or content across the entire Dropbox account.",
             inputSchema: {
                 type: "object",
                 properties: {
@@ -139,33 +252,47 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
         },
         {
             name: "get_file_metadata",
-            description: "Retrieve metadata (size, modified date) for a file to check constraints before downloading.",
+            description: DROPBOX_SHARED_URL
+                ? "Retrieve metadata (size, modified date) for a file inside the shared folder. Path is relative to the shared root."
+                : "Retrieve metadata (size, modified date) for a file at an absolute Dropbox path.",
             inputSchema: {
                 type: "object",
                 properties: {
-                    path: { type: "string", description: "Exact Dropbox file path" }
+                    path: {
+                        type: "string", description: DROPBOX_SHARED_URL
+                            ? "Relative path to the file inside the shared folder."
+                            : "Exact Dropbox file path (e.g., '/Data/file.csv')."
+                    }
                 },
                 required: ["path"]
             }
         },
         {
             name: "describe_table",
-            description: "Display the schema (columns/headers) of a tabular file (CSV).",
+            description: "Display the schema (columns/headers) of a CSV or TSV file.",
             inputSchema: {
                 type: "object",
                 properties: {
-                    identifier: { type: "string", description: "Dropbox path or shared link to the table" }
+                    identifier: {
+                        type: "string", description: DROPBOX_SHARED_URL
+                            ? "Relative path to the table file (e.g., 'data.csv') or a shared link URL."
+                            : "Dropbox path (e.g., '/Data/file.csv') or shared link URL."
+                    }
                 },
                 required: ["identifier"]
             }
         },
         {
             name: "read_data",
-            description: "Download and read data from a file or table. Automatically handles paths and shared links.",
+            description: "Download and read the content of a text file (CSV, JSON, TXT, etc.).",
             inputSchema: {
                 type: "object",
                 properties: {
-                    identifier: { type: "string", description: "The Dropbox path (e.g., /data.csv) or shared link URL." }
+                    identifier: {
+                        type: "string", description: DROPBOX_SHARED_URL
+                            ? "Relative path (e.g., 'data.csv') or a shared link URL."
+                            : "Dropbox path (e.g., '/Data/file.csv') or shared link URL."
+                    }
                 },
                 required: ["identifier"]
             }
@@ -174,85 +301,147 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
 }));
 
 // ------------------------------------------------------------------
-// 5. Tool Execution Logic
+// 6. Tool Handlers
 // ------------------------------------------------------------------
-async function downloadHelper(identifier: string) {
-    let result: any;
-    if (identifier.startsWith("http://") || identifier.startsWith("https://")) {
-        const response = await client.sharingGetSharedLinkFile({ url: identifier });
-        result = response.result;
-    } else if (DROPBOX_SHARED_URL) {
-        const response = await client.sharingGetSharedLinkFile({ url: DROPBOX_SHARED_URL, path: identifier });
-        result = response.result;
-    } else {
-        const response = await client.filesDownload({ path: identifier });
-        result = response.result;
-    }
-
-    if (!result.fileBinary) throw new Error("Download succeeded but no file content was returned.");
-    return Buffer.from(result.fileBinary).toString('utf-8');
-}
-
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
     try {
         const name = request.params.name;
         const args = request.params.arguments || {};
 
+        // --- list_folder ---
         if (name === "list_folder") {
-            const path = (args.path as string) === "/" ? "" : (args.path as string);
-            const requestArgs: any = { path };
+            let path = (args.path as string) || "";
+            let requestArgs: any;
+
             if (DROPBOX_SHARED_URL) {
-                requestArgs.shared_link = { url: DROPBOX_SHARED_URL };
+                path = normalizeSharedPath(path);
+                requestArgs = {
+                    path: path,
+                    shared_link: { url: DROPBOX_SHARED_URL }
+                };
+            } else {
+                // Absolute path: if "/" then empty string for root
+                requestArgs = { path: path === "/" ? "" : path };
             }
 
             const response = await client.filesListFolder(requestArgs);
-            const entries = response.result.entries.map(e => `[${e['.tag'].toUpperCase()}] ${e.name} (Path: ${e.path_display})`);
-            return { content: [{ type: "text", text: entries.join("\n") || "Folder is empty." }] };
+            const entries = response.result.entries.map((e: any) =>
+                `[${e['.tag'].toUpperCase()}] ${e.name} (Path: ${e.path_display})`
+            );
+            return {
+                content: [{ type: "text", text: entries.join("\n") || "Folder is empty." }]
+            };
         }
 
+        // --- search_files ---
         if (name === "search_files") {
             const response = await client.filesSearchV2({ query: args.query as string });
-            const matches = response.result.matches.map(m => {
+            const matches = response.result.matches.map((m: any) => {
                 const meta = (m.metadata as any).metadata;
                 return `[${meta['.tag'].toUpperCase()}] ${meta.name} (Path: ${meta.path_display})`;
             });
-            return { content: [{ type: "text", text: matches.join("\n") || "No matches found." }] };
+            return {
+                content: [{ type: "text", text: matches.join("\n") || "No matches found." }]
+            };
         }
 
+        // --- get_file_metadata ---
         if (name === "get_file_metadata") {
             let response;
+            const rawPath = (args.path as string) || "";
+
             if (DROPBOX_SHARED_URL) {
-                response = await client.sharingGetSharedLinkMetadata({ url: DROPBOX_SHARED_URL, path: args.path as string });
+                const path = normalizeSharedPath(rawPath);
+                response = await client.sharingGetSharedLinkMetadata({
+                    url: DROPBOX_SHARED_URL,
+                    path: path
+                });
             } else {
-                response = await client.filesGetMetadata({ path: args.path as string });
+                response = await client.filesGetMetadata({ path: rawPath });
             }
-            return { content: [{ type: "text", text: JSON.stringify(response.result, null, 2) }] };
+
+            return {
+                content: [{ type: "text", text: JSON.stringify(response.result, null, 2) }]
+            };
         }
 
+        // --- read_data ---
         if (name === "read_data") {
             try {
                 const text = await downloadHelper(args.identifier as string);
-                return { content: [{ type: "text", text: text.substring(0, 100000) }] };
+                const truncated = text.length > 100000
+                    ? text.substring(0, 100000) + "\n... (truncated)"
+                    : text;
+                return { content: [{ type: "text", text: truncated }] };
             } catch (err: any) {
                 if (isNotFoundError(err)) {
-                    return { content: [{ type: "text", text: `Error: File not found at ${args.identifier}` }] };
+                    return {
+                        content: [{ type: "text", text: `File not found at "${args.identifier}".` }],
+                        isError: true
+                    };
+                }
+                if (isPermissionError(err)) {
+                    return {
+                        content: [{ type: "text", text: `Permission denied for "${args.identifier}".` }],
+                        isError: true
+                    };
+                }
+                if (isBadRequestError(err)) {
+                    return {
+                        content: [{ type: "text", text: `Invalid request. Check the path/identifier: "${args.identifier}".` }],
+                        isError: true
+                    };
+                }
+                if (err.message && err.message.includes("binary file")) {
+                    return { content: [{ type: "text", text: err.message }], isError: true };
                 }
                 throw err;
             }
         }
 
+        // --- describe_table ---
         if (name === "describe_table") {
             try {
                 const text = await downloadHelper(args.identifier as string);
                 const lines = text.split(/\r?\n/).filter(line => line.trim().length > 0);
-                if (lines.length === 0) return { content: [{ type: "text", text: "File is empty." }] };
+                if (lines.length === 0) {
+                    return { content: [{ type: "text", text: "File is empty." }] };
+                }
 
-                const headers = lines[0].split(',').map(h => h.trim());
-                const schemaStr = `Columns detected:\n- ${headers.join('\n- ')}\n\nTotal rows: ${lines.length - 1}`;
+                let headers: string[];
+                let totalRows = lines.length - 1;
+                const firstLine = lines[0];
+                const commaCount = (firstLine.match(/,/g) || []).length;
+
+                if (commaCount > 0) {
+                    headers = parseCsvHeader(firstLine);
+                    if (headers.length < 2) {
+                        headers = lines.map((_, i) => `Column ${i + 1}`);
+                        totalRows = lines.length;
+                    }
+                } else {
+                    headers = lines.map((_, i) => `Column ${i + 1}`);
+                    totalRows = lines.length;
+                }
+
+                const schemaStr =
+                    `Columns detected:\n- ${headers.join('\n- ')}\n\nTotal rows: ${totalRows}`;
                 return { content: [{ type: "text", text: schemaStr }] };
             } catch (err: any) {
                 if (isNotFoundError(err)) {
-                    return { content: [{ type: "text", text: `Error: File not found at ${args.identifier}` }] };
+                    return {
+                        content: [{ type: "text", text: `File not found at "${args.identifier}".` }],
+                        isError: true
+                    };
+                }
+                if (isPermissionError(err)) {
+                    return {
+                        content: [{ type: "text", text: `Permission denied for "${args.identifier}".` }],
+                        isError: true
+                    };
+                }
+                if (err.message && err.message.includes("binary file")) {
+                    return { content: [{ type: "text", text: err.message }], isError: true };
                 }
                 throw err;
             }
@@ -268,12 +457,12 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 });
 
 // ------------------------------------------------------------------
-// 6. Execution
+// 7. Start the Server
 // ------------------------------------------------------------------
 async function run() {
     const transport = new StdioServerTransport();
     await server.connect(transport);
-    console.error("Dropbox MCP Server running on stdio");
+    console.error(`Dropbox MCP Server running on stdio ${DROPBOX_SHARED_URL ? '(shared link mode)' : '(full account mode)'}`);
 }
 
 run().catch(console.error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dropbox-mcp-server",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "type": "module",
   "bin": {
     "dropbox-mcp-server": "dist/index.js"