@bestend/confluence-cli 1.16.0 → 1.16.2

package/.github/workflows/publish.yml

@@ -35,4 +35,4 @@ jobs:
         run: npm ci
 
       - name: Publish with provenance via OIDC
-        run: npm publish --provenance --access public
+        run: npm publish --provenance --access public --tag latest

package/bin/confluence.js

@@ -194,8 +194,8 @@ program
         console.log(`ID: ${chalk.blue(result.id)}`);
       }
       console.log(`Space: ${chalk.blue(result.space.name)} (${result.space.key})`);
-      console.log(`URL: ${chalk.gray(`https://${config.domain}/wiki${result._links.webui}`)}`);
-      
+      console.log(`URL: ${chalk.gray(client.pageUrl(result._links.webui))}`);
+
       analytics.track('create', true);
     } catch (error) {
       analytics.track('create', false);
@@ -249,8 +249,8 @@ program
       console.log(`ID: ${chalk.blue(result.id)}`);
       console.log(`Parent: ${chalk.blue(parentInfo.title)} (${parentId})`);
       console.log(`Space: ${chalk.blue(result.space.name)} (${result.space.key})`);
-      console.log(`URL: ${chalk.gray(`https://${config.domain}/wiki${result._links.webui}`)}`);
-      
+      console.log(`URL: ${chalk.gray(client.pageUrl(result._links.webui))}`);
+
       analytics.track('create_child', true);
     } catch (error) {
       analytics.track('create_child', false);
@@ -301,8 +301,8 @@ program
       console.log(`Title: ${chalk.blue(result.title)}`);
       console.log(`ID: ${chalk.blue(result.id)}`);
       console.log(`Version: ${chalk.blue(result.version.number)}`);
-      console.log(`URL: ${chalk.gray(`https://${config.domain}/wiki${result._links.webui}`)}`);
-      
+      console.log(`URL: ${chalk.gray(client.pageUrl(result._links.webui))}`);
+
       analytics.track('update', true);
     } catch (error) {
       analytics.track('update', false);
@@ -407,8 +407,8 @@ program
       console.log(`Title: ${chalk.green(pageInfo.title)}`);
       console.log(`ID: ${chalk.green(pageInfo.id)}`);
       console.log(`Space: ${chalk.green(pageInfo.space.name)} (${pageInfo.space.key})`);
-      console.log(`URL: ${chalk.gray(`https://${config.domain}/wiki${pageInfo.url}`)}`);
-      
+      console.log(`URL: ${chalk.gray(client.pageUrl(pageInfo.url))}`);
+
       analytics.track('find', true);
     } catch (error) {
       analytics.track('find', false);
@@ -1084,7 +1084,7 @@ program
           console.log(` - ...and ${result.failures.length - 10} more`);
         }
       }
-      console.log(`URL: ${chalk.gray(`https://${config.domain}/wiki${result.rootPage._links.webui}`)}`);
+      console.log(`URL: ${chalk.gray(client.pageUrl(result.rootPage._links.webui))}`);
       if (options.failOnError && result.failures?.length) {
         analytics.track('copy_tree', false);
         console.error(chalk.red('Completed with failures and --fail-on-error is set.'));
@@ -1146,7 +1146,7 @@ program
             type: page.type,
             status: page.status,
             spaceKey: page.space?.key,
-            url: `https://${config.domain}/wiki/spaces/${page.space?.key}/pages/${page.id}`,
+            url: client.pageUrl(`/spaces/${page.space?.key}/pages/${page.id}`),
             parentId: page.parentId || resolvedPageId
           }))
         };
@@ -1158,7 +1158,7 @@ program
         
         // Build tree structure
         const tree = buildTree(children, resolvedPageId);
-        printTree(tree, config, options, 1);
+        printTree(tree, client, options, 1);
         
         console.log('');
         console.log(chalk.gray(`Total: ${children.length} child page${children.length === 1 ? '' : 's'}`));
@@ -1175,7 +1175,7 @@ program
           }
           
           if (options.showUrl) {
-            const url = `https://${config.domain}/wiki/spaces/${page.space?.key}/pages/${page.id}`;
+            const url = client.pageUrl(`/spaces/${page.space?.key}/pages/${page.id}`);
             output += `\n   ${chalk.gray(url)}`;
           }
           
@@ -1227,27 +1227,27 @@ function buildTree(pages, rootId) {
 }
 
 // Helper function to print tree
-function printTree(nodes, config, options, depth = 1) {
+function printTree(nodes, client, options, depth = 1) {
   nodes.forEach((node, index) => {
     const isLast = index === nodes.length - 1;
     const indent = '  '.repeat(depth - 1);
     const prefix = isLast ? '└── ' : '├── ';
-    
+
     let output = `${indent}${prefix}📄 ${chalk.green(node.title)}`;
-    
+
     if (options.showId) {
       output += ` ${chalk.gray(`(ID: ${node.id})`)}`;
     }
-    
+
     if (options.showUrl) {
-      const url = `https://${config.domain}/wiki/spaces/${node.space?.key}/pages/${node.id}`;
+      const url = client.pageUrl(`/spaces/${node.space?.key}/pages/${node.id}`);
       output += `\n${indent}${isLast ? '    ' : '│   '}${chalk.gray(url)}`;
     }
-    
+
     console.log(output);
-    
+
     if (node.children && node.children.length > 0) {
-      printTree(node.children, config, options, depth + 1);
+      printTree(node.children, client, options, depth + 1);
     }
   });
 }

package/lib/confluence-client.js

@@ -23,6 +23,25 @@ class ConfluenceClient {
       baseURL: this.baseURL,
       headers
     });
+
+    // Auto-detect context path (e.g., "/wiki" or "") from first API response
+    this._contextPath = null;
+    this.client.interceptors.response.use((response) => {
+      if (this._contextPath === null && response.data?._links?.context !== undefined) {
+        this._contextPath = response.data._links.context;
+      }
+      return response;
+    });
+  }
+
+  /**
+   * Build a full page URL from a webui path (e.g., /spaces/SPACE/pages/123)
+   * Context path is auto-detected from API responses.
+   */
+  pageUrl(path) {
+    if (!path) return '';
+    const context = this._contextPath || '';
+    return `https://${this.domain}${context}${path}`;
   }
 
   sanitizeStorageContent(content, options = {}) {
@@ -373,7 +392,7 @@ class ConfluenceClient {
         const webui = page._links?.webui || '';
         return {
           title: page.title,
-          url: webui ? `https://${this.domain}/wiki${webui}` : ''
+          url: this.pageUrl(webui)
         };
       }
       return null;
@@ -467,7 +486,7 @@ class ConfluenceClient {
       // Format: - [Page Title](URL)
       const childPagesList = childPages.map(page => {
         const webui = page._links?.webui || '';
-        const url = webui ? `https://${this.domain}/wiki${webui}` : '';
+        const url = this.pageUrl(webui);
         if (url) {
           return `- [${page.title}](${url})`;
         } else {
@@ -859,7 +878,7 @@ class ConfluenceClient {
     // - pre/code → ac:structured-macro code blocks with CDATA
     // - blockquote → info/warning/note macros
     // - th/td content wrapped in p
-    // - hr → self-closing hr /
+    // - hr → removed (Confluence does not use horizontal rules)
     let storage = html;
     
     // Wrap li content in p tags (Confluence requirement)
@@ -915,8 +934,8 @@ class ConfluenceClient {
     
     // Links: keep <a href> as-is (compatible with both Cloud and Server/Data Center)
     
-    // Convert horizontal rules
-    storage = storage.replace(/<hr\s*\/?>/g, '<hr />');
+    // Remove horizontal rules (Confluence does not use them)
+    storage = storage.replace(/<hr\s*\/?>/g, '');
     
     return storage;
   }
@@ -1135,12 +1154,12 @@ class ConfluenceClient {
     markdown = markdown.replace(/<ac:structured-macro ac:name="include"[^>]*>[\s\S]*?<ac:parameter ac:name="">[\s\S]*?<ac:link>[\s\S]*?<ri:page\s+ri:space-key="([^"]+)"\s+ri:content-title="([^"]+)"[^>]*\/>[\s\S]*?<\/ac:link>[\s\S]*?<\/ac:parameter>[\s\S]*?<\/ac:structured-macro>/g, (_, spaceKey, title) => {
       // Try to build a proper URL - if spaceKey starts with ~, it's a user space
       if (spaceKey.startsWith('~')) {
-        const spacePath = `display/${spaceKey}/${encodeURIComponent(title)}`;
-        return `\n> 📄 **${labels.includePage}**: [${title}](https://${this.domain}/wiki/${spacePath})\n`;
+        const spacePath = `/display/${spaceKey}/${encodeURIComponent(title)}`;
+        return `\n> 📄 **${labels.includePage}**: [${title}](${this.pageUrl(spacePath)})\n`;
       } else {
         // For non-user spaces, we cannot construct a valid link without the page ID.
         // Document that manual correction is required.
-        return `\n> 📄 **${labels.includePage}**: [${title}](https://${this.domain}/wiki/spaces/${spaceKey}/pages/[PAGE_ID_HERE]) _(manual link correction required)_\n`;
+        return `\n> 📄 **${labels.includePage}**: [${title}](${this.pageUrl(`/spaces/${spaceKey}/pages/[PAGE_ID_HERE]`)}) _(manual link correction required)_\n`;
       }
     });
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bestend/confluence-cli",
-  "version": "1.16.0",
+  "version": "1.16.2",
   "description": "A command-line interface for Atlassian Confluence with page creation and editing capabilities",
   "main": "index.js",
   "bin": {