diff --git a/tools/docs/create.ts b/tools/docs/create.ts index 6402faf4b0..563ae08e3c 100644 --- a/tools/docs/create.ts +++ b/tools/docs/create.ts @@ -130,23 +130,23 @@ export const createTool: ToolConfig { - console.error('Google Docs create - Transform error:', error) - - const errorMessage = - typeof error === 'object' && error !== null - ? error.message || JSON.stringify(error, null, 2) - : error.toString() || 'An error occurred while creating Google Docs document' - - return { - success: false, - output: { - metadata: { - documentId: '', - title: '', - }, - }, - error: errorMessage, + transformError: (error) => { + // If it's an Error instance with a message, use that + if (error instanceof Error) { + return error.message } + + // If it's an object with an error or message property + if (typeof error === 'object' && error !== null) { + if (error.error) { + return typeof error.error === 'string' ? error.error : JSON.stringify(error.error) + } + if (error.message) { + return error.message + } + } + + // Default fallback message + return 'An error occurred while creating Google Docs document' }, } diff --git a/tools/docs/read.ts b/tools/docs/read.ts index 2912bf28ab..ee0620810e 100644 --- a/tools/docs/read.ts +++ b/tools/docs/read.ts @@ -70,23 +70,24 @@ export const readTool: ToolConfig }, } }, - transformError: async (error) => { - const errorMessage = - typeof error === 'object' && error !== null - ? error.message || JSON.stringify(error, null, 2) - : error.toString() || 'An error occurred while reading Google Docs document' - - return { - success: false, - output: { - content: '', - metadata: { - documentId: '', - title: '', - }, - }, - error: errorMessage, + transformError: (error) => { + // If it's an Error instance with a message, use that + if (error instanceof Error) { + return error.message } + + // If it's an object with an error or message property + if (typeof error === 'object' && error !== null) { + if (error.error) { + return typeof error.error === 'string' ? error.error : JSON.stringify(error.error) + } + if (error.message) { + return error.message + } + } + + // Default fallback message + return 'An error occurred while reading Google Docs document' }, } diff --git a/tools/docs/write.ts b/tools/docs/write.ts index 852634f5a7..ea9203d109 100644 --- a/tools/docs/write.ts +++ b/tools/docs/write.ts @@ -116,22 +116,23 @@ export const writeTool: ToolConfig { - const errorMessage = - typeof error === 'object' && error !== null - ? error.message || JSON.stringify(error, null, 2) - : error.toString() || 'An error occurred while writing to Google Docs' - - return { - success: false, - output: { - updatedContent: false, - metadata: { - documentId: '', - title: '', - }, - }, - error: errorMessage, + transformError: (error) => { + // If it's an Error instance with a message, use that + if (error instanceof Error) { + return error.message } + + // If it's an object with an error or message property + if (typeof error === 'object' && error !== null) { + if (error.error) { + return typeof error.error === 'string' ? error.error : JSON.stringify(error.error) + } + if (error.message) { + return error.message + } + } + + // Default fallback message + return 'An error occurred while writing to Google Docs' }, } diff --git a/tools/sheets/read.ts b/tools/sheets/read.ts index 71b34f3d0c..d1e334b6dd 100644 --- a/tools/sheets/read.ts +++ b/tools/sheets/read.ts @@ -84,9 +84,22 @@ export const readTool: ToolConfig { - if (typeof error === 'object' && error !== null) { - return JSON.stringify(error) || 'An error occurred while reading from Google Sheets' + // If it's an Error instance with a message, use that + if (error instanceof Error) { + return error.message } - return error.message || 'An error occurred while reading from Google Sheets' + + // If it's an object with an error or message property + if (typeof error === 'object' && error !== null) { + if (error.error) { + return typeof error.error === 'string' ? error.error : JSON.stringify(error.error) + } + if (error.message) { + return error.message + } + } + + // Default fallback message + return 'An error occurred while reading from Google Sheets' }, } diff --git a/tools/sheets/update.ts b/tools/sheets/update.ts index fe516d2a51..853dba751d 100644 --- a/tools/sheets/update.ts +++ b/tools/sheets/update.ts @@ -93,6 +93,22 @@ export const updateTool: ToolConfig { - return error.message || 'An error occurred while updating Google Sheets' + // If it's an Error instance with a message, use that + if (error instanceof Error) { + return error.message + } + + // If it's an object with an error or message property + if (typeof error === 'object' && error !== null) { + if (error.error) { + return typeof error.error === 'string' ? error.error : JSON.stringify(error.error) + } + if (error.message) { + return error.message + } + } + + // Default fallback message + return 'An error occurred while updating Google Sheets' }, } diff --git a/tools/sheets/write.ts b/tools/sheets/write.ts index 200ac8ecc9..4dc231729f 100644 --- a/tools/sheets/write.ts +++ b/tools/sheets/write.ts @@ -93,6 +93,22 @@ export const writeTool: ToolConfig { - return error.message || 'An error occurred while writing to Google Sheets' + // If it's an Error instance with a message, use that + if (error instanceof Error) { + return error.message + } + + // If it's an object with an error or message property + if (typeof error === 'object' && error !== null) { + if (error.error) { + return typeof error.error === 'string' ? error.error : JSON.stringify(error.error) + } + if (error.message) { + return error.message + } + } + + // Default fallback message + return 'An error occurred while writing to Google Sheets' }, }