@hang.yang/frankcli 0.1.51 → 0.1.53

package/bundle/api.cjs

@@ -156413,18 +156413,18 @@ var ConfluenceGetPageTool = class _ConfluenceGetPageTool extends BaseTool {
   config;
   static Name = "confluence_get_page";
   constructor(config2) {
-    super(_ConfluenceGetPageTool.Name, "ConfluenceGetPage", "Retrieves content from a Confluence page by its ID. Uses Personal Access Token from keys.json for authentication and can convert HTML content to markdown.", {
+    super(_ConfluenceGetPageTool.Name, "ConfluenceGetPage", "Retrieves content from a Confluence page by its URL. and the url include confluence.rakuten-it.com, Fetches the page to resolve page ID from HTML, then retrieves content via REST API. Uses Personal Access Token from keys.json and can convert HTML to markdown.", {
       properties: {
-        page_id: {
-          description: "The ID of the Confluence page to retrieve",
+        confluence_url: {
+          description: "The full Confluence page URL (e.g. https://confluence.rakuten-it.com/confluence/pages/viewpage.action?pageId=12345). Page ID is extracted from the page.",
           type: import_genai18.Type.STRING
         },
         convert_to_markdown: {
           description: "Whether to convert HTML content to markdown format (default: true)",
-          type: import_genai18.Type.STRING
+          type: import_genai18.Type.BOOLEAN
         }
       },
-      required: ["page_id"],
+      required: ["confluence_url"],
       type: import_genai18.Type.OBJECT
     });
     this.config = config2;
@@ -156434,13 +156434,51 @@ var ConfluenceGetPageTool = class _ConfluenceGetPageTool extends BaseTool {
     if (errors) {
       return errors;
     }
-    if (!params.page_id || params.page_id.trim() === "") {
-      return "The 'page_id' parameter cannot be empty.";
+    if (!params.confluence_url || params.confluence_url.trim() === "") {
+      return "The 'confluence_url' parameter cannot be empty.";
     }
     return null;
   }
   getDescription(params) {
-    return `Retrieving Confluence page ${params.page_id} from ${CONFLUENCE_URL}`;
+    return `Retrieving Confluence page from URL: ${params.confluence_url}`;
+  }
+  /**
+   * Fetch the Confluence page URL (HTML) and extract page_id from <meta name="ajs-page-id" content="...">.
+   * Mirrors logic in get_page_id_from_url.py.
+   */
+  async getPageIdFromUrl(confluenceUrl, token2, signal) {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), CONFLUENCE_FETCH_TIMEOUT_MS);
+    try {
+      const response = await fetch(confluenceUrl.trim(), {
+        method: "GET",
+        headers: {
+          "Authorization": `Bearer ${token2}`,
+          "Accept": "text/html, application/xhtml+xml, */*"
+        },
+        signal: signal || controller.signal
+      });
+      clearTimeout(timeoutId);
+      if (response.status !== 200) {
+        return {
+          error: `Failed to fetch URL: HTTP ${response.status}. Check the URL and that your token has access to the page.`
+        };
+      }
+      const html = await response.text();
+      const metaMatch = html.match(/<meta\s+name="ajs-page-id"\s+content="([^"]*)"\s*\/?>/i) || html.match(/<meta[^>]+content="([^"]*)"[^>]+name="ajs-page-id"[^>]*>/i);
+      const pageId = metaMatch ? (metaMatch[1] || "").trim() : "";
+      if (!pageId) {
+        return {
+          error: 'Page ID not found: no <meta name="ajs-page-id" content="..."> in the response. Ensure the URL is a Confluence page view URL.'
+        };
+      }
+      return { pageId };
+    } catch (e2) {
+      clearTimeout(timeoutId);
+      return {
+        error: `Network or parse error while fetching URL: ${getErrorMessage(e2)}. Check the URL and network.`
+      };
+    }
   }
   /**
    * Process HTML content to handle user mentions and page links
@@ -156479,15 +156517,23 @@ var ConfluenceGetPageTool = class _ConfluenceGetPageTool extends BaseTool {
         returnDisplay: validationError
       };
     }
-    const { page_id, convert_to_markdown = true } = params;
+    const { confluence_url, convert_to_markdown = true } = params;
     const personal_access_token = this.config.getConfluenceToken();
     if (!personal_access_token) {
       return {
-        llmContent: "Error: Confluence Personal Access Token not found in keys.json. Please configure it first.",
-        returnDisplay: "Confluence token not configured"
+        llmContent: `Error: ${CONFLUENCE_TOKEN_MISSING_MESSAGE}`,
+        returnDisplay: CONFLUENCE_TOKEN_MISSING_MESSAGE
       };
     }
     try {
+      const resolved = await this.getPageIdFromUrl(confluence_url, personal_access_token, signal);
+      if ("error" in resolved) {
+        return {
+          llmContent: `Error: ${resolved.error}`,
+          returnDisplay: resolved.error
+        };
+      }
+      const page_id = resolved.pageId;
       const isCloud = CONFLUENCE_URL.includes(".atlassian.net");
       const apiUrl = `${CONFLUENCE_URL.replace(/\/$/, "")}/rest/api/content/${page_id}`;
       const paramsObj = new URLSearchParams({
@@ -156596,7 +156642,7 @@ ${processedContent}
         returnDisplay: `Retrieved Confluence page: ${title}`
       };
     } catch (error) {
-      const errorMessage = `Error retrieving Confluence page ${page_id}: ${getErrorMessage(error)}`;
+      const errorMessage = `Error retrieving Confluence page: ${getErrorMessage(error)}`;
       console.error(errorMessage, error);
       return {
         llmContent: `Error: ${errorMessage}`,
@@ -156730,8 +156776,8 @@ var JiraGetIssueTool = class _JiraGetIssueTool extends BaseTool {
     const personal_access_token = this.config.getJiraToken();
     if (!personal_access_token) {
       return {
-        llmContent: "Error: Jira Personal Access Token not found in keys.json. Please configure it first.",
-        returnDisplay: "Jira token not configured"
+        llmContent: `Error: ${JIRA_TOKEN_MISSING_MESSAGE}`,
+        returnDisplay: JIRA_TOKEN_MISSING_MESSAGE
       };
     }
     try {
@@ -165107,6 +165153,8 @@ var DEFAULT_OTLP_ENDPOINT = "http://localhost:4317";
 
 // packages/core/dist/src/config/config.js
 init_models();
+var CONFLUENCE_TOKEN_MISSING_MESSAGE = "Confluence Personal Access Token not found. Set it with: frankcli set confluence token <Personal Access Tokens>. Create a token at: https://confluence.rakuten-it.com/confluence/plugins/personalaccesstokens/usertokens.action";
+var JIRA_TOKEN_MISSING_MESSAGE = "Jira Personal Access Token not found. Set it with: frankcli set jira token <Personal Access Tokens>. Create a token at: https://jira.rakuten-it.com/jira/secure/ViewProfile.jspa";
 var ApprovalMode;
 (function(ApprovalMode2) {
   ApprovalMode2["DEFAULT"] = "default";
@@ -165390,12 +165438,22 @@ var Config = class {
     return { memoryContent, fileCount };
   }
   /**
-   * Get Confluence Advanced Access Token from keys.json
+   * Get Confluence Advanced Access Token. Checks env X_ID_CONFLUENCE_ACCESS_TOKEN first, then ~/.mpdai/confluence.key, then keys.json.
    * @returns The Personal Access Token or null if not found
    */
   getConfluenceToken() {
     try {
-      const keysJsonPath = (0, import_node_path7.join)((0, import_node_os3.homedir)(), ".mpdai", "keys.json");
+      const envToken = import_node_process8.default.env.X_ID_CONFLUENCE_ACCESS_TOKEN?.trim();
+      if (envToken)
+        return envToken;
+      const mpdaiDir = (0, import_node_path7.join)((0, import_node_os3.homedir)(), ".mpdai");
+      const keyFilePath = (0, import_node_path7.join)(mpdaiDir, "confluence.key");
+      if ((0, import_node_fs6.existsSync)(keyFilePath)) {
+        const value = (0, import_node_fs6.readFileSync)(keyFilePath, "utf-8").trim();
+        if (value)
+          return value;
+      }
+      const keysJsonPath = (0, import_node_path7.join)(mpdaiDir, "keys.json");
       if (!(0, import_node_fs6.existsSync)(keysJsonPath)) {
         return null;
       }
@@ -165407,17 +165465,27 @@ var Config = class {
       }
       return null;
     } catch (error) {
-      console.error("Failed to read Confluence token from keys.json:", error);
+      console.error("Failed to read Confluence token:", error);
       return null;
     }
   }
   /**
-   * Get Jira Personal Access Token from keys.json
+   * Get Jira Personal Access Token. Checks env X_ID_JIRA_ACCESS_TOKEN first, then ~/.mpdai/jira.key, then keys.json.
    * @returns The Personal Access Token or null if not found
    */
   getJiraToken() {
     try {
-      const keysJsonPath = (0, import_node_path7.join)((0, import_node_os3.homedir)(), ".mpdai", "keys.json");
+      const envToken = import_node_process8.default.env.X_ID_JIRA_ACCESS_TOKEN?.trim();
+      if (envToken)
+        return envToken;
+      const mpdaiDir = (0, import_node_path7.join)((0, import_node_os3.homedir)(), ".mpdai");
+      const keyFilePath = (0, import_node_path7.join)(mpdaiDir, "jira.key");
+      if ((0, import_node_fs6.existsSync)(keyFilePath)) {
+        const value = (0, import_node_fs6.readFileSync)(keyFilePath, "utf-8").trim();
+        if (value)
+          return value;
+      }
+      const keysJsonPath = (0, import_node_path7.join)(mpdaiDir, "keys.json");
       if (!(0, import_node_fs6.existsSync)(keysJsonPath)) {
         return null;
       }
@@ -165429,7 +165497,7 @@ var Config = class {
       }
       return null;
     } catch (error) {
-      console.error("Failed to read Jira token from keys.json:", error);
+      console.error("Failed to read Jira token:", error);
       return null;
     }
   }
@@ -166401,6 +166469,7 @@ var import_path39 = __toESM(require("path"), 1);
 var __filename = (0, import_url4.fileURLToPath)(_importMetaUrl);
 var __dirname4 = import_path39.default.dirname(__filename);
 var packageJson;
+var packageRoot;
 async function getPackageJson() {
   if (packageJson) {
     return packageJson;
@@ -166410,6 +166479,7 @@ async function getPackageJson() {
     return;
   }
   packageJson = result.packageJson;
+  packageRoot = import_path39.default.dirname(result.path);
   return packageJson;
 }
 

package/bundle/api.js

@@ -27724,7 +27724,7 @@ async function createContentGeneratorConfig(model, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config2, sessionId2) {
-  const version2 = "0.1.51";
+  const version2 = "0.1.53";
   const httpOptions = {
     headers: {
       "User-Agent": `GeminiCLI/${version2} (${process.platform}; ${process.arch})`
@@ -156409,18 +156409,18 @@ var ConfluenceGetPageTool = class _ConfluenceGetPageTool extends BaseTool {
   config;
   static Name = "confluence_get_page";
   constructor(config2) {
-    super(_ConfluenceGetPageTool.Name, "ConfluenceGetPage", "Retrieves content from a Confluence page by its ID. Uses Personal Access Token from keys.json for authentication and can convert HTML content to markdown.", {
+    super(_ConfluenceGetPageTool.Name, "ConfluenceGetPage", "Retrieves content from a Confluence page by its URL. and the url include confluence.rakuten-it.com, Fetches the page to resolve page ID from HTML, then retrieves content via REST API. Uses Personal Access Token from keys.json and can convert HTML to markdown.", {
       properties: {
-        page_id: {
-          description: "The ID of the Confluence page to retrieve",
+        confluence_url: {
+          description: "The full Confluence page URL (e.g. https://confluence.rakuten-it.com/confluence/pages/viewpage.action?pageId=12345). Page ID is extracted from the page.",
           type: Type15.STRING
         },
         convert_to_markdown: {
           description: "Whether to convert HTML content to markdown format (default: true)",
-          type: Type15.STRING
+          type: Type15.BOOLEAN
         }
       },
-      required: ["page_id"],
+      required: ["confluence_url"],
       type: Type15.OBJECT
     });
     this.config = config2;
@@ -156430,13 +156430,51 @@ var ConfluenceGetPageTool = class _ConfluenceGetPageTool extends BaseTool {
     if (errors) {
       return errors;
     }
-    if (!params.page_id || params.page_id.trim() === "") {
-      return "The 'page_id' parameter cannot be empty.";
+    if (!params.confluence_url || params.confluence_url.trim() === "") {
+      return "The 'confluence_url' parameter cannot be empty.";
     }
     return null;
   }
   getDescription(params) {
-    return `Retrieving Confluence page ${params.page_id} from ${CONFLUENCE_URL}`;
+    return `Retrieving Confluence page from URL: ${params.confluence_url}`;
+  }
+  /**
+   * Fetch the Confluence page URL (HTML) and extract page_id from <meta name="ajs-page-id" content="...">.
+   * Mirrors logic in get_page_id_from_url.py.
+   */
+  async getPageIdFromUrl(confluenceUrl, token2, signal) {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), CONFLUENCE_FETCH_TIMEOUT_MS);
+    try {
+      const response = await fetch(confluenceUrl.trim(), {
+        method: "GET",
+        headers: {
+          "Authorization": `Bearer ${token2}`,
+          "Accept": "text/html, application/xhtml+xml, */*"
+        },
+        signal: signal || controller.signal
+      });
+      clearTimeout(timeoutId);
+      if (response.status !== 200) {
+        return {
+          error: `Failed to fetch URL: HTTP ${response.status}. Check the URL and that your token has access to the page.`
+        };
+      }
+      const html = await response.text();
+      const metaMatch = html.match(/<meta\s+name="ajs-page-id"\s+content="([^"]*)"\s*\/?>/i) || html.match(/<meta[^>]+content="([^"]*)"[^>]+name="ajs-page-id"[^>]*>/i);
+      const pageId = metaMatch ? (metaMatch[1] || "").trim() : "";
+      if (!pageId) {
+        return {
+          error: 'Page ID not found: no <meta name="ajs-page-id" content="..."> in the response. Ensure the URL is a Confluence page view URL.'
+        };
+      }
+      return { pageId };
+    } catch (e2) {
+      clearTimeout(timeoutId);
+      return {
+        error: `Network or parse error while fetching URL: ${getErrorMessage(e2)}. Check the URL and network.`
+      };
+    }
   }
   /**
    * Process HTML content to handle user mentions and page links
@@ -156475,15 +156513,23 @@ var ConfluenceGetPageTool = class _ConfluenceGetPageTool extends BaseTool {
         returnDisplay: validationError
       };
     }
-    const { page_id, convert_to_markdown = true } = params;
+    const { confluence_url, convert_to_markdown = true } = params;
     const personal_access_token = this.config.getConfluenceToken();
     if (!personal_access_token) {
       return {
-        llmContent: "Error: Confluence Personal Access Token not found in keys.json. Please configure it first.",
-        returnDisplay: "Confluence token not configured"
+        llmContent: `Error: ${CONFLUENCE_TOKEN_MISSING_MESSAGE}`,
+        returnDisplay: CONFLUENCE_TOKEN_MISSING_MESSAGE
       };
     }
     try {
+      const resolved = await this.getPageIdFromUrl(confluence_url, personal_access_token, signal);
+      if ("error" in resolved) {
+        return {
+          llmContent: `Error: ${resolved.error}`,
+          returnDisplay: resolved.error
+        };
+      }
+      const page_id = resolved.pageId;
       const isCloud = CONFLUENCE_URL.includes(".atlassian.net");
       const apiUrl = `${CONFLUENCE_URL.replace(/\/$/, "")}/rest/api/content/${page_id}`;
       const paramsObj = new URLSearchParams({
@@ -156592,7 +156638,7 @@ ${processedContent}
         returnDisplay: `Retrieved Confluence page: ${title}`
       };
     } catch (error) {
-      const errorMessage = `Error retrieving Confluence page ${page_id}: ${getErrorMessage(error)}`;
+      const errorMessage = `Error retrieving Confluence page: ${getErrorMessage(error)}`;
       console.error(errorMessage, error);
       return {
         llmContent: `Error: ${errorMessage}`,
@@ -156726,8 +156772,8 @@ var JiraGetIssueTool = class _JiraGetIssueTool extends BaseTool {
     const personal_access_token = this.config.getJiraToken();
     if (!personal_access_token) {
       return {
-        llmContent: "Error: Jira Personal Access Token not found in keys.json. Please configure it first.",
-        returnDisplay: "Jira token not configured"
+        llmContent: `Error: ${JIRA_TOKEN_MISSING_MESSAGE}`,
+        returnDisplay: JIRA_TOKEN_MISSING_MESSAGE
       };
     }
     try {
@@ -165103,6 +165149,8 @@ var DEFAULT_OTLP_ENDPOINT = "http://localhost:4317";
 
 // packages/core/dist/src/config/config.js
 init_models();
+var CONFLUENCE_TOKEN_MISSING_MESSAGE = "Confluence Personal Access Token not found. Set it with: frankcli set confluence token <Personal Access Tokens>. Create a token at: https://confluence.rakuten-it.com/confluence/plugins/personalaccesstokens/usertokens.action";
+var JIRA_TOKEN_MISSING_MESSAGE = "Jira Personal Access Token not found. Set it with: frankcli set jira token <Personal Access Tokens>. Create a token at: https://jira.rakuten-it.com/jira/secure/ViewProfile.jspa";
 var ApprovalMode;
 (function(ApprovalMode2) {
   ApprovalMode2["DEFAULT"] = "default";
@@ -165386,12 +165434,22 @@ var Config = class {
     return { memoryContent, fileCount };
   }
   /**
-   * Get Confluence Advanced Access Token from keys.json
+   * Get Confluence Advanced Access Token. Checks env X_ID_CONFLUENCE_ACCESS_TOKEN first, then ~/.mpdai/confluence.key, then keys.json.
    * @returns The Personal Access Token or null if not found
    */
   getConfluenceToken() {
     try {
-      const keysJsonPath = join11(homedir6(), ".mpdai", "keys.json");
+      const envToken = process10.env.X_ID_CONFLUENCE_ACCESS_TOKEN?.trim();
+      if (envToken)
+        return envToken;
+      const mpdaiDir = join11(homedir6(), ".mpdai");
+      const keyFilePath = join11(mpdaiDir, "confluence.key");
+      if (existsSync5(keyFilePath)) {
+        const value = readFileSync8(keyFilePath, "utf-8").trim();
+        if (value)
+          return value;
+      }
+      const keysJsonPath = join11(mpdaiDir, "keys.json");
       if (!existsSync5(keysJsonPath)) {
         return null;
       }
@@ -165403,17 +165461,27 @@ var Config = class {
       }
       return null;
     } catch (error) {
-      console.error("Failed to read Confluence token from keys.json:", error);
+      console.error("Failed to read Confluence token:", error);
       return null;
     }
   }
   /**
-   * Get Jira Personal Access Token from keys.json
+   * Get Jira Personal Access Token. Checks env X_ID_JIRA_ACCESS_TOKEN first, then ~/.mpdai/jira.key, then keys.json.
    * @returns The Personal Access Token or null if not found
    */
   getJiraToken() {
     try {
-      const keysJsonPath = join11(homedir6(), ".mpdai", "keys.json");
+      const envToken = process10.env.X_ID_JIRA_ACCESS_TOKEN?.trim();
+      if (envToken)
+        return envToken;
+      const mpdaiDir = join11(homedir6(), ".mpdai");
+      const keyFilePath = join11(mpdaiDir, "jira.key");
+      if (existsSync5(keyFilePath)) {
+        const value = readFileSync8(keyFilePath, "utf-8").trim();
+        if (value)
+          return value;
+      }
+      const keysJsonPath = join11(mpdaiDir, "keys.json");
       if (!existsSync5(keysJsonPath)) {
         return null;
       }
@@ -165425,7 +165493,7 @@ var Config = class {
       }
       return null;
     } catch (error) {
-      console.error("Failed to read Jira token from keys.json:", error);
+      console.error("Failed to read Jira token:", error);
       return null;
     }
   }
@@ -166397,6 +166465,7 @@ import path33 from "path";
 var __filename = fileURLToPath7(import.meta.url);
 var __dirname4 = path33.dirname(__filename);
 var packageJson;
+var packageRoot;
 async function getPackageJson() {
   if (packageJson) {
     return packageJson;
@@ -166406,13 +166475,14 @@ async function getPackageJson() {
     return;
   }
   packageJson = result.packageJson;
+  packageRoot = path33.dirname(result.path);
   return packageJson;
 }
 
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.51";
+  return "0.1.53";
 }
 
 // packages/cli/src/config/sandboxConfig.ts