@crypto512/jicon-mcp 2.2.1 → 2.3.19

package/dist/confluence/tools.d.ts

@@ -1,28 +1,29 @@
 /**
  * Confluence MCP Tools
+ *
+ * All tool handlers use session-scoped clients and buffers via getSessionXxxClient()
+ * and getSessionBuffer() functions which provide per-session isolation.
  */
 import { z } from "zod";
-import { ConfluenceClient } from "./client.js";
 import type { ToolResult } from "../types.js";
 /**
- * Type for a function that returns the Confluence client for the current request
+ * Create Confluence tools using session-scoped clients
+ *
+ * Tools automatically use the ConfluenceClient from the current session context,
+ * which provides per-session caching and credential isolation.
  */
-export type ConfluenceClientGetter = () => ConfluenceClient | null;
-/**
- * Create Confluence tools with a client getter function
- */
-export declare function createConfluenceTools(getClient: ConfluenceClientGetter): {
+export declare function createConfluenceTools(): {
     confluence_search_content: {
         description: string;
         inputSchema: z.ZodObject<{
             cql: z.ZodString;
-            expand: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            expand: z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodString, "many">, string[], unknown>>;
         }, "strip", z.ZodTypeAny, {
             cql: string;
             expand?: string[] | undefined;
         }, {
             cql: string;
-            expand?: string[] | undefined;
+            expand?: unknown;
         }>;
         handler: (args: {
             cql: string;
@@ -51,7 +52,7 @@ export declare function createConfluenceTools(getClient: ConfluenceClientGetter)
         inputSchema: z.ZodObject<{
             spaceKey: z.ZodString;
             title: z.ZodString;
-            expand: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            expand: z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodString, "many">, string[], unknown>>;
         }, "strip", z.ZodTypeAny, {
             spaceKey: string;
             title: string;
@@ -59,7 +60,7 @@ export declare function createConfluenceTools(getClient: ConfluenceClientGetter)
         }, {
             spaceKey: string;
             title: string;
-            expand?: string[] | undefined;
+            expand?: unknown;
         }>;
         handler: (args: {
             spaceKey: string;
@@ -110,13 +111,13 @@ export declare function createConfluenceTools(getClient: ConfluenceClientGetter)
         description: string;
         inputSchema: z.ZodObject<{
             spaceKey: z.ZodString;
-            expand: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            expand: z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodString, "many">, string[], unknown>>;
         }, "strip", z.ZodTypeAny, {
             spaceKey: string;
             expand?: string[] | undefined;
         }, {
             spaceKey: string;
-            expand?: string[] | undefined;
+            expand?: unknown;
         }>;
         handler: (args: {
             spaceKey: string;
@@ -127,13 +128,13 @@ export declare function createConfluenceTools(getClient: ConfluenceClientGetter)
         description: string;
         inputSchema: z.ZodObject<{
             pageId: z.ZodString;
-            expand: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            expand: z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodString, "many">, string[], unknown>>;
         }, "strip", z.ZodTypeAny, {
             pageId: string;
             expand?: string[] | undefined;
         }, {
             pageId: string;
-            expand?: string[] | undefined;
+            expand?: unknown;
         }>;
         handler: (args: {
             pageId: string;
@@ -204,11 +205,6 @@ export declare function createConfluenceTools(getClient: ConfluenceClientGetter)
             pageId: string;
         }) => Promise<ToolResult>;
     };
-    confluence_get_current_user_space: {
-        description: string;
-        inputSchema: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
-        handler: () => Promise<ToolResult>;
-    };
     confluence_draft_create: {
         description: string;
         inputSchema: z.ZodObject<{

package/dist/confluence/tools.d.ts.map

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

package/dist/confluence/tools.js

@@ -1,15 +1,23 @@
 /**
  * Confluence MCP Tools
+ *
+ * All tool handlers use session-scoped clients and buffers via getSessionXxxClient()
+ * and getSessionBuffer() functions which provide per-session isolation.
  */
 import { z } from "zod";
-import { formatSuccess, formatSuccessJson, formatSuccessXhtml, formatError, isApiError } from "../utils/response-formatter.js";
-import { contentBuffer } from "../utils/content-buffer.js";
-import { formatPageMetadata } from "./formatters.js";
+import { formatSuccess, formatSuccessJson, formatSuccessXhtml, formatError, isApiError, getMaxApiResults } from "../utils/response-formatter.js";
+import { getSessionBuffer, getSessionConfluenceClient } from "../session/context.js";
+import { formatPageMetadata, formatPageSchemaMetadata, formatSpaceMetadata, formatCommentMetadata, formatAttachmentMetadata, formatDraftMetadata, } from "./formatters.js";
 import { validateXhtmlAsync, parseXhtml, enhanceXhtmlError } from "../utils/xhtml/index.js";
 import { detectRawPlantUml, detectDiagramType } from "../utils/xhtml/plantuml.js";
 import { convertPlantUmlIncludesInXhtml, IncludeConversionError } from "../utils/plantuml/index.js";
 import { parseUrl } from "../utils/url-tools.js";
 import { DEFAULT_PAGE_EXPAND } from "./defaults.js";
+/**
+ * Schema that accepts either a comma-separated string or an array of strings.
+ * Examples: "space,metadata" or ["space", "metadata"]
+ */
+const stringOrArray = z.preprocess((val) => typeof val === "string" ? val.split(",").map(s => s.trim()).filter(Boolean) : val, z.array(z.string()));
 /**
  * Generate a summary of content structure for draft responses.
  * Helps AI assistants verify that diagrams and other elements are included.
@@ -137,11 +145,14 @@ async function validateContentForWrite(content, bufferId) {
     return null; // Valid content
 }
 /**
- * Create Confluence tools with a client getter function
+ * Create Confluence tools using session-scoped clients
+ *
+ * Tools automatically use the ConfluenceClient from the current session context,
+ * which provides per-session caching and credential isolation.
  */
-export function createConfluenceTools(getClient) {
+export function createConfluenceTools() {
     const requireClient = () => {
-        const client = getClient();
+        const client = getSessionConfluenceClient();
         if (!client) {
             throw new Error("Confluence is not configured. Provide CONFLUENCE_URL and CONFLUENCE_API_TOKEN environment variables, or pass credentials via X-Confluence-Url and X-Confluence-Token headers.");
         }
@@ -155,20 +166,24 @@ Entry point for finding Confluence pages by content, title, or metadata.
 
 REQUIRES: Valid CQL query (see help(topic="cql") for syntax)
 RETURNS: bufferId (JSON array), itemCount with page IDs and titles
-NEXT: confluence_get_page (to load), buffer_pipeline (for reports), buffer_grep (to search results)
+NEXT: confluence_get_page (to load), buffer_transform (for reports), buffer_grep (to search results)
 
-Example: confluence_search_content(cql="type=page AND space=DOCS AND text~'API'")
+TIP: "MY pages" = contributor=currentUser() (pages user edited/created)
+Example: cql="contributor=currentUser() ORDER BY lastmodified DESC"
 
 WARNING: Use text~ not content~. Use space KEY not name.`,
             inputSchema: z.object({
                 cql: z.string().describe("CQL query string"),
-                expand: z.array(z.string()).optional().describe("Additional data to expand"),
+                expand: stringOrArray.optional().describe("Additional data to expand (string or array)"),
             }),
             handler: async (args) => {
                 try {
-                    const result = await requireClient().searchContentAll(args.cql, args.expand);
-                    return formatSuccessJson(result, {
+                    const result = await requireClient().searchContentAll(args.cql, args.expand, getMaxApiResults());
+                    // Flatten pages to match confluence_page schema
+                    const pages = (result.results || []).map((p) => formatPageSchemaMetadata(p));
+                    return formatSuccessJson(pages, {
                         resourceType: "confluence_search",
+                        schemaType: "confluence_page",
                         title: `CQL: ${args.cql.substring(0, 100)}${args.cql.length > 100 ? "..." : ""}`,
                     });
                 }
@@ -199,7 +214,8 @@ WARNING: Use text~ not content~. Use space KEY not name.`,
                             hint += "\nExamples:\n";
                             hint += "  text~\"Mike Tasc\" - finds pages mentioning this person\n";
                             hint += "  text~\"meeting\" AND space=MESH - finds meetings in MESH space\n";
-                            hint += "  title~\"sprint review\" - finds pages with sprint review in title";
+                            hint += "  title~\"sprint review\" - finds pages with sprint review in title\n";
+                            hint += '\nTIP: Call help(topic="cql") for full CQL syntax guide.';
                             return formatError({
                                 ...error,
                                 message: error.message + hint
@@ -277,7 +293,7 @@ Use buffer_edit(bufferId, after=ID, content/plantuml/fromBufferId) to add conten
             inputSchema: z.object({
                 spaceKey: z.string().describe("Space key (short code like 'MESH', 'TC'), NOT the full space name"),
                 title: z.string().describe("Page title"),
-                expand: z.array(z.string()).optional().describe("Additional data to expand"),
+                expand: stringOrArray.optional().describe("Additional data to expand (string or array)"),
             }),
             handler: async (args) => {
                 try {
@@ -514,7 +530,7 @@ Example: confluence_delete_page(pageId="123456")`,
                 try {
                     await requireClient().deletePage(args.pageId);
                     // Invalidate any cached buffers for this page
-                    contentBuffer.invalidateByMetadata({
+                    getSessionBuffer().invalidateByMetadata({
                         resourceType: "confluence_page",
                         resourceId: args.pageId,
                     });
@@ -547,8 +563,11 @@ Example: confluence_list_spaces(type="global")`,
             handler: async (args) => {
                 try {
                     const result = await requireClient().listSpaces(args.type);
-                    return formatSuccessJson(result, {
+                    // Flatten spaces to match confluence_space schema
+                    const spaces = (result.results || []).map((s) => formatSpaceMetadata(s));
+                    return formatSuccessJson(spaces, {
                         resourceType: "confluence_spaces",
+                        schemaType: "confluence_space",
                         title: args.type ? `${args.type} spaces` : "All Spaces",
                     });
                 }
@@ -569,13 +588,18 @@ NEXT: confluence_search_content (to query space), confluence_get_page (homepage)
 Example: confluence_get_space(spaceKey="DOCS")`,
             inputSchema: z.object({
                 spaceKey: z.string().describe("Space key"),
-                expand: z.array(z.string()).optional().describe("Additional data to expand"),
+                expand: stringOrArray.optional().describe("Additional data to expand (string or array)"),
             }),
             handler: async (args) => {
                 try {
                     const result = await requireClient().getSpace(args.spaceKey, args.expand);
-                    return formatSuccessJson(result, {
+                    // Flatten space to match confluence_space schema, keep raw data for extra fields
+                    return formatSuccessJson({
+                        ...formatSpaceMetadata(result),
+                        data: result,
+                    }, {
                         resourceType: "confluence_space",
+                        schemaType: "confluence_space",
                         title: result.name || args.spaceKey,
                         spaceKey: args.spaceKey,
                     });
@@ -591,13 +615,16 @@ Example: confluence_get_space(spaceKey="DOCS")`,
 Returns bufferId. Use buffer_get_items to read, buffer_grep to search.`,
             inputSchema: z.object({
                 pageId: z.coerce.string().describe("Parent page ID (accepts string or number)"),
-                expand: z.array(z.string()).optional().describe("Additional data to expand"),
+                expand: stringOrArray.optional().describe("Additional data to expand (string or array)"),
             }),
             handler: async (args) => {
                 try {
                     const result = await requireClient().getPageChildren(args.pageId, args.expand);
-                    return formatSuccessJson(result, {
+                    // Flatten pages to match confluence_page schema
+                    const pages = (result.results || []).map((p) => formatPageSchemaMetadata(p));
+                    return formatSuccessJson(pages, {
                         resourceType: "confluence_page_children",
+                        schemaType: "confluence_page",
                         title: `Page ${args.pageId} children`,
                         pageId: args.pageId,
                     });
@@ -633,8 +660,11 @@ Returns bufferId. Use buffer_get_items to read, buffer_grep to search.`,
             handler: async (args) => {
                 try {
                     const result = await requireClient().getComments(args.pageId);
-                    return formatSuccessJson(result, {
+                    // Flatten comments to match confluence_comment schema
+                    const comments = (result.results || []).map((c) => formatCommentMetadata(c));
+                    return formatSuccessJson(comments, {
                         resourceType: "confluence_comments",
+                        schemaType: "confluence_comment",
                         title: `Page ${args.pageId} comments`,
                         pageId: args.pageId,
                     });
@@ -671,8 +701,11 @@ Returns bufferId. Use buffer_get_items to read, buffer_grep to search.`,
             handler: async (args) => {
                 try {
                     const result = await requireClient().listAttachments(args.pageId);
-                    return formatSuccessJson(result, {
+                    // Flatten attachments to match confluence_attachment schema
+                    const attachments = (result.results || []).map((a) => formatAttachmentMetadata(a));
+                    return formatSuccessJson(attachments, {
                         resourceType: "confluence_attachments",
+                        schemaType: "confluence_attachment",
                         title: `Page ${args.pageId} attachments`,
                         pageId: args.pageId,
                     });
@@ -682,34 +715,6 @@ Returns bufferId. Use buffer_get_items to read, buffer_grep to search.`,
                 }
             },
         },
-        confluence_get_current_user_space: {
-            description: `Get the current user's personal Confluence space. Returns spaceKey and homePageId.
-Use to verify personal space before write operations when write-home restriction is enabled.`,
-            inputSchema: z.object({}),
-            handler: async () => {
-                try {
-                    const userSpace = await requireClient().getCurrentUserSpace();
-                    if (!userSpace) {
-                        return formatError({
-                            error: true,
-                            message: "No personal space found for current user",
-                            statusCode: 404,
-                        });
-                    }
-                    return formatSuccess({
-                        spaceKey: userSpace.key,
-                        spaceName: userSpace.name,
-                        spaceType: userSpace.type,
-                        homePageId: userSpace.homepage?.id,
-                        homePageTitle: userSpace.homepage?.title,
-                        tip: "Use this spaceKey when creating pages with write-home restriction enabled",
-                    });
-                }
-                catch (error) {
-                    return formatError(isApiError(error) ? error : new Error(String(error)));
-                }
-            },
-        },
         // ========================================
         // Draft Tools
         // ========================================
@@ -740,7 +745,7 @@ WARNING: pageId must be a PAGE ID, not a draft ID. Use confluence_draft_open for
                 let originalPageId;
                 let originalPageVersion;
                 // Validate buffer exists and get content
-                const bufferInfo = contentBuffer.getInfo(args.bufferId);
+                const bufferInfo = getSessionBuffer().getInfo(args.bufferId);
                 if (!bufferInfo) {
                     return formatError({
                         error: true,
@@ -763,7 +768,7 @@ WARNING: pageId must be a PAGE ID, not a draft ID. Use confluence_draft_open for
                     });
                 }
                 // Get full content from buffer
-                const fullContent = contentBuffer.getChunk(args.bufferId, 0, bufferInfo.bufferSizeBytes);
+                const fullContent = getSessionBuffer().getChunk(args.bufferId, 0, bufferInfo.bufferSizeBytes);
                 if (!fullContent) {
                     return formatError({
                         error: true,
@@ -1054,7 +1059,10 @@ Use buffer_edit(bufferId, after=ID, content/plantuml/fromBufferId) to modify, th
             },
         },
         confluence_draft_list: {
-            description: `List your draft pages. Use confluence_draft_open to load a draft for editing.
+            description: `List your UNPUBLISHED draft pages (work-in-progress, not yet published).
+
+NOTE: To find PUBLISHED pages you edited, use:
+  confluence_search_content(cql="contributor=currentUser() ORDER BY lastmodified DESC")
 
 Returns bufferId. Use buffer_get_items to read, buffer_grep to search.`,
             inputSchema: z.object({
@@ -1065,19 +1073,14 @@ Returns bufferId. Use buffer_get_items to read, buffer_grep to search.`,
                     const result = await requireClient().listUserDrafts(args.spaceKey);
                     // Build the base URL for constructing full URLs
                     const baseUrl = requireClient().getBaseUrl();
+                    // Flatten drafts to match confluence_draft schema
                     const drafts = result.results.map((page) => ({
-                        draftId: page.id,
-                        title: page.title,
-                        spaceKey: page.space?.key || "",
-                        spaceName: page.space?.name || "",
-                        created: page.version?.when || "",
+                        ...formatDraftMetadata(page),
                         url: `${baseUrl}/pages/resumedraft.action?draftId=${page.id}`,
                     }));
-                    return formatSuccessJson({
-                        drafts,
-                        total: result.totalSize,
-                    }, {
+                    return formatSuccessJson(drafts, {
                         resourceType: "confluence_drafts",
+                        schemaType: "confluence_draft",
                         title: args.spaceKey ? `Drafts in ${args.spaceKey}` : "All Drafts",
                     });
                 }
@@ -1110,7 +1113,7 @@ Returns new draftId, bufferId, structure (element IDs), and URL. Always use the
                         });
                     }
                     // Get content from buffer
-                    const bufferChunk = contentBuffer.getChunk(args.bufferId);
+                    const bufferChunk = getSessionBuffer().getChunk(args.bufferId);
                     if (!bufferChunk) {
                         return formatError({
                             error: true,
@@ -1119,7 +1122,7 @@ Returns new draftId, bufferId, structure (element IDs), and URL. Always use the
                         });
                     }
                     // Get full content from buffer
-                    const fullContent = contentBuffer.getChunk(args.bufferId, 0, bufferChunk.bufferSizeBytes);
+                    const fullContent = getSessionBuffer().getChunk(args.bufferId, 0, bufferChunk.bufferSizeBytes);
                     if (!fullContent) {
                         return formatError({
                             error: true,
@@ -1195,7 +1198,7 @@ Returns new draftId, bufferId, structure (element IDs), and URL. Always use the
                         parentId: existingDraft.ancestors?.[0]?.id,
                     });
                     // Update buffer metadata with new draft ID
-                    contentBuffer.invalidateByMetadata({
+                    getSessionBuffer().invalidateByMetadata({
                         resourceType: "confluence_draft",
                         resourceId: args.draftId,
                     });
@@ -1247,7 +1250,7 @@ Drafts are NOT sent to trash - they are permanently deleted.`,
                 try {
                     await requireClient().deleteDraft(args.draftId);
                     // Invalidate any cached buffers for this draft
-                    contentBuffer.invalidateByMetadata({
+                    getSessionBuffer().invalidateByMetadata({
                         resourceType: "confluence_page",
                         resourceId: args.draftId,
                     });
@@ -1365,8 +1368,8 @@ Example: confluence_review_publish(reviewDraftId="123456")`,
                     // 7. Delete review draft
                     await requireClient().deleteDraft(args.reviewDraftId);
                     // 8. Invalidate buffers
-                    contentBuffer.invalidateByMetadata({ resourceId: originalPageId });
-                    contentBuffer.invalidateByMetadata({ resourceId: args.reviewDraftId });
+                    getSessionBuffer().invalidateByMetadata({ resourceId: originalPageId });
+                    getSessionBuffer().invalidateByMetadata({ resourceId: args.reviewDraftId });
                     // Build the page URL
                     const baseUrl = requireClient().getBaseUrl();
                     const pageUrl = `${baseUrl}${updatedPage._links?.webui || `/pages/viewpage.action?pageId=${originalPageId}`}`;
@@ -1415,7 +1418,7 @@ This tool:
                     // 3. Delete review draft
                     await requireClient().deleteDraft(args.reviewDraftId);
                     // 4. Invalidate buffer
-                    contentBuffer.invalidateByMetadata({ resourceId: args.reviewDraftId });
+                    getSessionBuffer().invalidateByMetadata({ resourceId: args.reviewDraftId });
                     return formatSuccess({
                         success: true,
                         discarded: true,