@mcp-use/cli 3.5.2-canary.1 → 3.5.2-canary.10

package/dist/index.js

@@ -1136,7 +1136,7 @@ import os3 from "os";
 import path3 from "path";
 var CONFIG_DIR = path3.join(os3.homedir(), ".mcp-use");
 var CONFIG_FILE = path3.join(CONFIG_DIR, "config.json");
-var DEFAULT_API_URL = process.env.MCP_API_URL ? process.env.MCP_API_URL.replace(/\/api\/v1$/, "") + "/api/v1" : "https://cloud.mcp-use.com/api/v1";
+var DEFAULT_API_URL = process.env.MCP_API_URL ? process.env.MCP_API_URL.replace(/\/api\/v1$/, "") + "/api/v1" : "https://cloud.manufact.com/api/v1";
 var DEFAULT_WEB_URL = process.env.MCP_WEB_URL ? process.env.MCP_WEB_URL : "https://manufact.com";
 async function ensureConfigDir() {
   try {
@@ -1550,37 +1550,51 @@ var McpUseAPI = class _McpUseAPI {
       }))
     };
   }
-  async getGitHubRepos(_refresh) {
-    const orgId = await this.resolveOrganizationId();
-    const installResp = await this.request(`/github/installations?organizationId=${orgId}`);
-    if (installResp.installations.length === 0) {
-      return { user: { login: "", id: 0, avatar_url: "" }, repos: [] };
+  /**
+   * Returns true if the GitHub App can access `${owner}/${repo}` via any of the
+   * organization's installations.
+   *
+   * An organization can have multiple GitHub installations (e.g. a personal
+   * account and one or more GitHub orgs), so we check across all of them.
+   *
+   * Each check is a single authoritative backend call (`repos.get` with the
+   * installation token) rather than listing repos. The old listing approach
+   * only returned the first page — so a repo on a later page was wrongly
+   * reported inaccessible — and fully paginating it hung on very large orgs.
+   * We try the installation whose account matches the repo owner first to
+   * minimize GitHub calls.
+   */
+  async checkGitHubRepoAccess(owner, repo) {
+    const status = await this.getGitHubConnectionStatus();
+    const installations = status.installations ?? [];
+    if (installations.length === 0) return false;
+    const ownerLower = owner.toLowerCase();
+    const ordered = [...installations].sort((a, b) => {
+      const aMatch = a.account_login.toLowerCase() === ownerLower ? 0 : 1;
+      const bMatch = b.account_login.toLowerCase() === ownerLower ? 0 : 1;
+      return aMatch - bMatch;
+    });
+    for (const installation of ordered) {
+      const hasAccess = await this.installationCanAccessRepo(
+        installation.installation_id,
+        owner,
+        repo
+      );
+      if (hasAccess) return true;
+    }
+    return false;
+  }
+  async installationCanAccessRepo(installationId, owner, repo) {
+    try {
+      const resp = await this.request(
+        `/github/installations/${installationId}/repos/${encodeURIComponent(
+          owner
+        )}/${encodeURIComponent(repo)}/access`
+      );
+      return resp.hasAccess;
+    } catch {
+      return false;
     }
-    const inst = installResp.installations[0];
-    const repoLists = await Promise.all(
-      installResp.installations.map(async (installation) => {
-        try {
-          const reposResp = await this.request(`/github/installations/${installation.installationId}/repos`);
-          return reposResp.repos;
-        } catch {
-          return [];
-        }
-      })
-    );
-    return {
-      user: {
-        login: inst.account?.login ?? "",
-        id: 0,
-        avatar_url: inst.account?.avatar_url ?? ""
-      },
-      repos: repoLists.flat().map((r) => ({
-        id: r.id,
-        name: r.name,
-        full_name: r.fullName,
-        private: r.private,
-        owner: { login: r.fullName.split("/")[0] ?? "" }
-      }))
-    };
   }
   async getGitHubAppName() {
     if (process.env.MCP_GITHUB_APP_NAME) return process.env.MCP_GITHUB_APP_NAME;
@@ -4017,6 +4031,71 @@ async function describeToolCommand(name, toolName) {
   }
   await cleanupAndExit(0);
 }
+async function processToolScreenshot(session, toolName, args, callResult, options) {
+  const toolWithMeta = session.tools.find((t) => t.name === toolName);
+  const resourceUri = detectToolResourceUri(toolWithMeta);
+  const wantsScreenshot = options?.screenshot === true || options?.screenshotOutput !== void 0 || options?.screenshotDeviceScaleFactor !== void 0;
+  let screenshot = null;
+  let screenshotError = null;
+  let widgetHintUri = null;
+  if (resourceUri) {
+    if (wantsScreenshot) {
+      console.error(
+        formatInfo(`Capturing widget screenshot (${resourceUri})...`)
+      );
+      try {
+        const screenshotOpts = {};
+        if (options?.screenshotOutput) {
+          screenshotOpts.output = options.screenshotOutput;
+        }
+        if (options?.screenshotDeviceScaleFactor) {
+          screenshotOpts.deviceScaleFactor = parseDeviceScaleFactor(
+            options.screenshotDeviceScaleFactor
+          );
+        }
+        const shot = await captureToolScreenshot(
+          {
+            session,
+            toolName,
+            toolArgs: args,
+            toolOutput: callResult,
+            resourceUri
+          },
+          screenshotOpts
+        );
+        screenshot = {
+          path: shot.outputPath,
+          width: shot.width,
+          height: shot.height,
+          view: shot.view
+        };
+      } catch (err) {
+        screenshotError = err?.message ?? String(err);
+      }
+    } else {
+      widgetHintUri = resourceUri;
+    }
+  }
+  if (screenshot) {
+    console.error(
+      formatSuccess(
+        `Saved widget screenshot: ${screenshot.path} (${screenshot.width}\xD7${screenshot.height})`
+      )
+    );
+  }
+  if (screenshotError) {
+    console.error(
+      formatWarning(`Skipped widget screenshot: ${screenshotError}`)
+    );
+  }
+  if (widgetHintUri) {
+    console.error(
+      formatInfo(
+        `This tool renders a widget (${widgetHintUri}). Re-run with --screenshot to save a PNG of it.`
+      )
+    );
+  }
+}
 async function callToolCommand(name, toolName, argsList, options) {
   try {
     const result = await getOrRestoreSession(name);
@@ -4066,74 +4145,12 @@ async function callToolCommand(name, toolName, argsList, options) {
     const callResult = await session.callTool(toolName, args, {
       timeout: options?.timeout
     });
-    const toolWithMeta = session.tools.find((t) => t.name === toolName);
-    const resourceUri = detectToolResourceUri(toolWithMeta);
-    const wantsScreenshot = options?.screenshot === true || options?.screenshotOutput !== void 0 || options?.screenshotDeviceScaleFactor !== void 0;
-    let screenshot = null;
-    let screenshotError = null;
-    let widgetHintUri = null;
-    if (resourceUri) {
-      if (wantsScreenshot) {
-        console.error(
-          formatInfo(`Capturing widget screenshot (${resourceUri})...`)
-        );
-        try {
-          const screenshotOpts = {};
-          if (options?.screenshotOutput) {
-            screenshotOpts.output = options.screenshotOutput;
-          }
-          if (options?.screenshotDeviceScaleFactor) {
-            screenshotOpts.deviceScaleFactor = parseDeviceScaleFactor(
-              options.screenshotDeviceScaleFactor
-            );
-          }
-          const shot = await captureToolScreenshot(
-            {
-              session,
-              toolName,
-              toolArgs: args,
-              toolOutput: callResult,
-              resourceUri
-            },
-            screenshotOpts
-          );
-          screenshot = {
-            path: shot.outputPath,
-            width: shot.width,
-            height: shot.height,
-            view: shot.view
-          };
-        } catch (err) {
-          screenshotError = err?.message ?? String(err);
-        }
-      } else {
-        widgetHintUri = resourceUri;
-      }
-    }
+    await processToolScreenshot(session, toolName, args, callResult, options);
     if (options?.json) {
       console.log(formatJson(callResult));
     } else {
       console.log(formatToolCall(callResult));
     }
-    if (screenshot) {
-      console.error(
-        formatSuccess(
-          `Saved widget screenshot: ${screenshot.path} (${screenshot.width}\xD7${screenshot.height})`
-        )
-      );
-    }
-    if (screenshotError) {
-      console.error(
-        formatWarning(`Skipped widget screenshot: ${screenshotError}`)
-      );
-    }
-    if (widgetHintUri) {
-      console.error(
-        formatInfo(
-          `This tool renders a widget (${widgetHintUri}). Re-run with --screenshot to save a PNG of it.`
-        )
-      );
-    }
     if (callResult.isError) {
       await cleanupAndExit(1);
     }
@@ -4225,6 +4242,14 @@ async function subscribeResourceCommand(name, uri) {
       }
     });
     console.log(formatInfo("Listening for updates... (Press Ctrl+C to stop)"));
+    process.once("SIGINT", async () => {
+      console.log(formatInfo("\nUnsubscribing and shutting down..."));
+      try {
+        await session.unsubscribeFromResource(uri);
+      } catch (e) {
+      }
+      await cleanupAndExit(0);
+    });
     await new Promise(() => {
     });
   } catch (error) {
@@ -4355,7 +4380,7 @@ async function interactiveCommand(name) {
     console.log(source_default.gray("  tools list              - List available tools"));
     console.log(
       source_default.gray(
-        "  tools call <name>       - Call a tool (will prompt for args)"
+        "  tools call <name> [--screenshot] - Call a tool (will prompt for args)"
       )
     );
     console.log(source_default.gray("  tools describe <name>   - Show tool details"));
@@ -4402,6 +4427,7 @@ async function interactiveCommand(name) {
               )
             );
           } else if (command === "call" && arg) {
+            const wantsScreenshot = parts.includes("--screenshot");
             rl.question(
               "Arguments (JSON, or press Enter for none): ",
               async (argsInput) => {
@@ -4409,6 +4435,9 @@ async function interactiveCommand(name) {
                   const args = argsInput.trim() ? JSON.parse(argsInput) : {};
                   const result2 = await session.callTool(arg, args);
                   console.log(formatToolCall(result2));
+                  await processToolScreenshot(session, arg, args, result2, {
+                    screenshot: wantsScreenshot
+                  });
                 } catch (error) {
                   console.error(formatError(error.message));
                 }
@@ -5236,12 +5265,7 @@ async function getGitHubConnectionStatusWith401Retry(api, options, orgIdToRestor
   throw new Error("Unreachable");
 }
 async function checkRepoAccess(api, owner, repo) {
-  try {
-    const resp = await api.getGitHubRepos(true);
-    return resp.repos.some((r) => r.full_name === `${owner}/${repo}`);
-  } catch {
-    return false;
-  }
+  return api.checkGitHubRepoAccess(owner, repo);
 }
 async function promptGitHubInstallation(api, reason, repoName, opts) {
   const yes = !!opts?.yes;