@agentforge/tools 0.16.13 → 0.16.15

package/dist/index.cjs

@@ -815,7 +815,7 @@ function getDefaultSlackClient() {
     }
   };
 }
-function createSendSlackMessageTool(getSlackClient, logger22) {
+function createSendSlackMessageTool(getSlackClient, logger23) {
   return core.toolBuilder().name("send-slack-message").description("Send a message to a Slack channel for team communication and notifications").category(core.ToolCategory.WEB).tags(["slack", "messaging", "communication"]).usageNotes(
     "Use this for general team communication. For notifications with @mentions, consider using notify-slack instead. Use get-slack-channels first if you need to find the right channel."
   ).suggests(["get-slack-channels"]).schema(
@@ -824,7 +824,7 @@ function createSendSlackMessageTool(getSlackClient, logger22) {
       message: zod.z.string().describe("Message content to send")
     })
   ).implementSafe(async ({ channel, message }) => {
-    logger22.info("send-slack-message called", { channel, messageLength: message.length });
+    logger23.info("send-slack-message called", { channel, messageLength: message.length });
     try {
       const { client: slack, config } = getSlackClient();
       const result = await slack.chat.postMessage({
@@ -833,7 +833,7 @@ function createSendSlackMessageTool(getSlackClient, logger22) {
         username: config.botName,
         icon_emoji: config.botIcon
       });
-      logger22.info("send-slack-message result", {
+      logger23.info("send-slack-message result", {
         ...result.channel ? { channel: result.channel } : {},
         ...result.ts ? { timestamp: result.ts } : {},
         messageLength: message.length,
@@ -846,7 +846,7 @@ function createSendSlackMessageTool(getSlackClient, logger22) {
         message_id: result.ts
       };
     } catch (error) {
-      logger22.error("send-slack-message failed", {
+      logger23.error("send-slack-message failed", {
         channel,
         error: error.message,
         data: error.data
@@ -855,7 +855,7 @@ function createSendSlackMessageTool(getSlackClient, logger22) {
     }
   }).build();
 }
-function createNotifySlackTool(getSlackClient, logger22) {
+function createNotifySlackTool(getSlackClient, logger23) {
   return core.toolBuilder().name("notify-slack").description("Send a notification to a Slack channel with optional @mentions for urgent alerts").category(core.ToolCategory.WEB).tags(["slack", "notification", "alert"]).usageNotes(
     "Use this for urgent notifications that require @mentions. For general messages without mentions, use send-slack-message instead."
   ).suggests(["get-slack-channels"]).schema(
@@ -865,7 +865,7 @@ function createNotifySlackTool(getSlackClient, logger22) {
       mentions: zod.z.array(zod.z.string()).optional().describe("List of usernames to mention (without @)")
     })
   ).implementSafe(async ({ channel, message, mentions = [] }) => {
-    logger22.info("notify-slack called", {
+    logger23.info("notify-slack called", {
       channel,
       messageLength: message.length,
       mentionCount: mentions.length
@@ -879,7 +879,7 @@ function createNotifySlackTool(getSlackClient, logger22) {
       username: config.botName,
       icon_emoji: config.botIcon
     });
-    logger22.info("notify-slack result", {
+    logger23.info("notify-slack result", {
       ...result.channel ? { channel: result.channel } : {},
       ...result.ts ? { timestamp: result.ts } : {},
       mentions: mentions.length
@@ -893,7 +893,7 @@ function createNotifySlackTool(getSlackClient, logger22) {
     };
   }).build();
 }
-function createGetSlackChannelsTool(getSlackClient, logger22) {
+function createGetSlackChannelsTool(getSlackClient, logger23) {
   return core.toolBuilder().name("get-slack-channels").description("Get a list of available Slack channels to find the right channel for messaging").category(core.ToolCategory.WEB).tags(["slack", "channels", "list"]).usageNotes(
     "Use this first to discover available channels before sending messages. Helps ensure you are sending to the correct channel."
   ).follows(["send-slack-message", "notify-slack"]).schema(
@@ -901,7 +901,7 @@ function createGetSlackChannelsTool(getSlackClient, logger22) {
       include_private: zod.z.boolean().optional().describe("Include private channels (default: false)")
     })
   ).implementSafe(async ({ include_private = false }) => {
-    logger22.info("get-slack-channels called", { include_private });
+    logger23.info("get-slack-channels called", { include_private });
     const { client: slack } = getSlackClient();
     const publicChannels = await slack.conversations.list({
       types: "public_channel",
@@ -915,7 +915,7 @@ function createGetSlackChannelsTool(getSlackClient, logger22) {
       });
       allChannels = [...allChannels, ...privateChannels.channels || []];
     }
-    logger22.info("get-slack-channels result", {
+    logger23.info("get-slack-channels result", {
       channelCount: allChannels.length,
       includePrivate: include_private
     });
@@ -930,7 +930,7 @@ function createGetSlackChannelsTool(getSlackClient, logger22) {
     };
   }).build();
 }
-function createGetSlackMessagesTool(getSlackClient, logger22) {
+function createGetSlackMessagesTool(getSlackClient, logger23) {
   return core.toolBuilder().name("get-slack-messages").description("Retrieve message history from a Slack channel to read recent conversations").category(core.ToolCategory.WEB).tags(["slack", "messages", "history", "read"]).usageNotes(
     "Use this to read recent messages from a channel. Use get-slack-channels first if you need to find the channel ID. Returns messages in reverse chronological order (newest first)."
   ).suggests(["get-slack-channels"]).schema(
@@ -939,7 +939,7 @@ function createGetSlackMessagesTool(getSlackClient, logger22) {
       limit: zod.z.number().int().min(1).max(100).optional().describe("Number of messages to retrieve (default: 20, max: 100)")
     })
   ).implementSafe(async ({ channel, limit = 20 }) => {
-    logger22.info("get-slack-messages called", { channel, limit });
+    logger23.info("get-slack-messages called", { channel, limit });
     try {
       const { client: slack } = getSlackClient();
       let channelId = channel;
@@ -950,7 +950,7 @@ function createGetSlackMessagesTool(getSlackClient, logger22) {
         });
         const found = channels.channels?.find((c) => c.name === channel);
         if (!found) {
-          logger22.error("get-slack-messages: channel not found", { channel });
+          logger23.error("get-slack-messages: channel not found", { channel });
           throw new Error(
             `Channel '${channel}' not found. Use get-slack-channels to see available channels.`
           );
@@ -962,7 +962,7 @@ function createGetSlackMessagesTool(getSlackClient, logger22) {
         limit: Math.min(limit, 100)
         // Cap at 100 for performance
       });
-      logger22.info("get-slack-messages result", {
+      logger23.info("get-slack-messages result", {
         channel: channelId,
         messageCount: result.messages?.length || 0,
         limit
@@ -980,7 +980,7 @@ function createGetSlackMessagesTool(getSlackClient, logger22) {
         })) || []
       };
     } catch (error) {
-      logger22.error("get-slack-messages failed", {
+      logger23.error("get-slack-messages failed", {
         channel,
         error: error.message,
         data: error.data
@@ -1061,12 +1061,12 @@ function getAuthHeader() {
   const auth2 = Buffer.from(`${ATLASSIAN_EMAIL}:${ATLASSIAN_API_KEY}`).toString("base64");
   return `Basic ${auth2}`;
 }
-function createSearchConfluenceTool(getAuth, getAuthHeader2, logger22) {
+function createSearchConfluenceTool(getAuth, getAuthHeader2, logger23) {
   return core.toolBuilder().name("search-confluence").description("Search for pages in Confluence using keywords or CQL (Confluence Query Language). Returns matching pages with titles, IDs, and excerpts.").category(core.ToolCategory.WEB).tag("confluence").tag("search").tag("knowledge-base").usageNotes("Use this to find relevant documentation, policies, or information in Confluence. You can search by keywords or use CQL for advanced queries (e.g., 'space=AI AND type=page'). Use get-confluence-page to retrieve full content of specific pages.").suggests(["get-confluence-page"]).schema(zod.z.object({
     query: zod.z.string().describe("Search query or CQL expression (e.g., 'payment processing' or 'space=BL3 AND title~payment')"),
     limit: zod.z.number().optional().describe("Maximum number of results to return (default: 10, max: 25)")
   })).implement(async ({ query, limit = 10 }) => {
-    logger22.info("search-confluence called", { query, limit });
+    logger23.info("search-confluence called", { query, limit });
     try {
       const { ATLASSIAN_SITE_URL } = getAuth();
       const response = await axios16__default.default.get(`${ATLASSIAN_SITE_URL}/wiki/rest/api/content/search`, {
@@ -1091,13 +1091,13 @@ function createSearchConfluenceTool(getAuth, getAuthHeader2, logger22) {
         lastModified: page.version?.when || ""
       }));
       if (results.length === 0) {
-        logger22.warn("search-confluence returned NO RESULTS - this is a valid outcome, agent should not retry", {
+        logger23.warn("search-confluence returned NO RESULTS - this is a valid outcome, agent should not retry", {
           query,
           limit,
           totalSize: response.data.totalSize
         });
       } else {
-        logger22.info("search-confluence result", {
+        logger23.info("search-confluence result", {
           query,
           resultCount: results.length,
           totalSize: response.data.totalSize,
@@ -1112,7 +1112,7 @@ function createSearchConfluenceTool(getAuth, getAuthHeader2, logger22) {
         results
       });
     } catch (error) {
-      logger22.error("search-confluence error", {
+      logger23.error("search-confluence error", {
         query,
         error: error.response?.data?.message || error.message,
         status: error.response?.status
@@ -1124,11 +1124,11 @@ function createSearchConfluenceTool(getAuth, getAuthHeader2, logger22) {
     }
   }).build();
 }
-function createGetConfluencePageTool(getAuth, getAuthHeader2, logger22) {
+function createGetConfluencePageTool(getAuth, getAuthHeader2, logger23) {
   return core.toolBuilder().name("get-confluence-page").description("Get the full content of a specific Confluence page by its ID. Returns the page title, content (in storage format), space, and metadata.").category(core.ToolCategory.WEB).tag("confluence").tag("page").tag("content").usageNotes("Use this after search-confluence to retrieve the full content of a specific page. The page ID can be found in search results.").requires(["search-confluence"]).schema(zod.z.object({
     page_id: zod.z.string().describe("The Confluence page ID (from search results)")
   })).implement(async ({ page_id }) => {
-    logger22.info("get-confluence-page called", { page_id });
+    logger23.info("get-confluence-page called", { page_id });
     try {
       const { ATLASSIAN_SITE_URL } = getAuth();
       const response = await axios16__default.default.get(`${ATLASSIAN_SITE_URL}/wiki/rest/api/content/${page_id}`, {
@@ -1141,7 +1141,7 @@ function createGetConfluencePageTool(getAuth, getAuthHeader2, logger22) {
         }
       });
       const page = response.data;
-      logger22.info("get-confluence-page result", {
+      logger23.info("get-confluence-page result", {
         page_id,
         title: page.title,
         space: page.space?.name,
@@ -1163,7 +1163,7 @@ function createGetConfluencePageTool(getAuth, getAuthHeader2, logger22) {
         }
       });
     } catch (error) {
-      logger22.error("get-confluence-page error", {
+      logger23.error("get-confluence-page error", {
         page_id,
         error: error.response?.data?.message || error.message,
         status: error.response?.status
@@ -1175,11 +1175,11 @@ function createGetConfluencePageTool(getAuth, getAuthHeader2, logger22) {
     }
   }).build();
 }
-function createListConfluenceSpacesTool(getAuth, getAuthHeader2, logger22) {
+function createListConfluenceSpacesTool(getAuth, getAuthHeader2, logger23) {
   return core.toolBuilder().name("list-confluence-spaces").description("List all available Confluence spaces. Returns space names, keys, types, and descriptions to help identify where to search for information.").category(core.ToolCategory.WEB).tag("confluence").tag("spaces").tag("list").usageNotes("Use this first to discover available spaces before searching. Helps narrow down searches to specific areas (e.g., 'AI', 'BL3', 'Finance').").follows(["search-confluence"]).schema(zod.z.object({
     limit: zod.z.number().optional().describe("Maximum number of spaces to return (default: 25)")
   })).implement(async ({ limit = 25 }) => {
-    logger22.info("list-confluence-spaces called", { limit });
+    logger23.info("list-confluence-spaces called", { limit });
     try {
       const { ATLASSIAN_SITE_URL } = getAuth();
       const response = await axios16__default.default.get(`${ATLASSIAN_SITE_URL}/wiki/rest/api/space`, {
@@ -1198,7 +1198,7 @@ function createListConfluenceSpacesTool(getAuth, getAuthHeader2, logger22) {
         description: space.description?.plain?.value || "",
         url: `${ATLASSIAN_SITE_URL}/wiki${space._links.webui}`
       }));
-      logger22.info("list-confluence-spaces result", {
+      logger23.info("list-confluence-spaces result", {
         spaceCount: spaces.length,
         spaceKeys: spaces.map((s) => s.key).slice(0, 5)
         // Log first 5 space keys
@@ -1209,7 +1209,7 @@ function createListConfluenceSpacesTool(getAuth, getAuthHeader2, logger22) {
         spaces
       });
     } catch (error) {
-      logger22.error("list-confluence-spaces error", {
+      logger23.error("list-confluence-spaces error", {
         error: error.response?.data?.message || error.message,
         status: error.response?.status
       });
@@ -1220,12 +1220,12 @@ function createListConfluenceSpacesTool(getAuth, getAuthHeader2, logger22) {
     }
   }).build();
 }
-function createGetSpacePagesTool(getAuth, getAuthHeader2, logger22) {
+function createGetSpacePagesTool(getAuth, getAuthHeader2, logger23) {
   return core.toolBuilder().name("get-space-pages").description("Get all pages from a specific Confluence space by space key. Useful for browsing content in a particular area.").category(core.ToolCategory.WEB).tag("confluence").tag("space").tag("pages").usageNotes("Use this to explore all pages in a specific space. Get the space key from list-confluence-spaces first.").requires(["list-confluence-spaces"]).schema(zod.z.object({
     space_key: zod.z.string().describe("The space key (e.g., 'AI', 'BL3', 'FIN')"),
     limit: zod.z.number().optional().describe("Maximum number of pages to return (default: 25)")
   })).implement(async ({ space_key, limit = 25 }) => {
-    logger22.info("get-space-pages called", { space_key, limit });
+    logger23.info("get-space-pages called", { space_key, limit });
     try {
       const { ATLASSIAN_SITE_URL } = getAuth();
       const response = await axios16__default.default.get(`${ATLASSIAN_SITE_URL}/wiki/rest/api/content`, {
@@ -1247,12 +1247,12 @@ function createGetSpacePagesTool(getAuth, getAuthHeader2, logger22) {
         lastModified: page.version?.when || ""
       }));
       if (pages.length === 0) {
-        logger22.warn("get-space-pages returned NO PAGES - this is a valid outcome, agent should not retry", {
+        logger23.warn("get-space-pages returned NO PAGES - this is a valid outcome, agent should not retry", {
           space_key,
           limit
         });
       } else {
-        logger22.info("get-space-pages result", {
+        logger23.info("get-space-pages result", {
           space_key,
           pageCount: pages.length,
           titles: pages.map((p) => p.title).slice(0, 3)
@@ -1266,7 +1266,7 @@ function createGetSpacePagesTool(getAuth, getAuthHeader2, logger22) {
         pages
       });
     } catch (error) {
-      logger22.error("get-space-pages error", {
+      logger23.error("get-space-pages error", {
         space_key,
         error: error.response?.data?.message || error.message,
         status: error.response?.status
@@ -1278,14 +1278,14 @@ function createGetSpacePagesTool(getAuth, getAuthHeader2, logger22) {
     }
   }).build();
 }
-function createCreateConfluencePageTool(getAuth, getAuthHeader2, logger22) {
+function createCreateConfluencePageTool(getAuth, getAuthHeader2, logger23) {
   return core.toolBuilder().name("create-confluence-page").description("Create a new page in a Confluence space. Requires space key, page title, and content (in HTML storage format).").category(core.ToolCategory.WEB).tag("confluence").tag("create").tag("write").usageNotes("Use this to create new documentation pages. Content should be in Confluence storage format (HTML). Get the space key from list-confluence-spaces first. Be mindful of creating duplicate pages.").requires(["list-confluence-spaces"]).schema(zod.z.object({
     space_key: zod.z.string().describe("The space key where the page will be created (e.g., 'AI', 'BL3')"),
     title: zod.z.string().describe("The title of the new page"),
     content: zod.z.string().describe("The page content in HTML format (Confluence storage format)"),
     parent_page_id: zod.z.string().optional().describe("Optional parent page ID to create this as a child page")
   })).implement(async ({ space_key, title, content, parent_page_id }) => {
-    logger22.info("create-confluence-page called", { space_key, title, hasParent: !!parent_page_id });
+    logger23.info("create-confluence-page called", { space_key, title, hasParent: !!parent_page_id });
     try {
       const { ATLASSIAN_SITE_URL } = getAuth();
       const pageData = {
@@ -1312,7 +1312,7 @@ function createCreateConfluencePageTool(getAuth, getAuthHeader2, logger22) {
           }
         }
       );
-      logger22.info("create-confluence-page result", {
+      logger23.info("create-confluence-page result", {
         page_id: response.data.id,
         title: response.data.title,
         space: space_key
@@ -1328,7 +1328,7 @@ function createCreateConfluencePageTool(getAuth, getAuthHeader2, logger22) {
         }
       });
     } catch (error) {
-      logger22.error("create-confluence-page error", {
+      logger23.error("create-confluence-page error", {
         space_key,
         title,
         error: error.response?.data?.message || error.message,
@@ -1341,13 +1341,13 @@ function createCreateConfluencePageTool(getAuth, getAuthHeader2, logger22) {
     }
   }).build();
 }
-function createUpdateConfluencePageTool(getAuth, getAuthHeader2, logger22) {
+function createUpdateConfluencePageTool(getAuth, getAuthHeader2, logger23) {
   return core.toolBuilder().name("update-confluence-page").description("Update an existing Confluence page's content. Requires page ID, new title, and new content.").category(core.ToolCategory.WEB).tag("confluence").tag("update").tag("write").usageNotes("Use this to update existing documentation. You must provide the page ID (from search results). The tool will automatically handle version incrementing. Always get the current page content first to avoid overwriting important information.").requires(["get-confluence-page"]).schema(zod.z.object({
     page_id: zod.z.string().describe("The ID of the page to update"),
     title: zod.z.string().describe("The new title for the page"),
     content: zod.z.string().describe("The new content in HTML format (Confluence storage format)")
   })).implement(async ({ page_id, title, content }) => {
-    logger22.info("update-confluence-page called", { page_id, title });
+    logger23.info("update-confluence-page called", { page_id, title });
     try {
       const { ATLASSIAN_SITE_URL } = getAuth();
       const getResponse = await axios16__default.default.get(
@@ -1380,7 +1380,7 @@ function createUpdateConfluencePageTool(getAuth, getAuthHeader2, logger22) {
           }
         }
       );
-      logger22.info("update-confluence-page result", {
+      logger23.info("update-confluence-page result", {
         page_id,
         title: updateResponse.data.title,
         previousVersion: currentVersion,
@@ -1397,7 +1397,7 @@ function createUpdateConfluencePageTool(getAuth, getAuthHeader2, logger22) {
         }
       });
     } catch (error) {
-      logger22.error("update-confluence-page error", {
+      logger23.error("update-confluence-page error", {
         page_id,
         title,
         error: error.response?.data?.message || error.message,
@@ -1410,12 +1410,12 @@ function createUpdateConfluencePageTool(getAuth, getAuthHeader2, logger22) {
     }
   }).build();
 }
-function createArchiveConfluencePageTool(getAuth, getAuthHeader2, logger22) {
+function createArchiveConfluencePageTool(getAuth, getAuthHeader2, logger23) {
   return core.toolBuilder().name("archive-confluence-page").description("Archive a Confluence page by moving it to trash. The page can be restored by space admins. Note: UI may require a note explaining why the page was archived.").category(core.ToolCategory.WEB).tag("confluence").tag("archive").tag("delete").usageNotes("Use this to archive outdated or obsolete documentation. The page is moved to trash, not permanently deleted. Space admins can restore it if needed. Be very careful - only archive pages that are truly obsolete.").conflicts(["create-confluence-page"]).schema(zod.z.object({
     page_id: zod.z.string().describe("The ID of the page to archive"),
     reason: zod.z.string().optional().describe("Optional reason for archiving (for audit trail)")
   })).implement(async ({ page_id, reason }) => {
-    logger22.info("archive-confluence-page called", {
+    logger23.info("archive-confluence-page called", {
       page_id,
       ...reason ? { reason } : {}
     });
@@ -1449,7 +1449,7 @@ function createArchiveConfluencePageTool(getAuth, getAuthHeader2, logger22) {
           }
         }
       );
-      logger22.info("archive-confluence-page result", {
+      logger23.info("archive-confluence-page result", {
         page_id,
         title: pageData.title,
         previousVersion: currentVersion,
@@ -1467,7 +1467,7 @@ function createArchiveConfluencePageTool(getAuth, getAuthHeader2, logger22) {
         }
       });
     } catch (error) {
-      logger22.error("archive-confluence-page error", {
+      logger23.error("archive-confluence-page error", {
         page_id,
         error: error.response?.data?.message || error.message,
         status: error.response?.status
@@ -4044,7 +4044,8 @@ function quoteQualifiedIdentifier(qualifiedName, vendor) {
   const parts = qualifiedName.split(".");
   return parts.map((part) => quoteIdentifier(part, vendor)).join(".");
 }
-var logger7 = core.createLogger("agentforge:tools:data:relational:connection");
+
+// src/data/relational/connection/lifecycle.ts
 var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
   ConnectionState2["DISCONNECTED"] = "disconnected";
   ConnectionState2["CONNECTING"] = "connecting";
@@ -4053,6 +4054,92 @@ var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
   ConnectionState2["ERROR"] = "error";
   return ConnectionState2;
 })(ConnectionState || {});
+function cancelPendingReconnection(timer, logger23, vendor, message) {
+  if (!timer) {
+    return null;
+  }
+  logger23.debug(message, { vendor });
+  clearTimeout(timer);
+  return null;
+}
+async function waitForInFlightConnection(promise, logger23, vendor, phase) {
+  if (!promise) {
+    return null;
+  }
+  logger23.debug(`Waiting for in-flight connection attempt to complete before ${phase}`, {
+    vendor
+  });
+  try {
+    await promise;
+  } catch {
+  }
+  return null;
+}
+function shutdownClient(vendor, client) {
+  if (vendor === "postgresql" || vendor === "mysql") {
+    return client.end();
+  }
+  if (vendor === "sqlite") {
+    client.close();
+  }
+}
+function scheduleReconnection(context, logger23) {
+  if (context.reconnectionConfig.maxAttempts > 0 && context.reconnectionAttempts >= context.reconnectionConfig.maxAttempts) {
+    logger23.error("Max reconnection attempts reached", {
+      vendor: context.vendor,
+      attempts: context.reconnectionAttempts,
+      maxAttempts: context.reconnectionConfig.maxAttempts
+    });
+    return;
+  }
+  const delay2 = Math.min(
+    context.reconnectionConfig.baseDelayMs * Math.pow(2, context.reconnectionAttempts),
+    context.reconnectionConfig.maxDelayMs
+  );
+  const nextAttempt = context.reconnectionAttempts + 1;
+  context.setReconnectionAttempts(nextAttempt);
+  context.setState("reconnecting" /* RECONNECTING */);
+  logger23.info("Scheduling reconnection attempt", {
+    vendor: context.vendor,
+    attempt: nextAttempt,
+    maxAttempts: context.reconnectionConfig.maxAttempts,
+    delayMs: delay2
+  });
+  context.emitReconnecting({
+    attempt: nextAttempt,
+    maxAttempts: context.reconnectionConfig.maxAttempts,
+    delayMs: delay2
+  });
+  const timer = setTimeout(async () => {
+    context.setReconnectionTimer(null);
+    try {
+      logger23.info("Attempting reconnection", {
+        vendor: context.vendor,
+        attempt: nextAttempt
+      });
+      const promise = context.initialize().finally(() => {
+        context.setConnectPromise(null);
+      });
+      context.setConnectPromise(promise);
+      await promise;
+    } catch (error) {
+      logger23.error("Reconnection attempt failed", {
+        vendor: context.vendor,
+        attempt: nextAttempt,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }, delay2);
+  context.setReconnectionTimer(timer);
+}
+var logger7 = core.createLogger("agentforge:tools:data:relational:connection:vendor-init");
+var SAFE_INITIALIZATION_PATTERNS = [
+  "Pool max connections must be",
+  "Pool acquire timeout must be",
+  "Pool idle timeout must be",
+  "SQLite connection requires a url property",
+  "Unsupported database vendor"
+];
 function validatePoolConfig(poolConfig) {
   if (poolConfig.max !== void 0 && poolConfig.max < 1) {
     throw new Error("Pool max connections must be >= 1");
@@ -4064,13 +4151,142 @@ function validatePoolConfig(poolConfig) {
     throw new Error("Pool idle timeout must be >= 0");
   }
 }
-var SAFE_INITIALIZATION_PATTERNS = [
-  "Pool max connections must be",
-  "Pool acquire timeout must be",
-  "Pool idle timeout must be",
-  "connection requires a url property",
-  "Unsupported database vendor"
-];
+function pickConfiguredPoolFields(fields) {
+  const configuredEntries = Object.entries(fields).filter(
+    (entry) => entry[1] !== void 0
+  );
+  return Object.fromEntries(configuredEntries);
+}
+function normalizePostgreSQLConfig(connection) {
+  const { pool: poolConfig, ...baseConfig } = typeof connection === "string" ? { connectionString: connection } : connection;
+  if (poolConfig) {
+    validatePoolConfig(poolConfig);
+  }
+  return {
+    poolConfig,
+    connectionConfig: {
+      ...baseConfig,
+      ...poolConfig?.max !== void 0 && { max: poolConfig.max },
+      ...poolConfig?.idleTimeoutMillis !== void 0 && {
+        idleTimeoutMillis: poolConfig.idleTimeoutMillis
+      },
+      ...poolConfig?.acquireTimeoutMillis !== void 0 && {
+        connectionTimeoutMillis: poolConfig.acquireTimeoutMillis
+      }
+    }
+  };
+}
+function normalizeMySQLConfig(connection) {
+  if (typeof connection === "string") {
+    logger7.debug("Creating MySQL connection pool from connection string", {
+      vendor: "mysql"
+    });
+    return connection;
+  }
+  const { pool: poolConfig, ...baseConfig } = connection;
+  if (poolConfig) {
+    validatePoolConfig(poolConfig);
+  }
+  return {
+    ...baseConfig,
+    ...poolConfig?.max !== void 0 && { connectionLimit: poolConfig.max },
+    ...poolConfig?.acquireTimeoutMillis !== void 0 && {
+      acquireTimeout: poolConfig.acquireTimeoutMillis
+    },
+    ...poolConfig?.idleTimeoutMillis !== void 0 && {
+      idleTimeout: poolConfig.idleTimeoutMillis
+    }
+  };
+}
+function resolveSqliteUrl(connection) {
+  if (typeof connection === "string") {
+    return { url: connection };
+  }
+  const { url, pool } = connection;
+  if (!url) {
+    throw new Error("SQLite connection requires a url property");
+  }
+  if (pool) {
+    validatePoolConfig(pool);
+  }
+  return { url, poolConfig: pool };
+}
+async function initializeVendorConnection(config) {
+  switch (config.vendor) {
+    case "postgresql":
+      return initializePostgreSQLConnection(config.connection);
+    case "mysql":
+      return initializeMySQLConnection(config.connection);
+    case "sqlite":
+      return initializeSQLiteConnection(config.connection);
+    default:
+      throw new Error(`Unsupported database vendor: ${config.vendor}`);
+  }
+}
+async function initializePostgreSQLConnection(connection) {
+  const { drizzle } = await import('drizzle-orm/node-postgres');
+  const { Pool } = await import('pg');
+  const { connectionConfig } = normalizePostgreSQLConfig(connection);
+  logger7.debug("Creating PostgreSQL connection pool", {
+    vendor: "postgresql",
+    poolConfig: pickConfiguredPoolFields({
+      max: connectionConfig.max,
+      idleTimeoutMillis: connectionConfig.idleTimeoutMillis,
+      connectionTimeoutMillis: connectionConfig.connectionTimeoutMillis
+    })
+  });
+  const client = new Pool(connectionConfig);
+  const db = drizzle({ client });
+  return { client, db };
+}
+async function initializeMySQLConnection(connection) {
+  const { drizzle } = await import('drizzle-orm/mysql2');
+  const mysql = await import('mysql2/promise');
+  const connectionConfig = normalizeMySQLConfig(connection);
+  if (typeof connectionConfig !== "string") {
+    logger7.debug("Creating MySQL connection pool", {
+      vendor: "mysql",
+      poolConfig: pickConfiguredPoolFields({
+        connectionLimit: connectionConfig.connectionLimit,
+        acquireTimeout: connectionConfig.acquireTimeout,
+        idleTimeout: connectionConfig.idleTimeout
+      })
+    });
+  }
+  let client;
+  if (typeof connectionConfig === "string") {
+    client = mysql.createPool(connectionConfig);
+  } else {
+    client = mysql.createPool(connectionConfig);
+  }
+  const db = drizzle({ client });
+  return { client, db };
+}
+async function initializeSQLiteConnection(connection) {
+  const { drizzle } = await import('drizzle-orm/better-sqlite3');
+  const DatabaseModule = await import('better-sqlite3');
+  const Database = DatabaseModule.default;
+  const { url, poolConfig } = resolveSqliteUrl(connection);
+  if (poolConfig) {
+    logger7.debug("SQLite pool configuration provided but not applied (SQLite uses single connection)", {
+      vendor: "sqlite",
+      poolConfig: pickConfiguredPoolFields({
+        max: poolConfig.max,
+        idleTimeoutMillis: poolConfig.idleTimeoutMillis,
+        acquireTimeoutMillis: poolConfig.acquireTimeoutMillis
+      })
+    });
+  }
+  logger7.debug("Creating SQLite connection", {
+    vendor: "sqlite",
+    url: url === ":memory:" ? ":memory:" : "file"
+  });
+  const client = new Database(url);
+  client.pragma("foreign_keys = ON");
+  const db = drizzle({ client });
+  return { client, db };
+}
+var logger8 = core.createLogger("agentforge:tools:data:relational:connection");
 var ConnectionManager = class extends events.EventEmitter {
   vendor;
   db;
@@ -4110,23 +4326,22 @@ var ConnectionManager = class extends events.EventEmitter {
    */
   async connect() {
     if (this.state === "connected" /* CONNECTED */) {
-      logger7.debug("Already connected", { vendor: this.vendor });
+      logger8.debug("Already connected", { vendor: this.vendor });
       return;
     }
     if (this.connectPromise) {
-      logger7.debug("Connection already in progress, waiting for completion", {
+      logger8.debug("Connection already in progress, waiting for completion", {
         vendor: this.vendor,
         state: this.state
       });
       return this.connectPromise;
     }
-    if (this.reconnectionTimer) {
-      logger7.debug("Clearing pending reconnection timer before manual connect", {
-        vendor: this.vendor
-      });
-      clearTimeout(this.reconnectionTimer);
-      this.reconnectionTimer = null;
-    }
+    this.reconnectionTimer = cancelPendingReconnection(
+      this.reconnectionTimer,
+      logger8,
+      this.vendor,
+      "Clearing pending reconnection timer before manual connect"
+    );
     this.connectPromise = this.initialize().finally(() => {
       this.connectPromise = null;
     });
@@ -4141,21 +4356,19 @@ var ConnectionManager = class extends events.EventEmitter {
    */
   async disconnect() {
     this.connectionGeneration++;
-    if (this.reconnectionTimer) {
-      clearTimeout(this.reconnectionTimer);
-      this.reconnectionTimer = null;
-    }
+    this.reconnectionTimer = cancelPendingReconnection(
+      this.reconnectionTimer,
+      logger8,
+      this.vendor,
+      "Clearing pending reconnection timer before disconnect"
+    );
     this.reconnectionAttempts = 0;
-    if (this.connectPromise) {
-      logger7.debug("Waiting for in-flight connection attempt to complete before disconnect", {
-        vendor: this.vendor
-      });
-      try {
-        await this.connectPromise;
-      } catch {
-      }
-      this.connectPromise = null;
-    }
+    this.connectPromise = await waitForInFlightConnection(
+      this.connectPromise,
+      logger8,
+      this.vendor,
+      "disconnect"
+    );
     await this.close();
   }
   /**
@@ -4200,7 +4413,7 @@ var ConnectionManager = class extends events.EventEmitter {
     const startTime = Date.now();
     const currentGeneration = this.connectionGeneration;
     if (this.state === "connected" /* CONNECTED */ && this.client) {
-      logger7.warn("Re-initializing an already connected manager; emitting disconnected before cleanup", {
+      logger8.warn("Re-initializing an already connected manager; emitting disconnected before cleanup", {
         vendor: this.vendor
       });
       this.setState("disconnected" /* DISCONNECTED */);
@@ -4208,27 +4421,17 @@ var ConnectionManager = class extends events.EventEmitter {
       await this.cleanupCancelledConnection();
     }
     this.setState("connecting" /* CONNECTING */);
-    logger7.info("Initializing database connection", {
+    logger8.info("Initializing database connection", {
       vendor: this.vendor,
       connectionType: typeof this.config.connection,
       state: this.state
     });
     try {
-      switch (this.vendor) {
-        case "postgresql":
-          await this.initializePostgreSQL();
-          break;
-        case "mysql":
-          await this.initializeMySQL();
-          break;
-        case "sqlite":
-          await this.initializeSQLite();
-          break;
-        default:
-          throw new Error(`Unsupported database vendor: ${this.vendor}`);
-      }
+      const initialized = await initializeVendorConnection(this.config);
+      this.client = initialized.client;
+      this.db = initialized.db;
       if (currentGeneration !== this.connectionGeneration) {
-        logger7.debug("Connection cancelled during initialization", {
+        logger8.debug("Connection cancelled during initialization", {
           vendor: this.vendor,
           currentGeneration,
           newGeneration: this.connectionGeneration
@@ -4237,13 +4440,13 @@ var ConnectionManager = class extends events.EventEmitter {
         this.setState("disconnected" /* DISCONNECTED */);
         throw new Error("Connection cancelled during initialization");
       }
-      logger7.debug("Validating connection health", { vendor: this.vendor });
+      logger8.debug("Validating connection health", { vendor: this.vendor });
       const healthy = await this.isHealthy();
       if (!healthy) {
         throw new Error(`Failed to establish healthy connection to ${this.vendor} database`);
       }
       if (currentGeneration !== this.connectionGeneration) {
-        logger7.debug("Connection cancelled during health check", {
+        logger8.debug("Connection cancelled during health check", {
           vendor: this.vendor,
           currentGeneration,
           newGeneration: this.connectionGeneration
@@ -4255,7 +4458,7 @@ var ConnectionManager = class extends events.EventEmitter {
       this.setState("connected" /* CONNECTED */);
       this.emit("connected");
       this.reconnectionAttempts = 0;
-      logger7.info("Database connection initialized successfully", {
+      logger8.info("Database connection initialized successfully", {
         vendor: this.vendor,
         duration: Date.now() - startTime,
         state: this.state
@@ -4276,7 +4479,7 @@ var ConnectionManager = class extends events.EventEmitter {
         if (this.listenerCount("error") > 0) {
           this.emit("error", normalizedError);
         }
-        logger7.error(errorMessage, {
+        logger8.error(errorMessage, {
           vendor: this.vendor,
           error: normalizedError.message,
           duration: Date.now() - startTime,
@@ -4287,7 +4490,7 @@ var ConnectionManager = class extends events.EventEmitter {
           this.scheduleReconnection();
         }
       } else {
-        logger7.debug("Connection initialization cancelled", {
+        logger8.debug("Connection initialization cancelled", {
           vendor: this.vendor,
           duration: Date.now() - startTime,
           state: this.state
@@ -4308,7 +4511,7 @@ var ConnectionManager = class extends events.EventEmitter {
     const oldState = this.state;
     this.state = newState;
     if (oldState !== newState) {
-      logger7.debug("Connection state changed", {
+      logger8.debug("Connection state changed", {
         vendor: this.vendor,
         oldState,
         newState
@@ -4320,152 +4523,30 @@ var ConnectionManager = class extends events.EventEmitter {
    * @private
    */
   scheduleReconnection() {
-    if (this.reconnectionConfig.maxAttempts > 0 && this.reconnectionAttempts >= this.reconnectionConfig.maxAttempts) {
-      logger7.error("Max reconnection attempts reached", {
-        vendor: this.vendor,
-        attempts: this.reconnectionAttempts,
-        maxAttempts: this.reconnectionConfig.maxAttempts
-      });
-      return;
-    }
-    const delay2 = Math.min(
-      this.reconnectionConfig.baseDelayMs * Math.pow(2, this.reconnectionAttempts),
-      this.reconnectionConfig.maxDelayMs
-    );
-    this.reconnectionAttempts++;
-    this.setState("reconnecting" /* RECONNECTING */);
-    logger7.info("Scheduling reconnection attempt", {
-      vendor: this.vendor,
-      attempt: this.reconnectionAttempts,
-      maxAttempts: this.reconnectionConfig.maxAttempts,
-      delayMs: delay2
-    });
-    this.emit("reconnecting", {
-      attempt: this.reconnectionAttempts,
-      maxAttempts: this.reconnectionConfig.maxAttempts,
-      delayMs: delay2
-    });
-    this.reconnectionTimer = setTimeout(async () => {
-      this.reconnectionTimer = null;
-      try {
-        logger7.info("Attempting reconnection", {
-          vendor: this.vendor,
-          attempt: this.reconnectionAttempts
-        });
-        this.connectPromise = this.initialize().finally(() => {
-          this.connectPromise = null;
-        });
-        await this.connectPromise;
-      } catch (error) {
-        logger7.error("Reconnection attempt failed", {
-          vendor: this.vendor,
-          attempt: this.reconnectionAttempts,
-          error: error instanceof Error ? error.message : String(error)
-        });
-      }
-    }, delay2);
-  }
-  /**
-   * Initialize PostgreSQL connection using Drizzle ORM with node-postgres
-   *
-   * Applies pool configuration options to pg.Pool for connection management.
-   */
-  async initializePostgreSQL() {
-    const { drizzle } = await import('drizzle-orm/node-postgres');
-    const { Pool } = await import('pg');
-    const { pool: poolConfig, ...baseConfig } = typeof this.config.connection === "string" ? { connectionString: this.config.connection } : this.config.connection;
-    if (poolConfig) {
-      validatePoolConfig(poolConfig);
-    }
-    const connectionConfig = {
-      ...baseConfig,
-      // Map our PoolConfig to pg.Pool options
-      // Note: pg.Pool does not support a `min` option
-      ...poolConfig?.max !== void 0 && { max: poolConfig.max },
-      ...poolConfig?.idleTimeoutMillis !== void 0 && { idleTimeoutMillis: poolConfig.idleTimeoutMillis },
-      ...poolConfig?.acquireTimeoutMillis !== void 0 && { connectionTimeoutMillis: poolConfig.acquireTimeoutMillis }
-    };
-    logger7.debug("Creating PostgreSQL connection pool", {
-      vendor: this.vendor,
-      poolConfig: {
-        ...connectionConfig.max !== void 0 ? { max: connectionConfig.max } : {},
-        ...connectionConfig.idleTimeoutMillis !== void 0 ? { idleTimeoutMillis: connectionConfig.idleTimeoutMillis } : {},
-        ...connectionConfig.connectionTimeoutMillis !== void 0 ? { connectionTimeoutMillis: connectionConfig.connectionTimeoutMillis } : {}
-      }
-    });
-    this.client = new Pool(connectionConfig);
-    this.db = drizzle({ client: this.client });
-  }
-  /**
-   * Initialize MySQL connection using Drizzle ORM with mysql2
-   *
-   * Applies pool configuration options to mysql2.createPool for connection management.
-   */
-  async initializeMySQL() {
-    const { drizzle } = await import('drizzle-orm/mysql2');
-    const mysql = await import('mysql2/promise');
-    let connectionConfig;
-    if (typeof this.config.connection === "string") {
-      connectionConfig = this.config.connection;
-      logger7.debug("Creating MySQL connection pool from connection string", {
-        vendor: this.vendor
-      });
-    } else {
-      const { pool: poolConfig, ...baseConfig } = this.config.connection;
-      if (poolConfig) {
-        validatePoolConfig(poolConfig);
-      }
-      connectionConfig = {
-        ...baseConfig,
-        // Map our PoolConfig to mysql2 pool options
-        ...poolConfig?.max !== void 0 && { connectionLimit: poolConfig.max },
-        ...poolConfig?.acquireTimeoutMillis !== void 0 && { acquireTimeout: poolConfig.acquireTimeoutMillis },
-        ...poolConfig?.idleTimeoutMillis !== void 0 && { idleTimeout: poolConfig.idleTimeoutMillis }
-      };
-      logger7.debug("Creating MySQL connection pool", {
-        vendor: this.vendor,
-        poolConfig: {
-          ...connectionConfig.connectionLimit !== void 0 ? { connectionLimit: connectionConfig.connectionLimit } : {},
-          ...connectionConfig.acquireTimeout !== void 0 ? { acquireTimeout: connectionConfig.acquireTimeout } : {},
-          ...connectionConfig.idleTimeout !== void 0 ? { idleTimeout: connectionConfig.idleTimeout } : {}
-        }
-      });
-    }
-    this.client = mysql.createPool(connectionConfig);
-    this.db = drizzle({ client: this.client });
-  }
-  /**
-   * Initialize SQLite connection using Drizzle ORM with better-sqlite3
-   *
-   * Note: SQLite uses a single connection. Pool configuration is logged but not applied
-   * as SQLite handles concurrent access through its internal locking mechanism.
-   */
-  async initializeSQLite() {
-    const { drizzle } = await import('drizzle-orm/better-sqlite3');
-    const DatabaseModule = await import('better-sqlite3');
-    const Database = DatabaseModule.default;
-    const url = typeof this.config.connection === "string" ? this.config.connection : this.config.connection.url;
-    if (!url) {
-      throw new Error("SQLite connection requires a url property");
-    }
-    if (typeof this.config.connection === "object" && this.config.connection.pool) {
-      validatePoolConfig(this.config.connection.pool);
-      logger7.debug("SQLite pool configuration provided but not applied (SQLite uses single connection)", {
+    scheduleReconnection(
+      {
         vendor: this.vendor,
-        poolConfig: {
-          ...this.config.connection.pool.max !== void 0 ? { max: this.config.connection.pool.max } : {},
-          ...this.config.connection.pool.idleTimeoutMillis !== void 0 ? { idleTimeoutMillis: this.config.connection.pool.idleTimeoutMillis } : {},
-          ...this.config.connection.pool.acquireTimeoutMillis !== void 0 ? { acquireTimeoutMillis: this.config.connection.pool.acquireTimeoutMillis } : {}
+        reconnectionConfig: this.reconnectionConfig,
+        reconnectionAttempts: this.reconnectionAttempts,
+        setReconnectionAttempts: (attempts) => {
+          this.reconnectionAttempts = attempts;
+        },
+        setState: (state) => {
+          this.setState(state);
+        },
+        emitReconnecting: (payload) => {
+          this.emit("reconnecting", payload);
+        },
+        initialize: () => this.initialize(),
+        setConnectPromise: (promise) => {
+          this.connectPromise = promise;
+        },
+        setReconnectionTimer: (timer) => {
+          this.reconnectionTimer = timer;
         }
-      });
-    }
-    logger7.debug("Creating SQLite connection", {
-      vendor: this.vendor,
-      url: url === ":memory:" ? ":memory:" : "file"
-    });
-    this.client = new Database(url);
-    this.client.pragma("foreign_keys = ON");
-    this.db = drizzle({ client: this.client });
+      },
+      logger8
+    );
   }
   /**
    * Determine whether an error thrown by drizzle-orm's better-sqlite3 adapter
@@ -4505,7 +4586,7 @@ var ConnectionManager = class extends events.EventEmitter {
     if (!this.db) {
       throw new Error("Database not initialized. Call initialize() first.");
     }
-    logger7.debug("Executing SQL query", {
+    logger8.debug("Executing SQL query", {
       vendor: this.vendor
     });
     if (this.vendor === "sqlite") {
@@ -4635,42 +4716,33 @@ var ConnectionManager = class extends events.EventEmitter {
    */
   async close() {
     this.connectionGeneration++;
-    if (this.reconnectionTimer) {
-      logger7.debug("Canceling pending reconnection timer during close", {
-        vendor: this.vendor
-      });
-      clearTimeout(this.reconnectionTimer);
-      this.reconnectionTimer = null;
-    }
-    if (this.connectPromise) {
-      logger7.debug("Waiting for in-flight connection attempt to complete before close", {
-        vendor: this.vendor
-      });
-      try {
-        await this.connectPromise;
-      } catch {
-      }
-      this.connectPromise = null;
-    }
+    this.reconnectionTimer = cancelPendingReconnection(
+      this.reconnectionTimer,
+      logger8,
+      this.vendor,
+      "Canceling pending reconnection timer during close"
+    );
+    this.connectPromise = await waitForInFlightConnection(
+      this.connectPromise,
+      logger8,
+      this.vendor,
+      "close"
+    );
     if (this.client) {
-      logger7.info("Closing database connection", {
+      logger8.info("Closing database connection", {
         vendor: this.vendor,
         state: this.state
       });
       try {
-        if (this.vendor === "postgresql" || this.vendor === "mysql") {
-          await this.client.end();
-        } else if (this.vendor === "sqlite") {
-          this.client.close();
-        }
+        await shutdownClient(this.vendor, this.client);
         this.setState("disconnected" /* DISCONNECTED */);
         this.emit("disconnected");
-        logger7.debug("Database connection closed successfully", {
+        logger8.debug("Database connection closed successfully", {
           vendor: this.vendor,
           state: this.state
         });
       } catch (error) {
-        logger7.error("Error closing database connection", {
+        logger8.error("Error closing database connection", {
           vendor: this.vendor,
           error: error instanceof Error ? error.message : String(error),
           state: this.state
@@ -4695,17 +4767,13 @@ var ConnectionManager = class extends events.EventEmitter {
     if (!this.client) {
       return;
     }
-    logger7.debug("Cleaning up cancelled connection", {
+    logger8.debug("Cleaning up cancelled connection", {
       vendor: this.vendor
     });
     try {
-      if (this.vendor === "postgresql" || this.vendor === "mysql") {
-        await this.client.end();
-      } else if (this.vendor === "sqlite") {
-        this.client.close();
-      }
+      await shutdownClient(this.vendor, this.client);
     } catch (error) {
-      logger7.debug("Error during cancelled connection cleanup", {
+      logger8.debug("Error during cancelled connection cleanup", {
         vendor: this.vendor,
         error: error instanceof Error ? error.message : String(error)
       });
@@ -4720,15 +4788,15 @@ var ConnectionManager = class extends events.EventEmitter {
    */
   async isHealthy() {
     if (!this.db || !this.client) {
-      logger7.debug("Health check failed: connection not initialized", { vendor: this.vendor });
+      logger8.debug("Health check failed: connection not initialized", { vendor: this.vendor });
       return false;
     }
     try {
       await this.execute(drizzleOrm.sql`SELECT 1`);
-      logger7.debug("Health check passed", { vendor: this.vendor });
+      logger8.debug("Health check passed", { vendor: this.vendor });
       return true;
     } catch (error) {
-      logger7.debug("Health check failed", {
+      logger8.debug("Health check failed", {
         vendor: this.vendor,
         error: error instanceof Error ? error.message : String(error)
       });
@@ -4736,7 +4804,7 @@ var ConnectionManager = class extends events.EventEmitter {
     }
   }
 };
-var logger8 = core.createLogger("agentforge:tools:data:relational:query");
+var logger9 = core.createLogger("agentforge:tools:data:relational:query");
 function buildParameterizedQuery(sqlString, params) {
   if (!params) {
     return drizzleOrm.sql.raw(sqlString);
@@ -4811,7 +4879,7 @@ function buildParameterizedQuery(sqlString, params) {
 }
 async function executeQuery(manager, input, context) {
   const startTime = Date.now();
-  logger8.debug("Executing query", {
+  logger9.debug("Executing query", {
     vendor: input.vendor,
     hasParams: !!input.params,
     paramCount: input.params ? Array.isArray(input.params) ? input.params.length : Object.keys(input.params).length : 0
@@ -4825,7 +4893,7 @@ async function executeQuery(manager, input, context) {
     const executionTime = Date.now() - startTime;
     const rows = Array.isArray(result) ? result : result.rows || [];
     const rowCount = result.rowCount || result.affectedRows || rows.length;
-    logger8.debug("Query executed successfully", {
+    logger9.debug("Query executed successfully", {
       vendor: input.vendor,
       rowCount,
       executionTime
@@ -4837,7 +4905,7 @@ async function executeQuery(manager, input, context) {
     };
   } catch (error) {
     const executionTime = Date.now() - startTime;
-    logger8.error("Query execution failed", {
+    logger9.error("Query execution failed", {
       vendor: input.vendor,
       error: error instanceof Error ? error.message : String(error),
       executionTime
@@ -5261,7 +5329,7 @@ function buildSelectQuery(input) {
   }
   return query;
 }
-var logger9 = core.createLogger("agentforge:tools:data:relational:batch");
+var logger10 = core.createLogger("agentforge:tools:data:relational:batch");
 var DEFAULT_BATCH_SIZE = 100;
 var MAX_BATCH_SIZE = 5e3;
 var MAX_RETRY_ATTEMPTS = 5;
@@ -5312,7 +5380,7 @@ async function executeBatchedTask(task, options = {}) {
   let successfulItems = 0;
   let failedItems = 0;
   let retries = 0;
-  logger9.debug("Starting batched execution", {
+  logger10.debug("Starting batched execution", {
     operation: task.operation,
     totalItems: task.items.length,
     totalBatches: batches.length,
@@ -5351,7 +5419,7 @@ async function executeBatchedTask(task, options = {}) {
         lastError = error;
         if (attempts <= resolved.maxRetries) {
           retries += 1;
-          logger9.warn("Batch execution failed, retrying", {
+          logger10.warn("Batch execution failed, retrying", {
             operation: task.operation,
             batchIndex,
             attempts,
@@ -5390,7 +5458,7 @@ async function executeBatchedTask(task, options = {}) {
             { cause: lastError }
           );
         }
-        logger9.warn("Batch execution failed and was recorded for partial success", {
+        logger10.warn("Batch execution failed and was recorded for partial success", {
           operation: task.operation,
           batchIndex,
           attempts,
@@ -5402,7 +5470,7 @@ async function executeBatchedTask(task, options = {}) {
   }
   const executionTime = Date.now() - startTime;
   const partialSuccess = successfulItems > 0 && failedItems > 0;
-  logger9.debug("Batched execution completed", {
+  logger10.debug("Batched execution completed", {
     operation: task.operation,
     totalItems: task.items.length,
     successfulItems,
@@ -5446,7 +5514,7 @@ async function benchmarkBatchExecution(params) {
   const timeSavedMs = Math.max(individualExecutionTime - batchedExecutionTime, 0);
   const speedupRatio = batchedExecutionTime > 0 ? individualExecutionTime / batchedExecutionTime : 0;
   const speedupPercent = individualExecutionTime > 0 ? timeSavedMs / individualExecutionTime * 100 : 0;
-  logger9.debug("Batch benchmark completed", {
+  logger10.debug("Batch benchmark completed", {
     itemCount: params.items.length,
     batchCount: batches.length,
     batchSize,
@@ -5466,7 +5534,7 @@ async function benchmarkBatchExecution(params) {
     speedupPercent
   };
 }
-var logger10 = core.createLogger("agentforge:tools:data:relational:stream");
+var logger11 = core.createLogger("agentforge:tools:data:relational:stream");
 var DEFAULT_CHUNK_SIZE = 100;
 var MAX_CHUNK_SIZE = 5e3;
 var DEFAULT_SAMPLE_SIZE = 50;
@@ -5599,7 +5667,7 @@ async function executeStreamingSelect(executor, input, options = {}) {
   const endHeapUsed = process.memoryUsage().heapUsed;
   peakHeapUsed = Math.max(peakHeapUsed, endHeapUsed);
   const executionTime = Date.now() - startTime;
-  logger10.debug("Streaming SELECT execution completed", {
+  logger11.debug("Streaming SELECT execution completed", {
     table: input.table,
     vendor: input.vendor,
     chunkCount,
@@ -5623,7 +5691,7 @@ async function executeStreamingSelect(executor, input, options = {}) {
   };
 }
 async function benchmarkStreamingSelectMemory(executor, input, options = {}) {
-  logger10.warn("Running streaming benchmark will execute the SELECT query twice (regular + streaming).", {
+  logger11.warn("Running streaming benchmark will execute the SELECT query twice (regular + streaming).", {
     table: input.table,
     vendor: input.vendor
   });
@@ -5643,7 +5711,7 @@ async function benchmarkStreamingSelectMemory(executor, input, options = {}) {
     0
   );
   const memorySavedPercent = nonStreamingPeakHeapUsed > 0 ? memorySavedBytes / nonStreamingPeakHeapUsed * 100 : 0;
-  logger10.debug("Streaming benchmark completed", {
+  logger11.debug("Streaming benchmark completed", {
     table: input.table,
     vendor: input.vendor,
     nonStreamingRows: nonStreamingRows.length,
@@ -5661,7 +5729,7 @@ async function benchmarkStreamingSelectMemory(executor, input, options = {}) {
     memorySavedPercent
   };
 }
-var logger11 = core.createLogger("agentforge:tools:data:relational:transaction");
+var logger12 = core.createLogger("agentforge:tools:data:relational:transaction");
 var transactionSequence = 0;
 var SAVEPOINT_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 function toSqlIsolationLevel(level) {
@@ -5820,7 +5888,7 @@ var ManagedTransaction = class {
         await this.executeQuery(drizzleOrm.sql.raw("PRAGMA read_uncommitted = 1"));
         this.shouldRestoreSqliteReadUncommitted = true;
       } else {
-        logger11.debug("Ignoring SQLite isolation level override", {
+        logger12.debug("Ignoring SQLite isolation level override", {
           transactionId: this.id,
           isolationLevel: this.options.isolationLevel
         });
@@ -5845,7 +5913,7 @@ var ManagedTransaction = class {
       const targetValue = this.sqliteReadUncommittedOriginal ?? 0;
       await this.executeQuery(drizzleOrm.sql.raw(`PRAGMA read_uncommitted = ${targetValue}`));
     } catch (error) {
-      logger11.warn("Failed to restore SQLite read_uncommitted pragma", {
+      logger12.warn("Failed to restore SQLite read_uncommitted pragma", {
         transactionId: this.id,
         error: error instanceof Error ? error.message : String(error)
       });
@@ -5874,7 +5942,7 @@ async function withTransaction(manager, operation, options) {
   const resolvedOptions = resolveOptions2(options);
   const transactionId = `tx-${++transactionSequence}`;
   const vendor = manager.getVendor();
-  logger11.debug("Starting transaction", {
+  logger12.debug("Starting transaction", {
     transactionId,
     vendor,
     ...resolvedOptions.isolationLevel ? { isolationLevel: resolvedOptions.isolationLevel } : {},
@@ -5901,7 +5969,7 @@ async function withTransaction(manager, operation, options) {
       if (transaction.isActive()) {
         await transaction.commit();
       }
-      logger11.debug("Transaction committed", {
+      logger12.debug("Transaction committed", {
         transactionId,
         vendor,
         duration: Date.now() - startTime
@@ -5912,14 +5980,14 @@ async function withTransaction(manager, operation, options) {
         try {
           await transaction.rollback();
         } catch (rollbackError) {
-          logger11.error("Transaction rollback failed", {
+          logger12.error("Transaction rollback failed", {
             transactionId,
             vendor,
             error: rollbackError instanceof Error ? rollbackError.message : String(rollbackError)
           });
         }
       }
-      logger11.error("Transaction failed", {
+      logger12.error("Transaction failed", {
         transactionId,
         vendor,
         duration: Date.now() - startTime,
@@ -5934,7 +6002,7 @@ async function withTransaction(manager, operation, options) {
 var VALID_TABLE_FILTER_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*(\.[a-zA-Z_][a-zA-Z0-9_]*)?$/;
 
 // src/data/relational/schema/schema-inspector.ts
-var logger12 = core.createLogger("agentforge:tools:data:relational:schema-inspector");
+var logger13 = core.createLogger("agentforge:tools:data:relational:schema-inspector");
 var DEFAULT_CACHE_TTL_MS = 6e4;
 var schemaCache = /* @__PURE__ */ new Map();
 var POSTGRES_TABLES_QUERY = `
@@ -6224,7 +6292,7 @@ var SchemaInspector = class _SchemaInspector {
     if (!bypassCache && this.cacheKey) {
       const cached = schemaCache.get(this.cacheKey);
       if (cached && cached.expiresAt > Date.now()) {
-        logger12.debug("Schema cache hit", { vendor: this.vendor });
+        logger13.debug("Schema cache hit", { vendor: this.vendor });
         return filterSchemaTables(cloneSchema(cached.schema), tableFilters);
       }
     }
@@ -6491,7 +6559,7 @@ var SchemaInspector = class _SchemaInspector {
     }
   }
 };
-var logger13 = core.createLogger("agentforge:tools:data:relational:schema-validator");
+var logger14 = core.createLogger("agentforge:tools:data:relational:schema-validator");
 function validateTableExists(schema, tableName) {
   const errors = [];
   if (!tableName || typeof tableName !== "string") {
@@ -6505,7 +6573,7 @@ function validateTableExists(schema, tableName) {
       `Table "${tableName}" does not exist. Available tables: ${available || "(none)"}`
     );
   }
-  logger13.debug("Table existence validation", { tableName, valid: errors.length === 0 });
+  logger14.debug("Table existence validation", { tableName, valid: errors.length === 0 });
   return { valid: errors.length === 0, errors };
 }
 function validateColumnsExist(schema, tableName, columnNames) {
@@ -6528,7 +6596,7 @@ function validateColumnsExist(schema, tableName, columnNames) {
       );
     }
   }
-  logger13.debug("Column existence validation", {
+  logger14.debug("Column existence validation", {
     tableName,
     columnCount: columnNames.length,
     valid: errors.length === 0
@@ -6564,7 +6632,7 @@ function validateColumnTypes(schema, tableName, expectedTypes) {
       );
     }
   }
-  logger13.debug("Column type validation", {
+  logger14.debug("Column type validation", {
     tableName,
     typeChecks: Object.keys(expectedTypes).length,
     valid: errors.length === 0
@@ -6584,7 +6652,7 @@ function findTable(schema, tableName) {
 function formatTableName(table) {
   return table.schema ? `${table.schema}.${table.name}` : table.name;
 }
-var logger14 = core.createLogger("agentforge:tools:data:relational:type-mapper");
+var logger15 = core.createLogger("agentforge:tools:data:relational:type-mapper");
 var POSTGRES_TYPE_MAP = {
   // Numeric
   smallint: "number",
@@ -6750,7 +6818,7 @@ function mapColumnType(vendor, dbType, nullable = false) {
   const result = { tsType, nullable, dbType };
   if (tsType === "unknown" && normalised !== "json" && normalised !== "jsonb") {
     result.notes = `No explicit mapping for "${dbType}"; defaulting to unknown`;
-    logger14.debug("Unmapped database type", { vendor, dbType, normalised });
+    logger15.debug("Unmapped database type", { vendor, dbType, normalised });
   }
   if ((normalised === "bigint" || normalised === "int8" || normalised === "bigserial") && (vendor === "postgresql" || vendor === "mysql")) {
     result.notes = "Mapped to string to avoid JavaScript number precision loss for 64-bit integers";
@@ -6765,7 +6833,7 @@ function mapSchemaTypes(vendor, columns) {
     }
     result.get(col.table).set(col.name, mapColumnType(vendor, col.type, col.nullable));
   }
-  logger14.debug("Schema type mapping complete", {
+  logger15.debug("Schema type mapping complete", {
     vendor,
     tables: result.size,
     columns: columns.length
@@ -6782,7 +6850,7 @@ function normaliseDbType(raw) {
   type = type.replace(/\s+unsigned$/, "");
   return type.trim();
 }
-var logger15 = core.createLogger("agentforge:tools:data:relational:schema-diff");
+var logger16 = core.createLogger("agentforge:tools:data:relational:schema-diff");
 function diffSchemas(before, after) {
   const tableDiffs = [];
   let columnsAdded = 0;
@@ -6822,7 +6890,7 @@ function diffSchemas(before, after) {
   const tablesRemoved = tableDiffs.filter((d) => d.type === "removed").length;
   const tablesChanged = tableDiffs.filter((d) => d.type === "changed").length;
   const identical = tableDiffs.length === 0;
-  logger15.debug("Schema diff computed", {
+  logger16.debug("Schema diff computed", {
     identical,
     tablesAdded,
     tablesRemoved,
@@ -6866,7 +6934,7 @@ function importSchemaFromJson(json) {
       throw new Error(`Invalid schema JSON: table "${table.name}" missing "primaryKey" array`);
     }
   }
-  logger15.debug("Schema imported from JSON", {
+  logger16.debug("Schema imported from JSON", {
     vendor: obj.vendor,
     tableCount: obj.tables.length
   });
@@ -7163,7 +7231,7 @@ function isSafeValidationError(error) {
 }
 
 // src/data/relational/tools/relational-select/executor.ts
-var logger16 = core.createLogger("agentforge:tools:data:relational:select");
+var logger17 = core.createLogger("agentforge:tools:data:relational:select");
 function toSelectQueryInput(input) {
   return {
     table: input.table,
@@ -7177,7 +7245,7 @@ function toSelectQueryInput(input) {
 }
 async function executeSelect(manager, input, context) {
   const startTime = Date.now();
-  logger16.debug("Building SELECT query", {
+  logger17.debug("Building SELECT query", {
     vendor: input.vendor,
     table: input.table,
     hasWhere: !!input.where,
@@ -7195,7 +7263,7 @@ async function executeSelect(manager, input, context) {
       };
       const streamInput = toSelectQueryInput(input);
       if (input.streaming.benchmark) {
-        logger16.warn("Streaming benchmark enabled; SELECT will execute up to three times (result + benchmark regular + benchmark streaming).", {
+        logger17.warn("Streaming benchmark enabled; SELECT will execute up to three times (result + benchmark regular + benchmark streaming).", {
           vendor: input.vendor,
           table: input.table,
           chunkSize: streamOptions.chunkSize ?? DEFAULT_CHUNK_SIZE,
@@ -7206,7 +7274,7 @@ async function executeSelect(manager, input, context) {
       const streamResult = await executeStreamingSelect(executor, streamInput, streamOptions);
       const benchmark = input.streaming.benchmark ? await benchmarkStreamingSelectMemory(executor, streamInput, streamOptions) : void 0;
       const executionTime2 = Date.now() - startTime;
-      logger16.debug("Streaming SELECT query executed successfully", {
+      logger17.debug("Streaming SELECT query executed successfully", {
         vendor: input.vendor,
         table: input.table,
         rowCount: streamResult.rowCount,
@@ -7235,7 +7303,7 @@ async function executeSelect(manager, input, context) {
     const executionTime = Date.now() - startTime;
     const rows = Array.isArray(result) ? result : result.rows || [];
     const rowCount = rows.length;
-    logger16.debug("SELECT query executed successfully", {
+    logger17.debug("SELECT query executed successfully", {
       vendor: input.vendor,
       table: input.table,
       rowCount,
@@ -7248,7 +7316,7 @@ async function executeSelect(manager, input, context) {
     };
   } catch (error) {
     const executionTime = Date.now() - startTime;
-    logger16.error("SELECT query execution failed", {
+    logger17.error("SELECT query execution failed", {
       vendor: input.vendor,
       table: input.table,
       error: error instanceof Error ? error.message : String(error),
@@ -7424,7 +7492,7 @@ function isSafeInsertError(error) {
 }
 
 // src/data/relational/tools/relational-insert/executor.ts
-var logger17 = core.createLogger("agentforge:tools:data:relational:insert");
+var logger18 = core.createLogger("agentforge:tools:data:relational:insert");
 function toNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
@@ -7573,7 +7641,7 @@ async function executeInsertInBatchMode(manager, input, context, options) {
       maxRetries: options.maxRetries,
       retryDelayMs: options.retryDelayMs,
       onProgress: (progress) => {
-        logger17.debug("INSERT batch progress", {
+        logger18.debug("INSERT batch progress", {
           vendor: input.vendor,
           table: input.table,
           ...progress
@@ -7586,7 +7654,7 @@ async function executeInsertInBatchMode(manager, input, context, options) {
   const insertedIds = batchResult.results.flatMap((result) => result.insertedIds);
   let benchmark;
   if (options.benchmark) {
-    logger17.warn("INSERT batch benchmark enabled. Synthetic benchmark callbacks are side-effect free and do not execute SQL.", {
+    logger18.warn("INSERT batch benchmark enabled. Synthetic benchmark callbacks are side-effect free and do not execute SQL.", {
       vendor: input.vendor,
       table: input.table,
       totalRows: input.data.length,
@@ -7623,7 +7691,7 @@ async function executeInsertInBatchMode(manager, input, context, options) {
 }
 async function executeInsert(manager, input, context) {
   const startTime = Date.now();
-  logger17.debug("Building INSERT query", {
+  logger18.debug("Building INSERT query", {
     vendor: input.vendor,
     table: input.table,
     isBatch: Array.isArray(input.data),
@@ -7639,7 +7707,7 @@ async function executeInsert(manager, input, context) {
       batchOptions
     ) : await executeInsertOnce(manager, input, context);
     const executionTime = Date.now() - startTime;
-    logger17.debug("INSERT query executed successfully", {
+    logger18.debug("INSERT query executed successfully", {
       vendor: input.vendor,
       table: input.table,
       rowCount: result.rowCount,
@@ -7655,7 +7723,7 @@ async function executeInsert(manager, input, context) {
     };
   } catch (error) {
     const executionTime = Date.now() - startTime;
-    logger17.error("INSERT query execution failed", {
+    logger18.error("INSERT query execution failed", {
       vendor: input.vendor,
       table: input.table,
       error: error instanceof Error ? error.message : String(error),
@@ -7985,7 +8053,7 @@ function isSafeUpdateError(error) {
 }
 
 // src/data/relational/tools/relational-update/executor.ts
-var logger18 = core.createLogger("agentforge:tools:data:relational:update");
+var logger19 = core.createLogger("agentforge:tools:data:relational:update");
 function toNumber2(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
@@ -8107,7 +8175,7 @@ async function executeUpdateInBatchMode(manager, input, context, options) {
       maxRetries: options.maxRetries,
       retryDelayMs: options.retryDelayMs,
       onProgress: (progress) => {
-        logger18.debug("UPDATE batch progress", {
+        logger19.debug("UPDATE batch progress", {
           vendor: input.vendor,
           table: input.table,
           ...progress
@@ -8119,7 +8187,7 @@ async function executeUpdateInBatchMode(manager, input, context, options) {
   const operationFailures = batchResult.results.flatMap((result) => result.failures);
   let benchmark;
   if (options.benchmark) {
-    logger18.warn("UPDATE batch benchmark enabled. Synthetic benchmark callbacks are side-effect free and do not execute SQL.", {
+    logger19.warn("UPDATE batch benchmark enabled. Synthetic benchmark callbacks are side-effect free and do not execute SQL.", {
       vendor: input.vendor,
       table: input.table,
       operationCount: input.operations.length,
@@ -8154,7 +8222,7 @@ async function executeUpdateInBatchMode(manager, input, context, options) {
 }
 async function executeUpdate(manager, input, context) {
   const startTime = Date.now();
-  logger18.debug("Building UPDATE query", {
+  logger19.debug("Building UPDATE query", {
     vendor: input.vendor,
     table: input.table,
     hasWhere: !!input.where?.length,
@@ -8172,7 +8240,7 @@ async function executeUpdate(manager, input, context) {
       batchOptions
     ) : await executeSingleUpdate(manager, input, toSingleUpdateOperation(input), context);
     const executionTime = Date.now() - startTime;
-    logger18.debug("UPDATE query executed successfully", {
+    logger19.debug("UPDATE query executed successfully", {
       vendor: input.vendor,
       table: input.table,
       rowCount: result.rowCount,
@@ -8186,7 +8254,7 @@ async function executeUpdate(manager, input, context) {
     };
   } catch (error) {
     const executionTime = Date.now() - startTime;
-    logger18.error("UPDATE query execution failed", {
+    logger19.error("UPDATE query execution failed", {
       vendor: input.vendor,
       table: input.table,
       error: error instanceof Error ? error.message : String(error),
@@ -8490,7 +8558,7 @@ function isSafeDeleteError(error) {
 }
 
 // src/data/relational/tools/relational-delete/executor.ts
-var logger19 = core.createLogger("agentforge:tools:data:relational:delete");
+var logger20 = core.createLogger("agentforge:tools:data:relational:delete");
 function toNumber3(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
@@ -8611,7 +8679,7 @@ async function executeDeleteInBatchMode(manager, input, context, options) {
       maxRetries: options.maxRetries,
       retryDelayMs: options.retryDelayMs,
       onProgress: (progress) => {
-        logger19.debug("DELETE batch progress", {
+        logger20.debug("DELETE batch progress", {
           vendor: input.vendor,
           table: input.table,
           ...progress
@@ -8624,7 +8692,7 @@ async function executeDeleteInBatchMode(manager, input, context, options) {
   const operationFailures = batchResult.results.flatMap((result) => result.failures);
   let benchmark;
   if (options.benchmark) {
-    logger19.warn("DELETE batch benchmark enabled. Synthetic benchmark callbacks are side-effect free and do not execute SQL.", {
+    logger20.warn("DELETE batch benchmark enabled. Synthetic benchmark callbacks are side-effect free and do not execute SQL.", {
       vendor: input.vendor,
       table: input.table,
       operationCount: input.operations.length,
@@ -8660,7 +8728,7 @@ async function executeDeleteInBatchMode(manager, input, context, options) {
 }
 async function executeDelete(manager, input, context) {
   const startTime = Date.now();
-  logger19.debug("Building DELETE query", {
+  logger20.debug("Building DELETE query", {
     vendor: input.vendor,
     table: input.table,
     hasWhere: !!input.where?.length,
@@ -8679,7 +8747,7 @@ async function executeDelete(manager, input, context) {
       batchOptions
     ) : await executeSingleDelete(manager, input, toSingleDeleteOperation(input), context);
     const executionTime = Date.now() - startTime;
-    logger19.debug("DELETE query executed successfully", {
+    logger20.debug("DELETE query executed successfully", {
       vendor: input.vendor,
       table: input.table,
       rowCount: result.rowCount,
@@ -8695,7 +8763,7 @@ async function executeDelete(manager, input, context) {
     };
   } catch (error) {
     const executionTime = Date.now() - startTime;
-    logger19.error("DELETE query execution failed", {
+    logger20.error("DELETE query execution failed", {
       vendor: input.vendor,
       table: input.table,
       error: error instanceof Error ? error.message : String(error),
@@ -8800,7 +8868,7 @@ function isSafeGetSchemaValidationError(error) {
 }
 
 // src/data/relational/tools/relational-get-schema.ts
-var logger20 = core.createLogger("agentforge:tools:data:relational:get-schema");
+var logger21 = core.createLogger("agentforge:tools:data:relational:get-schema");
 function buildSchemaCacheKey(vendor, connectionString, database) {
   const databaseScope = database ?? "default";
   const connectionHash = crypto.createHash("sha256").update(connectionString).digest("hex");
@@ -8872,7 +8940,7 @@ var relationalGetSchema = core.toolBuilder().name("relational-get-schema").displ
       summary
     };
   } catch (error) {
-    logger20.error("Schema introspection failed", {
+    logger21.error("Schema introspection failed", {
       vendor: input.vendor,
       hasTablesFilter: Array.isArray(input.tables),
       tablesFilterCount: input.tables?.length ?? 0,
@@ -10038,7 +10106,7 @@ var AskHumanInputSchema = zod.z.object({
   suggestions: zod.z.array(zod.z.string()).optional().describe("Suggested responses for the human")
 });
 var logLevel3 = process.env.LOG_LEVEL?.toLowerCase() || core.LogLevel.INFO;
-var logger21 = core.createLogger("agentforge:tools:agent:ask-human", { level: logLevel3 });
+var logger22 = core.createLogger("agentforge:tools:agent:ask-human", { level: logLevel3 });
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
@@ -10103,7 +10171,7 @@ function createAskHumanTool() {
       suggestions: validatedInput.suggestions,
       status: "pending"
     };
-    logger21.debug("About to call interrupt()", {
+    logger22.debug("About to call interrupt()", {
       humanRequest: {
         id: humanRequest.id,
         question: humanRequest.question,
@@ -10119,13 +10187,13 @@ function createAskHumanTool() {
     let response;
     try {
       response = interrupt(humanRequest);
-      logger21.debug("interrupt() returned successfully", {
+      logger22.debug("interrupt() returned successfully", {
         responseType: typeof response,
         hasResponse: response != null,
         ...typeof response === "string" ? { responseLength: response.length } : {}
       });
     } catch (error) {
-      logger21.debug("interrupt() threw error (expected for GraphInterrupt)", {
+      logger22.debug("interrupt() threw error (expected for GraphInterrupt)", {
         ...error && typeof error === "object" && "constructor" in error ? { errorType: error.constructor?.name } : {},
         error: error instanceof Error ? error.message : String(error)
       });