@agentforge/tools 0.18.4 → 0.18.6

package/dist/index.cjs

@@ -3,7 +3,7 @@
 var core = require('@agentforge/core');
 var promises = require('dns/promises');
 var net = require('net');
-var axios11 = require('axios');
+var axios5 = require('axios');
 var zod = require('zod');
 var cheerio = require('cheerio');
 var webApi = require('@slack/web-api');
@@ -41,7 +41,7 @@ function _interopNamespace(e) {
 }
 
 var net__default = /*#__PURE__*/_interopDefault(net);
-var axios11__default = /*#__PURE__*/_interopDefault(axios11);
+var axios5__default = /*#__PURE__*/_interopDefault(axios5);
 var cheerio__namespace = /*#__PURE__*/_interopNamespace(cheerio);
 var neo4j__default = /*#__PURE__*/_interopDefault(neo4j);
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
@@ -229,7 +229,7 @@ async function requestWithDestinationPolicy(config, policy = {}) {
   for (let redirectCount = 0; ; redirectCount += 1) {
     const validatedAddresses = await validateDestinationAllowed(currentUrl, effectivePolicy);
     currentConfig.lookup = createPinnedLookup(validatedAddresses);
-    const response = await axios11__default.default(currentConfig);
+    const response = await axios5__default.default(currentConfig);
     if (!isRedirectStatus(response.status)) return response;
     if (effectivePolicy.allowRedirects === false) blockDestination(currentUrl, "redirect");
     if (redirectCount >= maxRedirects) throw new DestinationPolicyError(currentUrl, "redirect", `Maximum redirect count (${maxRedirects}) exceeded for ${currentUrl}`);
@@ -740,7 +740,7 @@ var DuckDuckGoProvider = class {
   async search(query, maxResults, timeout = DEFAULT_TIMEOUT) {
     try {
       return await retryWithBackoff(async () => {
-        const response = await axios11__default.default.get("https://api.duckduckgo.com/", {
+        const response = await axios5__default.default.get("https://api.duckduckgo.com/", {
           params: {
             q: query,
             format: "json"
@@ -841,7 +841,7 @@ var SerperProvider = class {
     }
     try {
       return await retryWithBackoff(async () => {
-        const response = await axios11__default.default.post(
+        const response = await axios5__default.default.post(
           "https://google.serper.dev/search",
           {
             q: query,
@@ -977,47 +977,33 @@ var webSearch = core.toolBuilder().name("web-search").description(
     };
   }
 }).build();
-function createGetConfiguredSlackClient(token, botName = "AgentForge Bot", botIcon = ":robot_face:") {
-  let configuredClient = null;
-  return function getConfiguredSlackClient() {
-    if (!configuredClient) {
-      const slackToken = token || process.env.SLACK_USER_TOKEN || process.env.SLACK_BOT_TOKEN;
-      if (!slackToken) {
-        throw new Error(
-          "Slack token not configured. Please provide a token in config or set SLACK_USER_TOKEN or SLACK_BOT_TOKEN environment variable."
-        );
+function createLazySlackClient(resolveToken, config, missingTokenError) {
+  let client = null;
+  return () => {
+    const token = resolveToken();
+    if (!client) {
+      if (!token) {
+        throw new Error(missingTokenError);
       }
-      configuredClient = new webApi.WebClient(slackToken);
+      client = new webApi.WebClient(token);
     }
-    return {
-      client: configuredClient,
-      config: {
-        token: token || process.env.SLACK_USER_TOKEN || process.env.SLACK_BOT_TOKEN || "",
-        botName,
-        botIcon
-      }
-    };
+    return { client, config: { token: token || "", ...config } };
   };
 }
-var defaultSlackClient = null;
+function createGetConfiguredSlackClient(token, botName = "AgentForge Bot", botIcon = ":robot_face:") {
+  return createLazySlackClient(
+    () => token || process.env.SLACK_USER_TOKEN || process.env.SLACK_BOT_TOKEN,
+    { botName, botIcon },
+    "Slack token not configured. Please provide a token in config or set SLACK_USER_TOKEN or SLACK_BOT_TOKEN environment variable."
+  );
+}
+var getLazyDefaultSlackClient = createLazySlackClient(
+  () => process.env.SLACK_USER_TOKEN || process.env.SLACK_BOT_TOKEN,
+  { botName: "AgentForge Bot", botIcon: ":robot_face:" },
+  "Slack token not configured. Please set SLACK_USER_TOKEN or SLACK_BOT_TOKEN environment variable."
+);
 function getDefaultSlackClient() {
-  if (!defaultSlackClient) {
-    const token = process.env.SLACK_USER_TOKEN || process.env.SLACK_BOT_TOKEN;
-    if (!token) {
-      throw new Error(
-        "Slack token not configured. Please set SLACK_USER_TOKEN or SLACK_BOT_TOKEN environment variable."
-      );
-    }
-    defaultSlackClient = new webApi.WebClient(token);
-  }
-  return {
-    client: defaultSlackClient,
-    config: {
-      token: process.env.SLACK_USER_TOKEN || process.env.SLACK_BOT_TOKEN || "",
-      botName: "AgentForge Bot",
-      botIcon: ":robot_face:"
-    }
-  };
+  return getLazyDefaultSlackClient();
 }
 function createSendSlackMessageTool(getSlackClient, logger20) {
   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(
@@ -1244,38 +1230,91 @@ function createGetConfiguredAuth(apiKey, email, siteUrl) {
     return { ATLASSIAN_API_KEY, ATLASSIAN_EMAIL, ATLASSIAN_SITE_URL };
   };
 }
-function createGetConfiguredAuthHeader(getConfiguredAuth) {
-  return function getConfiguredAuthHeader() {
-    const { ATLASSIAN_API_KEY, ATLASSIAN_EMAIL } = getConfiguredAuth();
-    const auth2 = Buffer.from(`${ATLASSIAN_EMAIL}:${ATLASSIAN_API_KEY}`).toString("base64");
-    return `Basic ${auth2}`;
-  };
-}
 function getConfig() {
   const ATLASSIAN_API_KEY = process.env.ATLASSIAN_API_KEY || "";
   const ATLASSIAN_EMAIL = process.env.ATLASSIAN_EMAIL || "";
   const ATLASSIAN_SITE_URL = (process.env.ATLASSIAN_SITE_URL || "").replace(/\/$/, "");
   if (!ATLASSIAN_API_KEY || !ATLASSIAN_EMAIL || !ATLASSIAN_SITE_URL) {
-    throw new Error("Confluence credentials not configured. Set ATLASSIAN_API_KEY, ATLASSIAN_EMAIL, and ATLASSIAN_SITE_URL in .env");
+    throw new Error(
+      "Confluence credentials not configured. Set ATLASSIAN_API_KEY, ATLASSIAN_EMAIL, and ATLASSIAN_SITE_URL in .env"
+    );
   }
   return { ATLASSIAN_API_KEY, ATLASSIAN_EMAIL, ATLASSIAN_SITE_URL };
 }
-function getAuthHeader() {
-  const { ATLASSIAN_API_KEY, ATLASSIAN_EMAIL } = getConfig();
-  const auth2 = Buffer.from(`${ATLASSIAN_EMAIL}:${ATLASSIAN_API_KEY}`).toString("base64");
-  return `Basic ${auth2}`;
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
 }
-function createSearchConfluenceTool(getAuth, getAuthHeader2, logger20) {
-  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 }) => {
+function describeError(error) {
+  const errorRecord = isRecord(error) ? error : void 0;
+  const response = isRecord(errorRecord?.response) ? errorRecord.response : void 0;
+  const responseData = isRecord(response?.data) ? response.data : void 0;
+  const providerMessage = typeof responseData?.message === "string" ? responseData.message : void 0;
+  const errorMessage = typeof errorRecord?.message === "string" ? errorRecord.message : void 0;
+  return {
+    message: providerMessage || errorMessage,
+    status: typeof response?.status === "number" ? response.status : void 0
+  };
+}
+function authenticatedConfig(auth2, config = {}) {
+  const credentials = Buffer.from(`${auth2.ATLASSIAN_EMAIL}:${auth2.ATLASSIAN_API_KEY}`).toString(
+    "base64"
+  );
+  return {
+    ...config,
+    headers: {
+      ...config.headers,
+      Authorization: `Basic ${credentials}`
+    }
+  };
+}
+function createConfluenceRequest(getAuth) {
+  return {
+    async get(path13, config = {}) {
+      const auth2 = getAuth();
+      const response = await axios5__default.default.get(
+        `${auth2.ATLASSIAN_SITE_URL}${path13}`,
+        authenticatedConfig(auth2, config)
+      );
+      return { data: response.data, siteUrl: auth2.ATLASSIAN_SITE_URL };
+    },
+    async post(path13, data, config = {}) {
+      const auth2 = getAuth();
+      const response = await axios5__default.default.post(
+        `${auth2.ATLASSIAN_SITE_URL}${path13}`,
+        data,
+        authenticatedConfig(auth2, config)
+      );
+      return { data: response.data, siteUrl: auth2.ATLASSIAN_SITE_URL };
+    },
+    async put(path13, data, config = {}) {
+      const auth2 = getAuth();
+      const response = await axios5__default.default.put(
+        `${auth2.ATLASSIAN_SITE_URL}${path13}`,
+        data,
+        authenticatedConfig(auth2, config)
+      );
+      return { data: response.data, siteUrl: auth2.ATLASSIAN_SITE_URL };
+    },
+    describeError
+  };
+}
+function createSearchConfluenceTool(request2, logger20) {
+  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 }) => {
     logger20.info("search-confluence called", { query, limit });
     try {
-      const { ATLASSIAN_SITE_URL } = getAuth();
-      const response = await axios11__default.default.get(`${ATLASSIAN_SITE_URL}/wiki/rest/api/content/search`, {
+      const response = await request2.get("/wiki/rest/api/content/search", {
         headers: {
-          Authorization: getAuthHeader2(),
           Accept: "application/json"
         },
         params: {
@@ -1284,22 +1323,24 @@ function createSearchConfluenceTool(getAuth, getAuthHeader2, logger20) {
           expand: "space,version"
         }
       });
-      const { ATLASSIAN_SITE_URL: siteUrl } = getAuth();
       const results = response.data.results.map((page) => ({
         id: page.id,
         title: page.title,
         type: page.type,
         space: page.space?.name || "Unknown",
         spaceKey: page.space?.key || "",
-        url: `${siteUrl}/wiki${page._links.webui}`,
+        url: `${response.siteUrl}/wiki${page._links.webui}`,
         lastModified: page.version?.when || ""
       }));
       if (results.length === 0) {
-        logger20.warn("search-confluence returned NO RESULTS - this is a valid outcome, agent should not retry", {
-          query,
-          limit,
-          totalSize: response.data.totalSize
-        });
+        logger20.warn(
+          "search-confluence returned NO RESULTS - this is a valid outcome, agent should not retry",
+          {
+            query,
+            limit,
+            totalSize: response.data.totalSize
+          }
+        );
       } else {
         logger20.info("search-confluence result", {
           query,
@@ -1316,28 +1357,33 @@ function createSearchConfluenceTool(getAuth, getAuthHeader2, logger20) {
         results
       });
     } catch (error) {
+      const description = request2.describeError(error);
       logger20.error("search-confluence error", {
         query,
-        error: error.response?.data?.message || error.message,
-        status: error.response?.status
+        ...description.message !== void 0 ? { error: description.message } : {},
+        ...description.status !== void 0 ? { status: description.status } : {}
       });
       return JSON.stringify({
         success: false,
-        error: error.response?.data?.message || error.message
+        error: description.message
       });
     }
   }).build();
 }
-function createGetConfluencePageTool(getAuth, getAuthHeader2, logger20) {
-  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 }) => {
+function createGetConfluencePageTool(request2, logger20) {
+  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 }) => {
     logger20.info("get-confluence-page called", { page_id });
     try {
-      const { ATLASSIAN_SITE_URL } = getAuth();
-      const response = await axios11__default.default.get(`${ATLASSIAN_SITE_URL}/wiki/rest/api/content/${page_id}`, {
+      const response = await request2.get(`/wiki/rest/api/content/${page_id}`, {
         headers: {
-          Authorization: getAuthHeader2(),
           Accept: "application/json"
         },
         params: {
@@ -1360,35 +1406,40 @@ function createGetConfluencePageTool(getAuth, getAuthHeader2, logger20) {
           space: page.space?.name || "Unknown",
           spaceKey: page.space?.key || "",
           content: page.body?.storage?.value || "",
-          url: `${ATLASSIAN_SITE_URL}/wiki${page._links.webui}`,
+          url: `${response.siteUrl}/wiki${page._links.webui}`,
           created: page.history?.createdDate || "",
           lastModified: page.version?.when || "",
           version: page.version?.number || 1
         }
       });
     } catch (error) {
+      const description = request2.describeError(error);
       logger20.error("get-confluence-page error", {
         page_id,
-        error: error.response?.data?.message || error.message,
-        status: error.response?.status
+        ...description.message !== void 0 ? { error: description.message } : {},
+        ...description.status !== void 0 ? { status: description.status } : {}
       });
       return JSON.stringify({
         success: false,
-        error: error.response?.data?.message || error.message
+        error: description.message
       });
     }
   }).build();
 }
-function createListConfluenceSpacesTool(getAuth, getAuthHeader2, logger20) {
-  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 }) => {
+function createListConfluenceSpacesTool(request2, logger20) {
+  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 }) => {
     logger20.info("list-confluence-spaces called", { limit });
     try {
-      const { ATLASSIAN_SITE_URL } = getAuth();
-      const response = await axios11__default.default.get(`${ATLASSIAN_SITE_URL}/wiki/rest/api/space`, {
+      const response = await request2.get("/wiki/rest/api/space", {
         headers: {
-          Authorization: getAuthHeader2(),
           Accept: "application/json"
         },
         params: {
@@ -1400,7 +1451,7 @@ function createListConfluenceSpacesTool(getAuth, getAuthHeader2, logger20) {
         name: space.name,
         type: space.type,
         description: space.description?.plain?.value || "",
-        url: `${ATLASSIAN_SITE_URL}/wiki${space._links.webui}`
+        url: `${response.siteUrl}/wiki${space._links.webui}`
       }));
       logger20.info("list-confluence-spaces result", {
         spaceCount: spaces.length,
@@ -1413,28 +1464,33 @@ function createListConfluenceSpacesTool(getAuth, getAuthHeader2, logger20) {
         spaces
       });
     } catch (error) {
+      const description = request2.describeError(error);
       logger20.error("list-confluence-spaces error", {
-        error: error.response?.data?.message || error.message,
-        status: error.response?.status
+        ...description.message !== void 0 ? { error: description.message } : {},
+        ...description.status !== void 0 ? { status: description.status } : {}
       });
       return JSON.stringify({
         success: false,
-        error: error.response?.data?.message || error.message
+        error: description.message
       });
     }
   }).build();
 }
-function createGetSpacePagesTool(getAuth, getAuthHeader2, logger20) {
-  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 }) => {
+function createGetSpacePagesTool(request2, logger20) {
+  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 }) => {
     logger20.info("get-space-pages called", { space_key, limit });
     try {
-      const { ATLASSIAN_SITE_URL } = getAuth();
-      const response = await axios11__default.default.get(`${ATLASSIAN_SITE_URL}/wiki/rest/api/content`, {
+      const response = await request2.get("/wiki/rest/api/content", {
         headers: {
-          Authorization: getAuthHeader2(),
           Accept: "application/json"
         },
         params: {
@@ -1447,14 +1503,17 @@ function createGetSpacePagesTool(getAuth, getAuthHeader2, logger20) {
       const pages = response.data.results.map((page) => ({
         id: page.id,
         title: page.title,
-        url: `${ATLASSIAN_SITE_URL}/wiki${page._links.webui}`,
+        url: `${response.siteUrl}/wiki${page._links.webui}`,
         lastModified: page.version?.when || ""
       }));
       if (pages.length === 0) {
-        logger20.warn("get-space-pages returned NO PAGES - this is a valid outcome, agent should not retry", {
-          space_key,
-          limit
-        });
+        logger20.warn(
+          "get-space-pages returned NO PAGES - this is a valid outcome, agent should not retry",
+          {
+            space_key,
+            limit
+          }
+        );
       } else {
         logger20.info("get-space-pages result", {
           space_key,
@@ -1470,28 +1529,38 @@ function createGetSpacePagesTool(getAuth, getAuthHeader2, logger20) {
         pages
       });
     } catch (error) {
+      const description = request2.describeError(error);
       logger20.error("get-space-pages error", {
         space_key,
-        error: error.response?.data?.message || error.message,
-        status: error.response?.status
+        ...description.message !== void 0 ? { error: description.message } : {},
+        ...description.status !== void 0 ? { status: description.status } : {}
       });
       return JSON.stringify({
         success: false,
-        error: error.response?.data?.message || error.message
+        error: description.message
       });
     }
   }).build();
 }
-function createCreateConfluencePageTool(getAuth, getAuthHeader2, logger20) {
-  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 }) => {
-    logger20.info("create-confluence-page called", { space_key, title, hasParent: !!parent_page_id });
+function createCreateConfluencePageTool(request2, logger20) {
+  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 }) => {
+    logger20.info("create-confluence-page called", {
+      space_key,
+      title,
+      hasParent: !!parent_page_id
+    });
     try {
-      const { ATLASSIAN_SITE_URL } = getAuth();
       const pageData = {
         type: "page",
         title,
@@ -1506,16 +1575,11 @@ function createCreateConfluencePageTool(getAuth, getAuthHeader2, logger20) {
       if (parent_page_id) {
         pageData.ancestors = [{ id: parent_page_id }];
       }
-      const response = await axios11__default.default.post(
-        `${ATLASSIAN_SITE_URL}/wiki/rest/api/content`,
-        pageData,
-        {
-          headers: {
-            Authorization: getAuthHeader2(),
-            "Content-Type": "application/json"
-          }
+      const response = await request2.post("/wiki/rest/api/content", pageData, {
+        headers: {
+          "Content-Type": "application/json"
         }
-      );
+      });
       logger20.info("create-confluence-page result", {
         page_id: response.data.id,
         title: response.data.title,
@@ -1527,45 +1591,45 @@ function createCreateConfluencePageTool(getAuth, getAuthHeader2, logger20) {
           id: response.data.id,
           title: response.data.title,
           space: space_key,
-          url: `${ATLASSIAN_SITE_URL}/wiki${response.data._links.webui}`,
+          url: `${response.siteUrl}/wiki${response.data._links.webui}`,
           version: response.data.version?.number || 1
         }
       });
     } catch (error) {
+      const description = request2.describeError(error);
       logger20.error("create-confluence-page error", {
         space_key,
         title,
-        error: error.response?.data?.message || error.message,
-        status: error.response?.status
+        ...description.message !== void 0 ? { error: description.message } : {},
+        ...description.status !== void 0 ? { status: description.status } : {}
       });
       return JSON.stringify({
         success: false,
-        error: error.response?.data?.message || error.message
+        error: description.message
       });
     }
   }).build();
 }
-function createUpdateConfluencePageTool(getAuth, getAuthHeader2, logger20) {
-  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 }) => {
+function createUpdateConfluencePageTool(request2, logger20) {
+  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 }) => {
     logger20.info("update-confluence-page called", { page_id, title });
     try {
-      const { ATLASSIAN_SITE_URL } = getAuth();
-      const getResponse = await axios11__default.default.get(
-        `${ATLASSIAN_SITE_URL}/wiki/rest/api/content/${page_id}`,
-        {
-          headers: {
-            Authorization: getAuthHeader2()
-          },
-          params: { expand: "version" }
-        }
-      );
+      const getResponse = await request2.get(`/wiki/rest/api/content/${page_id}`, {
+        params: { expand: "version" }
+      });
       const currentVersion = getResponse.data.version.number;
-      const updateResponse = await axios11__default.default.put(
-        `${ATLASSIAN_SITE_URL}/wiki/rest/api/content/${page_id}`,
+      const updateResponse = await request2.put(
+        `/wiki/rest/api/content/${page_id}`,
         {
           type: "page",
           title,
@@ -1579,7 +1643,6 @@ function createUpdateConfluencePageTool(getAuth, getAuthHeader2, logger20) {
         },
         {
           headers: {
-            Authorization: getAuthHeader2(),
             "Content-Type": "application/json"
           }
         }
@@ -1595,49 +1658,49 @@ function createUpdateConfluencePageTool(getAuth, getAuthHeader2, logger20) {
         page: {
           id: updateResponse.data.id,
           title: updateResponse.data.title,
-          url: `${ATLASSIAN_SITE_URL}/wiki${updateResponse.data._links.webui}`,
+          url: `${updateResponse.siteUrl}/wiki${updateResponse.data._links.webui}`,
           version: updateResponse.data.version.number,
           previousVersion: currentVersion
         }
       });
     } catch (error) {
+      const description = request2.describeError(error);
       logger20.error("update-confluence-page error", {
         page_id,
         title,
-        error: error.response?.data?.message || error.message,
-        status: error.response?.status
+        ...description.message !== void 0 ? { error: description.message } : {},
+        ...description.status !== void 0 ? { status: description.status } : {}
       });
       return JSON.stringify({
         success: false,
-        error: error.response?.data?.message || error.message
+        error: description.message
       });
     }
   }).build();
 }
-function createArchiveConfluencePageTool(getAuth, getAuthHeader2, logger20) {
-  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 }) => {
+function createArchiveConfluencePageTool(request2, logger20) {
+  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 }) => {
     logger20.info("archive-confluence-page called", {
       page_id,
       ...reason ? { reason } : {}
     });
     try {
-      const { ATLASSIAN_SITE_URL } = getAuth();
-      const getResponse = await axios11__default.default.get(
-        `${ATLASSIAN_SITE_URL}/wiki/rest/api/content/${page_id}`,
-        {
-          headers: {
-            Authorization: getAuthHeader2()
-          },
-          params: { expand: "version,body.storage,space" }
-        }
-      );
+      const getResponse = await request2.get(`/wiki/rest/api/content/${page_id}`, {
+        params: { expand: "version,body.storage,space" }
+      });
       const currentVersion = getResponse.data.version.number;
       const pageData = getResponse.data;
-      await axios11__default.default.put(
-        `${ATLASSIAN_SITE_URL}/wiki/rest/api/content/${page_id}`,
+      await request2.put(
+        `/wiki/rest/api/content/${page_id}`,
         {
           version: { number: currentVersion + 1 },
           title: pageData.title,
@@ -1648,7 +1711,6 @@ function createArchiveConfluencePageTool(getAuth, getAuthHeader2, logger20) {
         },
         {
           headers: {
-            Authorization: getAuthHeader2(),
             "Content-Type": "application/json"
           }
         }
@@ -1671,14 +1733,15 @@ function createArchiveConfluencePageTool(getAuth, getAuthHeader2, logger20) {
         }
       });
     } catch (error) {
+      const description = request2.describeError(error);
       logger20.error("archive-confluence-page error", {
         page_id,
-        error: error.response?.data?.message || error.message,
-        status: error.response?.status
+        ...description.message !== void 0 ? { error: description.message } : {},
+        ...description.status !== void 0 ? { status: description.status } : {}
       });
       return JSON.stringify({
         success: false,
-        error: error.response?.data?.message || error.message
+        error: description.message
       });
     }
   }).build();
@@ -1687,13 +1750,14 @@ function createArchiveConfluencePageTool(getAuth, getAuthHeader2, logger20) {
 // src/web/confluence/index.ts
 var logLevel2 = process.env.LOG_LEVEL?.toLowerCase() || core.LogLevel.INFO;
 var logger2 = core.createLogger("[tools:confluence]", { level: logLevel2 });
-var searchConfluence = createSearchConfluenceTool(getConfig, getAuthHeader, logger2);
-var getConfluencePage = createGetConfluencePageTool(getConfig, getAuthHeader, logger2);
-var listConfluenceSpaces = createListConfluenceSpacesTool(getConfig, getAuthHeader, logger2);
-var getSpacePages = createGetSpacePagesTool(getConfig, getAuthHeader, logger2);
-var createConfluencePage = createCreateConfluencePageTool(getConfig, getAuthHeader, logger2);
-var updateConfluencePage = createUpdateConfluencePageTool(getConfig, getAuthHeader, logger2);
-var archiveConfluencePage = createArchiveConfluencePageTool(getConfig, getAuthHeader, logger2);
+var request = createConfluenceRequest(getConfig);
+var searchConfluence = createSearchConfluenceTool(request, logger2);
+var getConfluencePage = createGetConfluencePageTool(request, logger2);
+var listConfluenceSpaces = createListConfluenceSpacesTool(request, logger2);
+var getSpacePages = createGetSpacePagesTool(request, logger2);
+var createConfluencePage = createCreateConfluencePageTool(request, logger2);
+var updateConfluencePage = createUpdateConfluencePageTool(request, logger2);
+var archiveConfluencePage = createArchiveConfluencePageTool(request, logger2);
 var confluenceTools = [
   // Read tools
   searchConfluence,
@@ -1706,22 +1770,17 @@ var confluenceTools = [
   archiveConfluencePage
 ];
 function createConfluenceTools(config = {}) {
-  const {
-    apiKey,
-    email,
-    siteUrl,
-    logLevel: customLogLevel
-  } = config;
+  const { apiKey, email, siteUrl, logLevel: customLogLevel } = config;
   const getConfiguredAuth = createGetConfiguredAuth(apiKey, email, siteUrl);
-  const getConfiguredAuthHeader = createGetConfiguredAuthHeader(getConfiguredAuth);
+  const request2 = createConfluenceRequest(getConfiguredAuth);
   const toolLogger = customLogLevel ? core.createLogger("tools:confluence", { level: customLogLevel }) : logger2;
-  const searchConfluence2 = createSearchConfluenceTool(getConfiguredAuth, getConfiguredAuthHeader, toolLogger);
-  const getConfluencePage2 = createGetConfluencePageTool(getConfiguredAuth, getConfiguredAuthHeader, toolLogger);
-  const listConfluenceSpaces2 = createListConfluenceSpacesTool(getConfiguredAuth, getConfiguredAuthHeader, toolLogger);
-  const getSpacePages2 = createGetSpacePagesTool(getConfiguredAuth, getConfiguredAuthHeader, toolLogger);
-  const createConfluencePage2 = createCreateConfluencePageTool(getConfiguredAuth, getConfiguredAuthHeader, toolLogger);
-  const updateConfluencePage2 = createUpdateConfluencePageTool(getConfiguredAuth, getConfiguredAuthHeader, toolLogger);
-  const archiveConfluencePage2 = createArchiveConfluencePageTool(getConfiguredAuth, getConfiguredAuthHeader, toolLogger);
+  const searchConfluence2 = createSearchConfluenceTool(request2, toolLogger);
+  const getConfluencePage2 = createGetConfluencePageTool(request2, toolLogger);
+  const listConfluenceSpaces2 = createListConfluenceSpacesTool(request2, toolLogger);
+  const getSpacePages2 = createGetSpacePagesTool(request2, toolLogger);
+  const createConfluencePage2 = createCreateConfluencePageTool(request2, toolLogger);
+  const updateConfluencePage2 = createUpdateConfluencePageTool(request2, toolLogger);
+  const archiveConfluencePage2 = createArchiveConfluencePageTool(request2, toolLogger);
   return {
     searchConfluence: searchConfluence2,
     getConfluencePage: getConfluencePage2,
@@ -1912,14 +1971,14 @@ function createJsonStringifyTool(defaultIndent = 2, defaultPretty = false) {
     };
   }).build();
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function getPathValue(current, part) {
   const arrayMatch = part.match(/^(\w+)\[(\d+)\]$/);
   if (arrayMatch) {
     const [, key, index] = arrayMatch;
-    if (!isRecord(current)) {
+    if (!isRecord2(current)) {
       return void 0;
     }
     const candidate = current[key];
@@ -1928,7 +1987,7 @@ function getPathValue(current, part) {
     }
     return candidate[parseInt(index, 10)];
   }
-  if (!isRecord(current)) {
+  if (!isRecord2(current)) {
     return void 0;
   }
   return current[part];
@@ -2584,7 +2643,7 @@ async function initializeFromEnv() {
 // src/data/neo4j/embeddings/utils.ts
 function withProviderErrorMetadata(error, message) {
   const wrappedError = new Error(message);
-  if (!isRecord2(error)) return wrappedError;
+  if (!isRecord3(error)) return wrappedError;
   if (typeof error.code === "string") wrappedError.code = error.code;
   if (error.response !== void 0) wrappedError.response = error.response;
   return wrappedError;
@@ -2597,12 +2656,12 @@ var DEFAULT_RETRY_CONFIG2 = {
   // 10 seconds
   backoffMultiplier: 2
 };
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null;
 }
 function isRetryableError2(error) {
-  if (!isRecord2(error)) return false;
-  const response = isRecord2(error.response) ? error.response : void 0;
+  if (!isRecord3(error)) return false;
+  const response = isRecord3(error.response) ? error.response : void 0;
   const status = typeof response?.status === "number" ? response.status : void 0;
   const code = typeof error.code === "string" ? error.code : void 0;
   const message = typeof error.message === "string" ? error.message : void 0;
@@ -2728,7 +2787,7 @@ var OpenAIEmbeddingProvider = class {
     const modelToUse = model || this.defaultModel;
     return retryWithBackoff2(async () => {
       try {
-        const response = await axios11__default.default.post(
+        const response = await axios5__default.default.post(
           `${this.baseURL}/embeddings`,
           {
             input: text,
@@ -2758,7 +2817,7 @@ var OpenAIEmbeddingProvider = class {
         };
       } catch (error) {
         let message;
-        const response = axios11__default.default.isAxiosError(error) ? error.response : void 0;
+        const response = axios5__default.default.isAxiosError(error) ? error.response : void 0;
         if (response?.status === 401) {
           message = "Invalid OpenAI API key. Get your key at https://platform.openai.com/api-keys";
         } else if (response?.status === 429) {
@@ -2785,7 +2844,7 @@ var OpenAIEmbeddingProvider = class {
     const modelToUse = model || this.defaultModel;
     return retryWithBackoff2(async () => {
       try {
-        const response = await axios11__default.default.post(
+        const response = await axios5__default.default.post(
           `${this.baseURL}/embeddings`,
           {
             input: texts,
@@ -2816,7 +2875,7 @@ var OpenAIEmbeddingProvider = class {
         };
       } catch (error) {
         let message;
-        const response = axios11__default.default.isAxiosError(error) ? error.response : void 0;
+        const response = axios5__default.default.isAxiosError(error) ? error.response : void 0;
         if (response?.status === 401) {
           message = "Invalid OpenAI API key. Get your key at https://platform.openai.com/api-keys";
         } else if (response?.status === 429) {
@@ -2858,7 +2917,7 @@ var CohereEmbeddingProvider = class {
     const modelToUse = model || this.defaultModel;
     return retryWithBackoff2(async () => {
       try {
-        const response = await axios11__default.default.post(
+        const response = await axios5__default.default.post(
           `${this.baseUrl}/embed`,
           {
             texts,
@@ -2886,7 +2945,7 @@ var CohereEmbeddingProvider = class {
           } : void 0
         };
       } catch (error) {
-        if (axios11__default.default.isAxiosError(error)) {
+        if (axios5__default.default.isAxiosError(error)) {
           const status = error.response?.status;
           const providerMessage = error.response?.data?.message || error.message;
           let message;
@@ -2921,80 +2980,54 @@ var HuggingFaceEmbeddingProvider = class {
     return !!this.apiKey;
   }
   async generateEmbedding(text, model) {
-    const modelToUse = model || this.defaultModel;
-    return retryWithBackoff2(async () => {
-      try {
-        const response = await axios11__default.default.post(
-          `${this.baseUrl}/${modelToUse}`,
-          {
-            inputs: text,
-            options: {
-              wait_for_model: true
-            }
-          },
-          {
-            headers: {
-              "Authorization": `Bearer ${this.apiKey}`,
-              "Content-Type": "application/json"
-            }
-          }
-        );
-        const embedding = Array.isArray(response.data) ? response.data : response.data[0];
-        return {
-          embedding,
-          model: modelToUse,
-          dimensions: embedding.length
-        };
-      } catch (error) {
-        if (axios11__default.default.isAxiosError(error)) {
-          const status = error.response?.status;
-          const message = error.response?.data?.error || error.message;
-          let messageText;
-          if (status === 401) {
-            messageText = `HuggingFace API authentication failed. Please check your HUGGINGFACE_API_KEY. ${message}`;
-          } else if (status === 429) {
-            messageText = `HuggingFace API rate limit exceeded. ${message}`;
-          } else if (status === 400) {
-            messageText = `HuggingFace API request invalid: ${message}`;
-          } else if (status === 503) {
-            messageText = `HuggingFace model is loading. Please retry in a moment. ${message}`;
-          } else {
-            messageText = `HuggingFace API error (${status}): ${message}`;
-          }
-          throw withProviderErrorMetadata(error, messageText);
-        }
-        throw error;
-      }
-    });
+    const { data, model: modelToUse } = await this.requestEmbeddings(
+      text,
+      model
+    );
+    const embedding = Array.isArray(data) ? data : data[0];
+    return {
+      embedding,
+      model: modelToUse,
+      dimensions: embedding.length
+    };
   }
   async generateBatchEmbeddings(texts, model) {
+    const { data: embeddings, model: modelToUse } = await this.requestEmbeddings(
+      texts,
+      model
+    );
+    const dimensions = embeddings[0]?.length || 0;
+    return {
+      embeddings,
+      model: modelToUse,
+      dimensions
+    };
+  }
+  async requestEmbeddings(inputs, model) {
     const modelToUse = model || this.defaultModel;
     return retryWithBackoff2(async () => {
       try {
-        const response = await axios11__default.default.post(
+        const response = await axios5__default.default.post(
           `${this.baseUrl}/${modelToUse}`,
           {
-            inputs: texts,
+            inputs,
             options: {
               wait_for_model: true
             }
           },
           {
             headers: {
-              "Authorization": `Bearer ${this.apiKey}`,
+              Authorization: `Bearer ${this.apiKey}`,
               "Content-Type": "application/json"
             }
           }
         );
-        const embeddings = response.data;
-        const dimensions = embeddings[0]?.length || 0;
         return {
-          embeddings,
-          model: modelToUse,
-          dimensions
+          data: response.data,
+          model: modelToUse
         };
       } catch (error) {
-        if (axios11__default.default.isAxiosError(error)) {
+        if (axios5__default.default.isAxiosError(error)) {
           const status = error.response?.status;
           const message = error.response?.data?.error || error.message;
           let messageText;
@@ -3043,7 +3076,7 @@ var VoyageEmbeddingProvider = class {
     const modelToUse = model || this.defaultModel;
     return retryWithBackoff2(async () => {
       try {
-        const response = await axios11__default.default.post(
+        const response = await axios5__default.default.post(
           `${this.baseUrl}/embeddings`,
           {
             input: texts,
@@ -3070,7 +3103,7 @@ var VoyageEmbeddingProvider = class {
           } : void 0
         };
       } catch (error) {
-        if (axios11__default.default.isAxiosError(error)) {
+        if (axios5__default.default.isAxiosError(error)) {
           const status = error.response?.status;
           const message = error.response?.data?.message || error.message;
           let messageText;
@@ -3107,7 +3140,7 @@ var OllamaEmbeddingProvider = class {
     const modelToUse = model || this.defaultModel;
     return retryWithBackoff2(async () => {
       try {
-        const response = await axios11__default.default.post(
+        const response = await axios5__default.default.post(
           `${this.baseUrl}/api/embeddings`,
           {
             model: modelToUse,
@@ -3126,7 +3159,7 @@ var OllamaEmbeddingProvider = class {
           dimensions: embedding.length
         };
       } catch (error) {
-        if (axios11__default.default.isAxiosError(error)) {
+        if (axios5__default.default.isAxiosError(error)) {
           const status = error.response?.status;
           const message = error.response?.data?.error || error.message;
           let messageText;
@@ -3519,6 +3552,16 @@ function formatResults(records) {
   });
 }
 
+// src/data/neo4j/tools/session-owner.ts
+async function withNeo4jSession(database, operation) {
+  const session = neo4jPool.getSession(database);
+  try {
+    return await operation(session);
+  } finally {
+    await session.close();
+  }
+}
+
 // src/data/neo4j/tools/neo4j-query.ts
 var logger4 = core.createLogger("agentforge:tools:neo4j:query");
 function createNeo4jQueryTool() {
@@ -3539,8 +3582,7 @@ function createNeo4jQueryTool() {
       ...input.database ? { database: input.database } : {}
     });
     try {
-      const session = neo4jPool.getSession(input.database);
-      try {
+      return await withNeo4jSession(input.database, async (session) => {
         const result = await session.run(input.cypher, input.parameters || {});
         const formattedResults = formatResults(result.records);
         const duration = Date.now() - startTime;
@@ -3569,9 +3611,7 @@ function createNeo4jQueryTool() {
             }
           }
         };
-      } finally {
-        await session.close();
-      }
+      });
     } catch (error) {
       const duration = Date.now() - startTime;
       const errorMessage = error instanceof Error ? error.message : "Failed to execute query";
@@ -3599,8 +3639,7 @@ function createNeo4jGetSchemaTool() {
       };
     }
     try {
-      const session = neo4jPool.getSession(input.database);
-      try {
+      return await withNeo4jSession(input.database, async (session) => {
         const labelsResult = await session.run("CALL db.labels()");
         const nodeLabels = labelsResult.records.map((r) => r.get("label"));
         const relTypesResult = await session.run("CALL db.relationshipTypes()");
@@ -3640,9 +3679,7 @@ function createNeo4jGetSchemaTool() {
             totalIndexes: indexes.length
           }
         };
-      } finally {
-        await session.close();
-      }
+      });
     } catch (error) {
       return {
         success: false,
@@ -3721,8 +3758,7 @@ function createNeo4jFindNodesTool() {
     }
     try {
       const safeLabel = validateLabel(input.label);
-      const session = neo4jPool.getSession(input.database);
-      try {
+      return await withNeo4jSession(input.database, async (session) => {
         let cypher = `MATCH (n:${safeLabel})`;
         let parameters = {};
         if (input.properties && Object.keys(input.properties).length > 0) {
@@ -3744,9 +3780,7 @@ function createNeo4jFindNodesTool() {
             limit: input.limit
           }
         };
-      } finally {
-        await session.close();
-      }
+      });
     } catch (error) {
       return {
         success: false,
@@ -3772,8 +3806,7 @@ function createNeo4jTraverseTool() {
     try {
       const safeDirection = validateDirection(input.direction || "outgoing");
       const safeRelType = input.relationshipType ? validateRelationshipType(input.relationshipType) : null;
-      const session = neo4jPool.getSession(input.database);
-      try {
+      return await withNeo4jSession(input.database, async (session) => {
         let relPattern = "";
         if (safeDirection === "OUTGOING") {
           relPattern = safeRelType ? `-[r:${safeRelType}*1..${input.maxDepth}]->` : `-[r*1..${input.maxDepth}]->`;
@@ -3810,9 +3843,7 @@ function createNeo4jTraverseTool() {
             maxDepth: input.maxDepth
           }
         };
-      } finally {
-        await session.close();
-      }
+      });
     } catch (error) {
       return {
         success: false,
@@ -3837,8 +3868,7 @@ function createNeo4jVectorSearchTool() {
       };
     }
     try {
-      const session = neo4jPool.getSession(input.database);
-      try {
+      return await withNeo4jSession(input.database, async (session) => {
         const cypher = `
             CALL db.index.vector.queryNodes($indexName, $limit, $queryVector)
             YIELD node, score
@@ -3865,9 +3895,7 @@ function createNeo4jVectorSearchTool() {
             limit: input.limit
           }
         };
-      } finally {
-        await session.close();
-      }
+      });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Failed to perform vector search";
       let helpText = "";
@@ -3913,8 +3941,7 @@ function createNeo4jVectorSearchWithEmbeddingTool() {
     });
     try {
       const embeddingResult = await embeddingManager.generateEmbedding(input.queryText, input.model);
-      const session = neo4jPool.getSession(input.database);
-      try {
+      return await withNeo4jSession(input.database, async (session) => {
         const cypher = `
             CALL db.index.vector.queryNodes($indexName, $limit, $queryVector)
             YIELD node, score
@@ -3956,9 +3983,7 @@ function createNeo4jVectorSearchWithEmbeddingTool() {
             usage: embeddingResult.usage
           }
         };
-      } finally {
-        await session.close();
-      }
+      });
     } catch (error) {
       const duration = Date.now() - startTime;
       const errorMessage = error instanceof Error ? error.message : "Failed to perform vector search with embedding";
@@ -4014,8 +4039,7 @@ function createNeo4jCreateNodeWithEmbeddingTool() {
       const embeddingResult = await embeddingManager.generateEmbedding(textToEmbed, input.model);
       const safeLabel = validateLabel(input.label);
       const safeEmbeddingProp = validatePropertyKey(input.embeddingProperty || "embedding");
-      const session = neo4jPool.getSession(input.database);
-      try {
+      return await withNeo4jSession(input.database, async (session) => {
         const allProperties = {
           ...input.properties
         };
@@ -4049,9 +4073,7 @@ function createNeo4jCreateNodeWithEmbeddingTool() {
           },
           message: `Created node with label '${input.label}' and ${embeddingResult.dimensions}-dimensional embedding`
         };
-      } finally {
-        await session.close();
-      }
+      });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Failed to create node with embedding";
       let helpText = "";
@@ -7139,15 +7161,6 @@ function formatTableName(table) {
   return table.schema ? `${table.schema}.${table.name}` : table.name;
 }
 
-// src/data/relational/schema/type-mapper-normalization.ts
-function normaliseDbType(raw) {
-  let type = raw.toLowerCase().trim();
-  type = type.replace(/\[\]$/, "");
-  type = type.replace(/\([\d,\s]+\)/, "");
-  type = type.replace(/\s+unsigned$/, "");
-  return type.trim();
-}
-
 // src/data/relational/schema/type-mapper-vendor-maps.ts
 var POSTGRES_TYPE_MAP = {
   smallint: "number",
@@ -7323,6 +7336,13 @@ function getVendorTypeMap(vendor) {
 function usesStringPrecisionFallback(vendor, normalised) {
   return (normalised === "bigint" || normalised === "int8" || normalised === "bigserial") && (vendor === "postgresql" || vendor === "mysql");
 }
+function normaliseDbType(raw) {
+  let type = raw.toLowerCase().trim();
+  type = type.replace(/\[\]$/, "");
+  type = type.replace(/\([\d,\s]+\)/, "");
+  type = type.replace(/\s+unsigned$/, "");
+  return type.trim();
+}
 var logger14 = core.createLogger("agentforge:tools:data:relational:schema-diff");
 function diffSchemas(before, after) {
   const tableDiffs = [];
@@ -10338,49 +10358,57 @@ var fileSearchSchema = zod.z.object({
   recursive: zod.z.boolean().default(true).describe("Search in subdirectories"),
   caseSensitive: zod.z.boolean().default(false).describe("Case-sensitive pattern matching")
 });
+async function* traverseDirectory(directory, recursive) {
+  const entries = await fs.promises.readdir(directory, { withFileTypes: true });
+  for (const entry of entries) {
+    const fullPath = path__namespace.join(directory, entry.name);
+    const isDirectory = entry.isDirectory();
+    yield {
+      name: entry.name,
+      fullPath,
+      isFile: entry.isFile(),
+      isDirectory
+    };
+    if (recursive && isDirectory) {
+      yield* traverseDirectory(fullPath, true);
+    }
+  }
+}
+
+// src/file/directory/tools/directory-list.ts
 function createDirectoryListTool(defaultRecursive = false, defaultIncludeDetails = false, policy = DEFAULT_FILE_SYSTEM_POLICY) {
   return core.toolBuilder().name("directory-list").description("List all files and directories in a directory. Can optionally include file details and filter by extension.").category(core.ToolCategory.FILE_SYSTEM).tags(["directory", "list", "files", "filesystem"]).schema(directoryListSchema).implementSafe(async (input) => {
     const safePath = await policy.resolvePath(input.path, "directory listing");
     const includeDetails = input.includeDetails ?? defaultIncludeDetails;
-    const listFiles = async (dir, recursive2) => {
-      const entries = await fs.promises.readdir(dir, { withFileTypes: true });
-      const files2 = [];
-      for (const entry of entries) {
-        const fullPath = path__namespace.join(dir, entry.name);
-        const relativePath = path__namespace.relative(safePath, fullPath);
-        if (input.extension && !entry.name.endsWith(input.extension)) {
-          if (!entry.isDirectory() || !recursive2) {
-            continue;
-          }
-        }
-        if (includeDetails) {
-          const stats = await fs.promises.lstat(fullPath);
-          files2.push({
-            name: entry.name,
-            path: relativePath,
-            fullPath,
-            isFile: entry.isFile(),
-            isDirectory: entry.isDirectory(),
-            size: stats.size,
-            modified: stats.mtime.toISOString()
-          });
-        } else {
-          files2.push({
-            name: entry.name,
-            path: relativePath,
-            isFile: entry.isFile(),
-            isDirectory: entry.isDirectory()
-          });
-        }
-        if (recursive2 && entry.isDirectory()) {
-          const subFiles = await listFiles(fullPath, true);
-          files2.push(...subFiles);
+    const recursive = input.recursive ?? defaultRecursive;
+    const files = [];
+    for await (const entry of traverseDirectory(safePath, recursive)) {
+      const relativePath = path__namespace.relative(safePath, entry.fullPath);
+      if (input.extension && !entry.name.endsWith(input.extension)) {
+        if (!entry.isDirectory || !recursive) {
+          continue;
         }
       }
-      return files2;
-    };
-    const recursive = input.recursive ?? defaultRecursive;
-    const files = await listFiles(safePath, recursive);
+      if (includeDetails) {
+        const stats = await fs.promises.lstat(entry.fullPath);
+        files.push({
+          name: entry.name,
+          path: relativePath,
+          fullPath: entry.fullPath,
+          isFile: entry.isFile,
+          isDirectory: entry.isDirectory,
+          size: stats.size,
+          modified: stats.mtime.toISOString()
+        });
+      } else {
+        files.push({
+          name: entry.name,
+          path: relativePath,
+          isFile: entry.isFile,
+          isDirectory: entry.isDirectory
+        });
+      }
+    }
     const result = {
       path: input.path,
       files,
@@ -10416,24 +10444,14 @@ function createFileSearchTool(defaultRecursive = true, defaultCaseSensitive = fa
     const recursive = input.recursive ?? defaultRecursive;
     const caseSensitive = input.caseSensitive ?? defaultCaseSensitive;
     const safeDirectory = await policy.resolvePath(input.directory, "file search");
-    const searchFiles = async (dir) => {
-      const entries = await fs.promises.readdir(dir, { withFileTypes: true });
-      const matches2 = [];
-      const regexPattern = input.pattern.replace(/\./g, "\\.").replace(/\*/g, ".*");
-      const regex = new RegExp(`^${regexPattern}$`, caseSensitive ? "" : "i");
-      for (const entry of entries) {
-        const fullPath = path__namespace.join(dir, entry.name);
-        if (entry.isFile() && regex.test(entry.name)) {
-          matches2.push(fullPath);
-        }
-        if (recursive && entry.isDirectory()) {
-          const subMatches = await searchFiles(fullPath);
-          matches2.push(...subMatches);
-        }
+    const regexPattern = input.pattern.replace(/\./g, "\\.").replace(/\*/g, ".*");
+    const regex = new RegExp(`^${regexPattern}$`, caseSensitive ? "" : "i");
+    const matches = [];
+    for await (const entry of traverseDirectory(safeDirectory, recursive)) {
+      if (entry.isFile && regex.test(entry.name)) {
+        matches.push(entry.fullPath);
       }
-      return matches2;
-    };
-    const matches = await searchFiles(safeDirectory);
+    }
     return {
       directory: input.directory,
       pattern: input.pattern,
@@ -11395,11 +11413,11 @@ var AskHumanInputSchema = zod.z.object({
 });
 var logLevel3 = process.env.LOG_LEVEL?.toLowerCase() || core.LogLevel.INFO;
 var logger19 = core.createLogger("agentforge:tools:agent:ask-human", { level: logLevel3 });
-function isRecord3(value) {
+function isRecord4(value) {
   return typeof value === "object" && value !== null;
 }
 function resolveInterrupt(module) {
-  if (!isRecord3(module)) {
+  if (!isRecord4(module)) {
     return void 0;
   }
   const candidate = module.interrupt;