@atlassian-dc-mcp/confluence 0.12.2 → 0.13.0

package/build/confluence-service.js

@@ -1,6 +1,8 @@
 import { z } from 'zod';
 import { ContentResourceService, OpenAPI, SearchService } from './confluence-client/index.js';
 import { handleApiOperation } from '@atlassian-dc-mcp/common';
+import { getDefaultPageSize, getMissingConfig } from './config.js';
+import { shapeConfluenceContent } from './confluence-response-mapper.js';
 /**
  * Escapes user input for safe use inside a CQL quoted string.
  * Escapes backslash first, then double quote, so that neither can break out of the phrase.
@@ -9,14 +11,24 @@ import { handleApiOperation } from '@atlassian-dc-mcp/common';
 export function escapeSearchTextForCql(searchText) {
     return searchText.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 }
+function resolveToken(token, missingTokenMessage) {
+    return async () => {
+        const resolvedToken = typeof token === 'function' ? token() : token;
+        if (!resolvedToken) {
+            throw new Error(missingTokenMessage);
+        }
+        return resolvedToken;
+    };
+}
 export class ConfluenceService {
+    getPageSize;
     /**
      * Creates a new ConfluenceService instance
      * @param host The hostname of the Confluence server (e.g., "host.com")
      * @param token The API token for authentication
      * @param fullApiUrl Optional full API URL (e.g., "https://host.com/wiki/"). If provided, host and apiBasePath are ignored.
      */
-    constructor(host, token, fullApiUrl) {
+    constructor(host, token, fullApiUrl, getPageSize = getDefaultPageSize) {
         if (fullApiUrl) {
             OpenAPI.BASE = fullApiUrl;
         }
@@ -26,21 +38,32 @@ export class ConfluenceService {
         else {
             throw new Error('Either host or fullApiUrl must be provided');
         }
-        OpenAPI.TOKEN = token;
+        OpenAPI.TOKEN = resolveToken(token, 'Missing required environment variable: CONFLUENCE_API_TOKEN');
         OpenAPI.VERSION = '1.0';
+        this.getPageSize = getPageSize;
     }
     /**
      * Get a Confluence page by ID
      * @param contentId The ID of the page to retrieve
      * @param expand Optional comma-separated list of properties to expand
      */
-    async getContent(contentId, expand) {
+    async getContentRaw(contentId, expand) {
         const expandValue = expand || 'body.storage';
         const finalExpand = expand && !expand.includes('body.storage')
             ? `${expand},body.storage`
             : expandValue;
         return handleApiOperation(() => ContentResourceService.getContentById(contentId, finalExpand), 'Error getting content');
     }
+    async getContent(contentId, expand, bodyMode = 'storage', maxBodyChars) {
+        const result = await this.getContentRaw(contentId, expand);
+        if (result.success && result.data) {
+            return {
+                ...result,
+                data: shapeConfluenceContent(result.data, bodyMode, maxBodyChars),
+            };
+        }
+        return result;
+    }
     /**
      * Search for content in Confluence using CQL
      * @param cql Confluence Query Language string
@@ -48,8 +71,8 @@ export class ConfluenceService {
      * @param start Start index for pagination
      * @param expand Optional comma-separated list of properties to expand
      */
-    async searchContent(cql, limit, start, expand) {
-        return handleApiOperation(() => SearchService.search1(undefined, expand, undefined, limit?.toString(), start?.toString(), undefined, cql), 'Error searching for content');
+    async searchContent(cql, limit, start, expand, excerpt = 'none') {
+        return handleApiOperation(() => SearchService.search1(undefined, expand, undefined, (limit ?? this.getPageSize()).toString(), start?.toString(), excerpt, cql), 'Error searching for content');
     }
     /**
      * Create a new page in Confluence
@@ -73,56 +96,53 @@ export class ConfluenceService {
      * @param start Start index for pagination
      * @param expand Optional comma-separated list of properties to expand
      */
-    async searchSpaces(searchText, limit, start, expand) {
+    async searchSpaces(searchText, limit, start, expand, excerpt = 'none') {
         // Create a CQL query that searches for spaces
         // The correct syntax for space search is: type=space AND title ~ "searchText"
         const escapedSearchText = escapeSearchTextForCql(searchText);
         const cql = `type=space AND title ~ "${escapedSearchText}"`;
-        return handleApiOperation(() => SearchService.search1(undefined, expand, undefined, limit?.toString(), start?.toString(), undefined, cql), 'Error searching for spaces');
+        return handleApiOperation(() => SearchService.search1(undefined, expand, undefined, (limit ?? this.getPageSize()).toString(), start?.toString(), excerpt, cql), 'Error searching for spaces');
     }
     static validateConfig() {
-        const missingVars = [];
-        // API token is always required
-        if (!process.env.CONFLUENCE_API_TOKEN) {
-            missingVars.push('CONFLUENCE_API_TOKEN');
-        }
-        // Either CONFLUENCE_HOST or CONFLUENCE_API_BASE_PATH must be set
-        if (!process.env.CONFLUENCE_HOST && !process.env.CONFLUENCE_API_BASE_PATH) {
-            missingVars.push('CONFLUENCE_HOST or CONFLUENCE_API_BASE_PATH');
-        }
-        return missingVars;
+        return getMissingConfig();
     }
 }
 export const confluenceToolSchemas = {
     getContent: {
         contentId: z.string().describe("Confluence Data Center content ID"),
-        expand: z.string().optional().describe("Comma-separated list of properties to expand")
+        expand: z.string().optional().describe("Comma-separated list of properties to expand"),
+        bodyMode: z.enum(['storage', 'text', 'none']).optional().describe("How to return the page body. Defaults to storage for backward compatibility."),
+        maxBodyChars: z.number().optional().describe("Maximum number of characters to keep when bodyMode is text")
     },
     searchContent: {
         cql: z.string().describe("Confluence Query Language (CQL) search string for Confluence Data Center"),
         limit: z.number().optional().describe("Maximum number of results to return"),
         start: z.number().optional().describe("Start index for pagination"),
-        expand: z.string().optional().describe("Comma-separated list of properties to expand")
+        expand: z.string().optional().describe("Comma-separated list of properties to expand"),
+        excerpt: z.enum(['none', 'highlight']).optional().describe("Excerpt mode for search results. Defaults to none.")
     },
     createContent: {
         title: z.string().describe("Title of the content"),
         spaceKey: z.string().describe("Space key where content will be created"),
         type: z.string().default("page").describe("Content type (page, blogpost, etc)"),
         content: z.string().describe("Content body in Confluence Data Center \"storage\" format (confluence XML)"),
-        parentId: z.string().optional().describe("ID of the parent page (if creating a child page)")
+        parentId: z.string().optional().describe("ID of the parent page (if creating a child page)"),
+        output: z.enum(['ack', 'full']).optional().describe("Return a compact acknowledgement or the full API response. Defaults to ack.")
     },
     updateContent: {
         contentId: z.string().describe("ID of the content to update"),
         title: z.string().optional().describe("New title of the content"),
         content: z.string().optional().describe("New content body in Confluence Data Center storage format (XML-based)"),
         version: z.number().describe("New version number (must be incremented)"),
-        versionComment: z.string().optional().describe("Comment for this version")
+        versionComment: z.string().optional().describe("Comment for this version"),
+        output: z.enum(['ack', 'full']).optional().describe("Return a compact acknowledgement or the full API response. Defaults to ack.")
     },
     searchSpaces: {
         searchText: z.string().describe("Text to search for in Confluence Data Center space names or descriptions. Quotes and backslashes are escaped for CQL; pass the literal search phrase only (do not pre-escape)."),
         limit: z.number().optional().describe("Maximum number of results to return"),
         start: z.number().optional().describe("Start index for pagination"),
-        expand: z.string().optional().describe("Comma-separated list of properties to expand")
+        expand: z.string().optional().describe("Comma-separated list of properties to expand"),
+        excerpt: z.enum(['none', 'highlight']).optional().describe("Excerpt mode for search results. Defaults to none.")
     }
 };
 //# sourceMappingURL=confluence-service.js.map

package/build/confluence-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"confluence-service.js","sourceRoot":"","sources":["../src/confluence-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"confluence-service.js","sourceRoot":"","sources":["../src/confluence-service.ts"],"names":[],"mappings":"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"}

package/build/index.js

@@ -1,15 +1,16 @@
-import { connectServer, createMcpServer, formatToolResponse } from '@atlassian-dc-mcp/common';
+import { connectServer, createMcpServer, formatToolResponse, initializeRuntimeConfig } from '@atlassian-dc-mcp/common';
 import { ConfluenceService, confluenceToolSchemas } from './confluence-service.js';
-import dotenv from 'dotenv';
-// Load environment variables
-dotenv.config();
+import { shapeConfluenceMutationAck } from './confluence-response-mapper.js';
+import { getConfluenceRuntimeConfig, getDefaultPageSize } from './config.js';
+initializeRuntimeConfig();
 // Validate required environment variables
 const missingEnvVars = ConfluenceService.validateConfig();
 if (missingEnvVars.length > 0) {
     throw new Error(`Missing required environment variables: ${missingEnvVars.join(', ')}`);
 }
 // Initialize Confluence service
-const confluenceService = new ConfluenceService(process.env.CONFLUENCE_API_BASE_PATH ? undefined : process.env.CONFLUENCE_HOST, process.env.CONFLUENCE_API_TOKEN, process.env.CONFLUENCE_API_BASE_PATH);
+const confluenceConfig = getConfluenceRuntimeConfig();
+const confluenceService = new ConfluenceService(confluenceConfig.host, () => getConfluenceRuntimeConfig().token, confluenceConfig.apiBasePath, getDefaultPageSize);
 // Define Confluence instance type
 const confluenceInstanceType = "Confluence Data Center edition instance";
 // Initialize MCP server
@@ -18,15 +19,15 @@ const server = createMcpServer({
     version: "1.0.0"
 });
 // Add Confluence content tools
-server.tool("confluence_getContent", `Get Confluence content by ID from the ${confluenceInstanceType}`, confluenceToolSchemas.getContent, async ({ contentId, expand }) => {
-    const result = await confluenceService.getContent(contentId, expand);
+server.tool("confluence_getContent", `Get Confluence content by ID from the ${confluenceInstanceType}`, confluenceToolSchemas.getContent, async ({ contentId, expand, bodyMode, maxBodyChars }) => {
+    const result = await confluenceService.getContent(contentId, expand, bodyMode, maxBodyChars);
     return formatToolResponse(result);
 });
-server.tool("confluence_searchContent", `Search for content in ${confluenceInstanceType} using CQL`, confluenceToolSchemas.searchContent, async ({ cql, limit, start, expand }) => {
-    const result = await confluenceService.searchContent(cql, limit, start, expand);
+server.tool("confluence_searchContent", `Search for content in ${confluenceInstanceType} using CQL`, confluenceToolSchemas.searchContent, async ({ cql, limit, start, expand, excerpt }) => {
+    const result = await confluenceService.searchContent(cql, limit, start, expand, excerpt);
     return formatToolResponse(result);
 });
-server.tool("confluence_createContent", `Create new content in ${confluenceInstanceType}`, confluenceToolSchemas.createContent, async ({ title, spaceKey, type, content, parentId }) => {
+server.tool("confluence_createContent", `Create new content in ${confluenceInstanceType}`, confluenceToolSchemas.createContent, async ({ title, spaceKey, type, content, parentId, output }) => {
     const contentObj = {
         type: type || 'page',
         title,
@@ -43,11 +44,17 @@ server.tool("confluence_createContent", `Create new content in ${confluenceInsta
         contentObj.ancestors = [{ id: parentId }];
     }
     const result = await confluenceService.createContent(contentObj);
+    if (result.success && result.data && output !== 'full') {
+        return formatToolResponse({
+            ...result,
+            data: shapeConfluenceMutationAck(result.data),
+        });
+    }
     return formatToolResponse(result);
 });
-server.tool("confluence_updateContent", `Update existing content in ${confluenceInstanceType}`, confluenceToolSchemas.updateContent, async ({ contentId, title, content, version, versionComment }) => {
+server.tool("confluence_updateContent", `Update existing content in ${confluenceInstanceType}`, confluenceToolSchemas.updateContent, async ({ contentId, title, content, version, versionComment, output }) => {
     // First get the current content to build upon
-    const currentContent = await confluenceService.getContent(contentId);
+    const currentContent = await confluenceService.getContentRaw(contentId);
     if (!currentContent.success || !currentContent.data) {
         return formatToolResponse({
             success: false,
@@ -76,10 +83,16 @@ server.tool("confluence_updateContent", `Update existing content in ${confluence
         };
     }
     const result = await confluenceService.updateContent(contentId, updateObj);
+    if (result.success && result.data && output !== 'full') {
+        return formatToolResponse({
+            ...result,
+            data: shapeConfluenceMutationAck(result.data),
+        });
+    }
     return formatToolResponse(result);
 });
-server.tool('confluence_searchSpace', `Search for spaces in ${confluenceInstanceType}`, confluenceToolSchemas.searchSpaces, async ({ searchText, limit, start, expand }) => {
-    const result = await confluenceService.searchSpaces(searchText, limit, start, expand);
+server.tool('confluence_searchSpace', `Search for spaces in ${confluenceInstanceType}`, confluenceToolSchemas.searchSpaces, async ({ searchText, limit, start, expand, excerpt }) => {
+    const result = await confluenceService.searchSpaces(searchText, limit, start, expand, excerpt);
     return formatToolResponse(result);
 });
 await connectServer(server);

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACvH,OAAO,EAAE,iBAAiB,EAAqB,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACtG,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE7E,uBAAuB,EAAE,CAAC;AAE1B,0CAA0C;AAC1C,MAAM,cAAc,GAAG,iBAAiB,CAAC,cAAc,EAAE,CAAC;AAC1D,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;IAC9B,MAAM,IAAI,KAAK,CAAC,2CAA2C,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC1F,CAAC;AAED,gCAAgC;AAChC,MAAM,gBAAgB,GAAG,0BAA0B,EAAE,CAAC;AACtD,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAC7C,gBAAgB,CAAC,IAAI,EACrB,GAAG,EAAE,CAAC,0BAA0B,EAAE,CAAC,KAAK,EACxC,gBAAgB,CAAC,WAAW,EAC5B,kBAAkB,CACnB,CAAC;AAEF,kCAAkC;AAClC,MAAM,sBAAsB,GAAG,yCAAyC,CAAC;AAEzE,wBAAwB;AACxB,MAAM,MAAM,GAAG,eAAe,CAAC;IAC7B,IAAI,EAAE,0BAA0B;IAChC,OAAO,EAAE,OAAO;CACjB,CAAC,CAAC;AAEH,+BAA+B;AAC/B,MAAM,CAAC,IAAI,CACT,uBAAuB,EACvB,yCAAyC,sBAAsB,EAAE,EACjE,qBAAqB,CAAC,UAAU,EAChC,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE;IACtD,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC7F,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,0BAA0B,EAC1B,yBAAyB,sBAAsB,YAAY,EAC3D,qBAAqB,CAAC,aAAa,EACnC,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;IAC/C,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACzF,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,0BAA0B,EAC1B,yBAAyB,sBAAsB,EAAE,EACjD,qBAAqB,CAAC,aAAa,EACnC,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE;IAC7D,MAAM,UAAU,GAAsB;QACpC,IAAI,EAAE,IAAI,IAAI,MAAM;QACpB,KAAK;QACL,KAAK,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;QACxB,IAAI,EAAE;YACJ,OAAO,EAAE;gBACP,KAAK,EAAE,OAAO;gBACd,cAAc,EAAE,SAAS;aAC1B;SACF;KACF,CAAC;IAEF,2CAA2C;IAC3C,IAAI,QAAQ,EAAE,CAAC;QACb,UAAU,CAAC,SAAS,GAAG,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACjE,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACvD,OAAO,kBAAkB,CAAC;YACxB,GAAG,MAAM;YACT,IAAI,EAAE,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,0BAA0B,EAC1B,8BAA8B,sBAAsB,EAAE,EACtD,qBAAqB,CAAC,aAAa,EACnC,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,EAAE;IACvE,8CAA8C;IAC9C,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAExE,IAAI,CAAC,cAAc,CAAC,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACpD,OAAO,kBAAkB,CAAC;YACxB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,sCAAsC,SAAS,KAAK,cAAc,CAAC,KAAK,IAAI,eAAe,EAAE;SACrG,CAAC,CAAC;IACL,CAAC;IAED,6DAA6D;IAC7D,MAAM,WAAW,GAAG,cAAc,CAAC,IAIlC,CAAC;IAEF,MAAM,SAAS,GAAsB;QACnC,EAAE,EAAE,SAAS;QACb,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,KAAK,EAAE,KAAK,IAAI,WAAW,CAAC,KAAK;QACjC,KAAK,EAAE,WAAW,CAAC,KAAK;QACxB,OAAO,EAAE;YACP,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,cAAc;SACxB;KACF,CAAC;IAEF,0CAA0C;IAC1C,IAAI,OAAO,EAAE,CAAC;QACZ,SAAS,CAAC,IAAI,GAAG;YACf,OAAO,EAAE;gBACP,KAAK,EAAE,OAAO;gBACd,cAAc,EAAE,SAAS;aAC1B;SACF,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC3E,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACvD,OAAO,kBAAkB,CAAC;YACxB,GAAG,MAAM;YACT,IAAI,EAAE,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAClC,wBAAwB,sBAAsB,EAAE,EAChD,qBAAqB,CAAC,YAAY,EAClC,KAAK,EAAE,EACE,UAAU,EACV,KAAK,EACL,KAAK,EACL,MAAM,EACN,OAAO,EACR,EAAE,EAAE;IACV,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/F,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEL,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlassian-dc-mcp/confluence",
-  "version": "0.12.2",
+  "version": "0.13.0",
   "main": "build/index.js",
   "type": "module",
   "bin": "./bin/run.js",
@@ -14,7 +14,7 @@
     "test": "jest --passWithNoTests"
   },
   "dependencies": {
-    "@atlassian-dc-mcp/common": "^0.12.2",
+    "@atlassian-dc-mcp/common": "^0.13.0",
     "@modelcontextprotocol/sdk": "^1.27.1",
     "dotenv": "^16.4.7",
     "node-fetch": "^3.3.2",
@@ -29,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6488590c1832714d510cc4a4f5f3d9e8e38f3b09"
+  "gitHead": "2f5845bf1c5837d547bcc957dcf01c4f9865c83a"
 }

package/server.json

@@ -18,22 +18,29 @@
       },
       "environmentVariables": [
         {
-          "description": "Confluence host domain (e.g. your-instance.atlassian.net)",
+          "description": "Absolute path to a shared dotenv-style config file. When set, values are read from this file before direct environment variable overrides are applied.",
+          "isRequired": false,
+          "format": "string",
+          "isSecret": false,
+          "name": "ATLASSIAN_DC_MCP_CONFIG_FILE"
+        },
+        {
+          "description": "Confluence host domain (e.g. your-instance.atlassian.net). Required unless provided through ATLASSIAN_DC_MCP_CONFIG_FILE or CONFLUENCE_API_BASE_PATH.",
           "isRequired": false,
           "format": "string",
           "isSecret": false,
           "name": "CONFLUENCE_HOST"
         },
         {
-          "description": "Confluence API base path (alternative to CONFLUENCE_HOST)",
+          "description": "Confluence API base path (alternative to CONFLUENCE_HOST). Required unless provided through ATLASSIAN_DC_MCP_CONFIG_FILE or CONFLUENCE_HOST.",
           "isRequired": false,
           "format": "string",
           "isSecret": false,
           "name": "CONFLUENCE_API_BASE_PATH"
         },
         {
-          "description": "Confluence Personal Access Token or API token",
-          "isRequired": true,
+          "description": "Confluence Personal Access Token or API token. Required unless provided through ATLASSIAN_DC_MCP_CONFIG_FILE.",
+          "isRequired": false,
           "format": "string",
           "isSecret": true,
           "name": "CONFLUENCE_API_TOKEN"
@@ -41,4 +48,4 @@
       ]
     }
   ]
-}
+}

package/src/__tests__/config.test.ts

@@ -0,0 +1,64 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+describe('Confluence config', () => {
+  const originalEnv = process.env;
+  const originalCwd = process.cwd();
+  let tempDir: string;
+
+  beforeEach(() => {
+    jest.resetModules();
+    process.env = { ...originalEnv };
+    delete process.env.ATLASSIAN_DC_MCP_CONFIG_FILE;
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'confluence-config-'));
+    process.chdir(tempDir);
+  });
+
+  afterEach(() => {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+    process.chdir(originalCwd);
+  });
+
+  afterAll(() => {
+    process.env = originalEnv;
+  });
+
+  it('uses the configured page size when the env var is a positive integer', async () => {
+    process.env.CONFLUENCE_DEFAULT_PAGE_SIZE = '40';
+
+    const { getDefaultPageSize } = await import('../config.js');
+
+    expect(getDefaultPageSize()).toBe(40);
+  });
+
+  it('falls back to 25 when the env var is invalid', async () => {
+    process.env.CONFLUENCE_DEFAULT_PAGE_SIZE = '0';
+
+    const { getDefaultPageSize } = await import('../config.js');
+
+    expect(getDefaultPageSize()).toBe(25);
+  });
+
+  it('reads the page size from the shared config file', async () => {
+    const sharedConfigPath = path.join(tempDir, 'shared.env');
+    fs.writeFileSync(sharedConfigPath, 'CONFLUENCE_HOST=file-host\nCONFLUENCE_API_TOKEN=file-token\nCONFLUENCE_DEFAULT_PAGE_SIZE=35\n');
+    process.env.ATLASSIAN_DC_MCP_CONFIG_FILE = sharedConfigPath;
+
+    const { getConfluenceRuntimeConfig, getDefaultPageSize } = await import('../config.js');
+
+    expect(getDefaultPageSize()).toBe(35);
+    expect(getConfluenceRuntimeConfig().token).toBe('file-token');
+  });
+
+  it('keeps env values higher priority than the shared config file', async () => {
+    const sharedConfigPath = path.join(tempDir, 'shared.env');
+    fs.writeFileSync(sharedConfigPath, 'CONFLUENCE_HOST=file-host\nCONFLUENCE_API_TOKEN=file-token\nCONFLUENCE_DEFAULT_PAGE_SIZE=35\n');
+    process.env.ATLASSIAN_DC_MCP_CONFIG_FILE = sharedConfigPath;
+    process.env.CONFLUENCE_DEFAULT_PAGE_SIZE = '45';
+
+    const { getDefaultPageSize } = await import('../config.js');
+
+    expect(getDefaultPageSize()).toBe(45);
+  });
+});

package/src/__tests__/confluence-response-mapper.test.ts

@@ -0,0 +1,26 @@
+import { shapeConfluenceMutationAck } from '../confluence-response-mapper.js';
+
+describe('shapeConfluenceMutationAck', () => {
+  it('returns a compact acknowledgement with a resolved content URL', () => {
+    expect(
+      shapeConfluenceMutationAck({
+        id: '123',
+        type: 'page',
+        title: 'Test page',
+        space: { key: 'DOCS' },
+        version: { number: 7 },
+        _links: {
+          base: 'https://confluence.example.com',
+          webui: '/pages/viewpage.action?pageId=123',
+        },
+      })
+    ).toEqual({
+      id: '123',
+      type: 'page',
+      title: 'Test page',
+      spaceKey: 'DOCS',
+      version: 7,
+      url: 'https://confluence.example.com/pages/viewpage.action?pageId=123',
+    });
+  });
+});

package/src/__tests__/confluence-service.test.ts

@@ -1,8 +1,12 @@
 import { ConfluenceService, escapeSearchTextForCql } from '../confluence-service.js';
-import { SearchService } from '../confluence-client/index.js';
+import { ContentResourceService, SearchService } from '../confluence-client/index.js';
 
 jest.mock('../confluence-client/index.js', () => ({
-  ContentResourceService: {},
+  ContentResourceService: {
+    getContentById: jest.fn(),
+    createContent: jest.fn(),
+    update2: jest.fn(),
+  },
   SearchService: {
     search1: jest.fn(),
   },
@@ -75,7 +79,7 @@ describe('ConfluenceService.searchSpaces', () => {
       undefined,
       '10',
       '0',
-      undefined,
+      'none',
       'type=space AND title ~ "my space"'
     );
   });
@@ -91,7 +95,7 @@ describe('ConfluenceService.searchSpaces', () => {
       undefined,
       '5',
       undefined,
-      undefined,
+      'none',
       'type=space AND title ~ "say \\"hello\\""'
     );
   });
@@ -107,7 +111,7 @@ describe('ConfluenceService.searchSpaces', () => {
       undefined,
       '5',
       undefined,
-      undefined,
+      'none',
       'type=space AND title ~ "path\\\\to\\\\space"'
     );
   });
@@ -122,3 +126,155 @@ describe('ConfluenceService.searchSpaces', () => {
     expect(result.error).toBeDefined();
   });
 });
+
+describe('ConfluenceService token optimization paths', () => {
+  let service: ConfluenceService;
+
+  beforeEach(() => {
+    service = new ConfluenceService('test-host', 'test-token');
+    jest.clearAllMocks();
+  });
+
+  it('keeps storage mode as the default body shape', async () => {
+    const mockContent = {
+      id: '123',
+      type: 'page',
+      title: 'Test page',
+      body: {
+        storage: {
+          value: '<p>Hello</p>',
+          representation: 'storage',
+        },
+      },
+    };
+    (ContentResourceService.getContentById as jest.Mock).mockResolvedValue(mockContent);
+
+    const result = await service.getContent('123');
+
+    expect(result.success).toBe(true);
+    expect(result.data).toBe(mockContent);
+    expect(ContentResourceService.getContentById).toHaveBeenCalledWith('123', 'body.storage');
+  });
+
+  it('converts storage XML to text when bodyMode is text', async () => {
+    (ContentResourceService.getContentById as jest.Mock).mockResolvedValue({
+      id: '123',
+      type: 'page',
+      title: 'Test page',
+      body: {
+        storage: {
+          value: '<p>Hello &amp; <strong>world</strong></p><ul><li>One</li><li>Two</li></ul>',
+          representation: 'storage',
+        },
+      },
+      version: { number: 3 },
+    });
+
+    const result = await service.getContent('123', 'version', 'text');
+
+    expect(result.success).toBe(true);
+    expect(ContentResourceService.getContentById).toHaveBeenCalledWith('123', 'version,body.storage');
+    expect(result.data).toMatchObject({
+      id: '123',
+      type: 'page',
+      title: 'Test page',
+      version: { number: 3 },
+      body: {
+        text: {
+          representation: 'text',
+        },
+      },
+    });
+    expect((result.data as any).body.text.value).toContain('Hello & world');
+    expect((result.data as any).body.text.value).toContain('- One');
+    expect((result.data as any).body.text.value).toContain('- Two');
+  });
+
+  it('truncates text bodies when maxBodyChars is provided', async () => {
+    (ContentResourceService.getContentById as jest.Mock).mockResolvedValue({
+      id: '123',
+      type: 'page',
+      title: 'Test page',
+      body: {
+        storage: {
+          value: '<p>Hello world</p>',
+          representation: 'storage',
+        },
+      },
+    });
+
+    const result = await service.getContent('123', undefined, 'text', 5);
+
+    expect(result.success).toBe(true);
+    expect(result.data).toEqual({
+      id: '123',
+      type: 'page',
+      title: 'Test page',
+      body: {
+        text: {
+          value: 'Hello',
+          representation: 'text',
+          truncated: true,
+          originalLength: 11,
+        },
+      },
+    });
+  });
+
+  it('omits the body when bodyMode is none', async () => {
+    (ContentResourceService.getContentById as jest.Mock).mockResolvedValue({
+      id: '123',
+      type: 'page',
+      title: 'Test page',
+      body: {
+        storage: {
+          value: '<p>Hello</p>',
+          representation: 'storage',
+        },
+      },
+      version: { number: 1 },
+    });
+
+    const result = await service.getContent('123', undefined, 'none');
+
+    expect(result.success).toBe(true);
+    expect(result.data).toEqual({
+      id: '123',
+      type: 'page',
+      title: 'Test page',
+      version: { number: 1 },
+    });
+  });
+
+  it('uses the package default limit and no excerpt for content search', async () => {
+    (SearchService.search1 as jest.Mock).mockResolvedValue({ results: [] });
+
+    await service.searchContent('type=page');
+
+    expect(SearchService.search1).toHaveBeenCalledWith(
+      undefined,
+      undefined,
+      undefined,
+      '25',
+      undefined,
+      'none',
+      'type=page'
+    );
+  });
+
+  it('forwards explicit excerpt for space search', async () => {
+    (SearchService.search1 as jest.Mock).mockResolvedValue({ results: [] });
+
+    await service.searchSpaces('docs', 5, 10, 'space.icon', 'highlight');
+
+    expect(SearchService.search1).toHaveBeenCalledWith(
+      undefined,
+      'space.icon',
+      undefined,
+      '5',
+      '10',
+      'highlight',
+      'type=space AND title ~ "docs"'
+    );
+  });
+});

package/src/config.ts

@@ -0,0 +1,13 @@
+import { getProductRuntimeConfig, validateProductRuntimeConfig } from '@atlassian-dc-mcp/common';
+
+export function getConfluenceRuntimeConfig() {
+  return getProductRuntimeConfig('confluence');
+}
+
+export function getDefaultPageSize() {
+  return getConfluenceRuntimeConfig().defaultPageSize;
+}
+
+export function getMissingConfig() {
+  return validateProductRuntimeConfig('confluence');
+}