premanmcp 1.0.1 → 1.0.2

package/bin/integrations.js

@@ -15,6 +15,7 @@
  */
 
 import { describeCheckout, explainNoCheckout, resolveCheckout } from "./repo.js";
+import { desktopAppInstalled, writeDesktopSession } from "./desktop.js";
 import {
   DEFAULT_BACKEND,
   assertOk,
@@ -254,7 +255,7 @@ export async function awsCommand(args) {
 // GitHub
 // ---------------------------------------------------------------------------
 
-export async function githubCommand(args) {
+export async function githubCommand(args, { ensureDesktopApp = null } = {}) {
   const token = requireKey(args);
 
   // This route answers with a bare array; callBackendJson exposes it as `list`.
@@ -265,15 +266,24 @@ export async function githubCommand(args) {
 
   const seen = new Set((await listRepos()).map((r) => r.id));
 
-  // `return_to: "desktop"` because the person who ran this is in a terminal and
-  // the CLI is already polling for the installation. The web return 302s the
-  // tab into the hosted dashboard � an app they did not ask for, on whichever
-  // environment owns the App's setup URL. The desktop return finishes on a page
-  // that offers PreMan and says the tab may be closed, which is all the browser
-  // still has to do here.
+  // The desktop return is the right ending for a run started in a terminal: the
+  // CLI is already polling for the installation, and the web return 302s the
+  // tab into the hosted dashboard — an app they did not ask for, on whichever
+  // environment owns the App's setup URL.
+  //
+  // What it must never be is unconditional. That page's only action is a
+  // preman:// link, and a machine with no app answers one with a system dialog
+  // reading "There is no application set to open the URL preman://open". That is
+  // where a first run actually ended, every time: the app installs at the end of
+  // this walk and GitHub is asked about in the middle, so by the time this link
+  // was minted there had never been an app. A caller may put one there first;
+  // without one, the web return is the only ending that leads anywhere.
+  const hasDesktopApp = ensureDesktopApp
+    ? await ensureDesktopApp()
+    : desktopAppInstalled(args.value("--dest", "/Applications"));
   const started = await callBackendJson(args, "POST", "/integrations/github/app/install", {
     token,
-    json: { return_to: "desktop" },
+    json: { return_to: hasDesktopApp ? "desktop" : "web" },
   });
   assertOk(started, "start GitHub install");
 
@@ -590,6 +600,12 @@ async function askStep(question, { assumeYes, canGoBack, defaultYes = true }) {
  * only step that asks nothing: by then every decision is made, and a download is
  * something to leave running, not something to make someone watch first.
  *
+ * With one exception, and it is not a preference. Connecting a repository ends
+ * with GitHub handing the browser back through a preman:// link, and a machine
+ * with no app answers that with a system dialog rather than a window. So saying
+ * yes to the repository pulls the download forward to just before it; saying no
+ * leaves the order exactly as described above.
+ *
  * The steps themselves live in connect/guide.js, which is also what
  * `preman connect --guide` runs. Two walks that asked the same questions in
  * different words with different defaults was the thing worth deleting.
@@ -631,6 +647,43 @@ export async function onboardCommand(
   // is said in one place rather than before PreMan has looked at the code.
   const checkout = await resolveCheckout(args, resolveApiKey(args));
 
+  // What the app install did, once, shared by the step that needs an app to
+  // exist and the step that owns installing one.
+  //
+  // GitHub's callback ends on a page whose only action is a preman:// link, and
+  // the app is the last step of this walk — so a first run always handed GitHub
+  // back to a machine with nothing to open it with, and macOS said so in a
+  // dialog. The download moves in front of that step when it is needed and stays
+  // where it was when it is not: someone who declines the repository never
+  // reaches this, and still gets the app at the end.
+  //
+  // Memoised because it is a hundred megabytes and both callers want the same
+  // copy of it. Answers whether there is now an app on this machine, which is
+  // the only part either caller can act on.
+  let desktopInstall = null;
+  const installedNow = (result) => result?.state === "installed" || result?.state === "current";
+  const ensureDesktopApp = async ({ onInstalled } = {}) => {
+    const already = desktopPrecheck(args);
+    if (already?.state === "installed") return true;
+    // --no-desktop, or a platform with no build. Nothing to install here, and so
+    // nothing that could ever answer a preman:// link either.
+    if (already) return false;
+    if (!desktopInstall) {
+      process.stdout.write(
+        "Getting the PreMan app first, so GitHub has somewhere to hand you back to.\n"
+      );
+      desktopInstall = await runDesktopInstall(args, {
+        install: () => installDesktop([...commandArgs], onInstalled ? { onInstalled } : undefined),
+      });
+      // Handed the session the moment it lands, before anything can launch it.
+      // The app reads one only when it starts, and the callback's deep link is a
+      // start — without this it opens on a login screen for an account signed in
+      // ninety seconds ago.
+      if (installedNow(desktopInstall)) writeDesktopSession(creds);
+    }
+    return installedNow(desktopInstall);
+  };
+
   const steps = [
     {
       // No question. Everything below is a decision about code PreMan has not
@@ -672,7 +725,7 @@ export async function onboardCommand(
         return `Connect ${checkout.slug} so PreMan can open pull requests for the ${found} endpoint${found === 1 ? "" : "s"} it just mapped?`;
       },
       run: async () => {
-        await githubCommand(args);
+        await githubCommand(args, { ensureDesktopApp });
         // Finishing the App install is not the same as this repository being
         // connected: the install shares whichever repositories the customer
         // picked, which may not include this one. Re-asking is the difference
@@ -783,66 +836,55 @@ export async function onboardCommand(
   // and someone who already has the app does not watch it download again — both
   // of which happened when the check came after.
   const desktop = desktopPrecheck(args);
-  if (desktop?.state === "installed") {
+  if (desktop?.state === "installed" || !desktop) {
     steps.push({
       name: "Desktop app",
-      // Nothing to download, which is the point of this branch. It is not a
-      // reason to stop at the sentence: the step exists to leave the customer
-      // looking at PreMan, so the one run with nothing to install was also the
-      // only run that opened nothing, and it closed by sending someone to a
-      // website instead of the app already sitting on their machine.
+      // No question. See offerDesktop in connect/guide.js for why the ask went
+      // away; `--no-desktop` is the way past it.
+      //
+      // Installing and launching used to be one thing here, which is why the one
+      // run with nothing to install was also the only run that opened nothing: it
+      // stopped at the sentence and sent someone to a website instead of the app
+      // already sitting on their machine. They are two things now, and the
+      // install may have happened further up the walk, so this step is the launch
+      // and ensureDesktopApp decides whether anything is left to download.
       run: async () => {
-        process.stdout.write(`${MARK.ok()} PreMan desktop app already installed.\n`);
-        const stopOpening = showOpeningDesktop();
+        // Said only when this walk did not just download it. After an install of
+        // our own, announcing that it is already installed is the walk telling
+        // somebody about their own last thirty seconds.
+        if (!desktopInstall && desktopPrecheck(args)?.state === "installed") {
+          process.stdout.write(`${MARK.ok()} PreMan desktop app already installed.\n`);
+        }
+        let stopOpening = null;
         try {
+          const ready = await ensureDesktopApp({
+            onInstalled: () => {
+              stopOpening ??= showOpeningDesktop();
+            },
+          });
+          if (!ready) {
+            if (desktopInstall?.state === "unsupported") {
+              // Not a failure: the download link has already been printed, and
+              // the account this step exists to create is finished either way.
+              process.stdout.write("Sign in there with the account you just used.\n");
+            }
+            // A failed install already said so through runDesktopInstall, and its
+            // state is what keeps this out of the summary as a skip.
+            return desktopInstall || { state: "skipped" };
+          }
+          stopOpening ??= showOpeningDesktop();
           return {
+            ...(desktopInstall || {}),
+            // Onboarding installs *and* hands the fresh session over, so the app
+            // opens already signed in rather than on a login screen for the
+            // account created ninety seconds ago.
             appOpened: await showDesktopSignedIn(openDesktopSignedIn, args, creds, stopOpening),
           };
         } finally {
-          stopOpening();
+          stopOpening?.();
         }
       },
     });
-  } else if (!desktop) {
-    steps.push({
-      name: "Desktop app",
-      // No question. See offerDesktop in connect/guide.js for why the ask went
-      // away; `--no-desktop` is the way past it.
-      run: () =>
-        runDesktopInstall(args, {
-          // Onboarding installs *and* hands the fresh session over, so the app
-          // opens already signed in rather than on a login screen for the
-          // account created ninety seconds ago.
-          install: async () => {
-            let stopOpening = null;
-            try {
-              const installed = await installDesktop([...commandArgs], {
-                onInstalled: () => {
-                  stopOpening ??= showOpeningDesktop();
-                },
-              });
-              if (installed?.state === "unsupported") {
-                // Not a failure: the download link has already been printed, and
-                // the account this step exists to create is finished either way.
-                process.stdout.write("Sign in there with the account you just used.\n");
-                return installed;
-              }
-              stopOpening ??= showOpeningDesktop();
-              return {
-                ...installed,
-                appOpened: await showDesktopSignedIn(
-                  openDesktopSignedIn,
-                  args,
-                  creds,
-                  stopOpening
-                ),
-              };
-            } finally {
-              stopOpening?.();
-            }
-          },
-        }),
-    });
   }
 
   // Outcome per step rather than three lists, so revisiting a step replaces its

package/bin/verify.js

@@ -27,7 +27,7 @@ import { changedFilesForPush, readChangedFiles, readPushRefsFromStdin, repoRoot
 import { missingMountPrefix, resolveLocalTarget } from "./detect.js";
 import { formatDashboardLink, formatPushLink } from "./link.js";
 import { createReporter } from "./progress.js";
-import { backendUrl, callBackendJson, cliInvocation, frontendUrl, makeArgs, nowMs, resolveApiKey } from "./shared.js";
+import { backendUrl, callBackendJson, cliInvocation, describeFailure, frontendUrl, makeArgs, nowMs, resolveApiKey } from "./shared.js";
 
 export const VERIFY_HELP = `
 Verify options:
@@ -250,7 +250,11 @@ async function fetchInventory(args, token) {
     if (!result.ok) {
       return {
         endpoints,
-        error: result.detail || `status ${result.status_code}`,
+        // FastAPI answers a rejected request with an object, and a validation
+        // error with an array of them. Interpolated straight into the skip
+        // line, both read as "[object Object]" -- which is what every push
+        // against a backend that said no has printed.
+        error: describeFailure(result, `status ${result.status_code}`),
       };
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "premanmcp",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "PreMan CLI and stdio proxy for PreMan's hosted MCP server",
   "type": "module",
   "bin": {