premanmcp 0.9.0 → 0.10.1

package/bin/hook.js

@@ -56,8 +56,10 @@ if [ -z "\${PREMAN_SKIP_HOOK}" ]; then
   if [ "$preman_status" -eq ${BLOCK_EXIT_CODE} ]; then
     exit ${BLOCK_EXIT_CODE}
   fi
-  if [ "$preman_status" -ne 0 ]; then
-    printf '[preman] checks skipped (%s)\\n' "advisory" >&2
+  if [ "$preman_status" -eq 127 ]; then
+    printf '[preman] the PreMan CLI is not on PATH; push checks skipped\\n' >&2
+  elif [ "$preman_status" -ne 0 ]; then
+    printf '[preman] checks skipped (advisory, exit %s)\\n' "$preman_status" >&2
   fi
 fi
 ${END_MARKER}
@@ -116,11 +118,21 @@ export function uninstallHook() {
   return { path: target, action: "removed" };
 }
 
+/**
+ * `current` is what tells a caller an installed hook still needs rewriting.
+ *
+ * A hook is generated shell holding one invocation, and that invocation can go
+ * stale — the machine gained a `preman` that is not ours, or lost the one that
+ * was. "Installed" then means a file exists that calls the wrong thing on every
+ * push, so anything that skips work when the hook is present has to be able to
+ * tell the difference.
+ */
 export function hookStatus() {
   const target = hookPath();
-  if (!existsSync(target)) return { path: target, state: "absent" };
+  if (!existsSync(target)) return { path: target, state: "absent", current: false };
   const existing = readFileSync(target, "utf8");
-  return { path: target, state: isOurHook(existing) ? "installed" : "foreign" };
+  if (!isOurHook(existing)) return { path: target, state: "foreign", current: false };
+  return { path: target, state: "installed", current: existing === hookBody() };
 }
 
 export async function hookCommand(commandArgs = []) {

package/bin/integrations.js

@@ -17,6 +17,7 @@
 import {
   assertOk,
   callBackendJson,
+  cliInvocation,
   frontendUrl,
   openUrl,
   promptText,
@@ -41,9 +42,9 @@ function paint(code, text) {
 }
 
 export const MARK = {
-  ok: () => paint("32", "?"),
-  skip: () => paint("90", "?"),
-  fail: () => paint("31", "?"),
+  ok: () => paint("32", "✓"),
+  skip: () => paint("90", "·"),
+  fail: () => paint("31", "✗"),
 };
 
 /** A finished step, marked so it can be found at a glance. */
@@ -74,8 +75,10 @@ export class Unrecoverable extends Error {}
  * Returns the truthy value from ``check``, or null on timeout. Ordinary
  * exceptions are swallowed and retried; :class:`Unrecoverable` stops the wait.
  */
-async function waitFor(label, check) {
-  const deadline = Date.now() + POLL_TIMEOUT_MS;
+async function waitFor(label, check, { hint = "", hintAfterMs = 60000 } = {}) {
+  const startedAt = Date.now();
+  const deadline = startedAt + POLL_TIMEOUT_MS;
+  let hinted = false;
   process.stdout.write(`Waiting for ${label}`);
   while (Date.now() < deadline) {
     try {
@@ -91,6 +94,12 @@ async function waitFor(label, check) {
       }
       /* keep waiting; the customer is elsewhere */
     }
+    // A minute of dots is indistinguishable from a hang, and the reason this
+    // waits forever is usually something the customer can act on.
+    if (hint && !hinted && Date.now() - startedAt > hintAfterMs) {
+      hinted = true;
+      process.stdout.write(`\n${hint}\nStill waiting`);
+    }
     process.stdout.write(".");
     await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
   }
@@ -101,7 +110,7 @@ async function waitFor(label, check) {
 function requireKey(args) {
   const apiKey = resolveApiKey(args);
   if (!apiKey) {
-    throw new Error("Not signed in. Run 'preman login' first.");
+    throw new Error(`Not signed in. Run '${cliInvocation()} login' first.`);
   }
   return apiKey;
 }
@@ -156,7 +165,7 @@ export async function awsCommand(args) {
   }
 
   if (!verified) {
-    process.stdout.write("Timed out. Re-run 'preman aws' once the stack finishes.\n");
+    process.stdout.write(`Timed out. Re-run '${cliInvocation()} aws' once the stack finishes.\n`);
     return;
   }
   connected(`AWS connected: ${verified.role_arn}`);
@@ -223,23 +232,35 @@ export async function githubCommand(args) {
   present(url, "install the PreMan GitHub App");
   process.stdout.write("Pick the repositories PreMan may read.\n");
 
-  const done = await waitFor("the installation", async () => {
-    // Installing the App and having repositories appear are two events: the
-    // callback records the installation, and a refresh materialises the repos.
-    // Polling the repo list alone waits for something that may never arrive on
-    // its own.
-    await callBackendJson(args, "POST", "/integrations/github/app/refresh", {
-      token,
-      json: {},
-    });
-    // Compare against what existed before, so a user who already had repos
-    // connected is not told they are done the moment polling starts.
-    const fresh = (await listRepos()).filter((r) => !seen.has(r.id));
-    return fresh.length ? fresh : null;
-  });
+  const done = await waitFor(
+    "the installation",
+    async () => {
+      // Installing the App and having repositories appear are two events: the
+      // callback records the installation, and a refresh materialises the repos.
+      // Polling the repo list alone waits for something that may never arrive on
+      // its own.
+      await callBackendJson(args, "POST", "/integrations/github/app/refresh", {
+        token,
+        json: {},
+      });
+      // Compare against what existed before, so a user who already had repos
+      // connected is not told they are done the moment polling starts.
+      const fresh = (await listRepos()).filter((r) => !seen.has(r.id));
+      return fresh.length ? fresh : null;
+    },
+    {
+      hint:
+        "PreMan has not heard from GitHub yet. Finish the install in the browser tab —\n" +
+        "pick at least one repository and confirm — and GitHub will send you back here.",
+    }
+  );
 
   if (!done) {
-    process.stdout.write("Timed out. Re-run 'preman github' if the install finished.\n");
+    process.stdout.write(
+      `Timed out: GitHub never told PreMan about an installation.\n` +
+        `  - Check that the App is installed: https://github.com/settings/installations\n` +
+        `  - Then re-run '${cliInvocation()} github'.\n`
+    );
     return;
   }
   connected(`GitHub connected: ${done.length} repository(ies).`);
@@ -270,7 +291,7 @@ export async function slackCommand(args) {
   });
 
   if (!done) {
-    process.stdout.write("Timed out. Re-run 'preman slack' if the install finished.\n");
+    process.stdout.write(`Timed out. Re-run '${cliInvocation()} slack' if the install finished.\n`);
     return;
   }
   connected(`Slack connected: ${done[0].team_name || done[0].id}`);
@@ -329,7 +350,7 @@ export async function onboardCommand(commandArgs, { makeArgs, authenticateTermin
   let i = 0;
   while (i < steps.length) {
     const step = steps[i];
-    process.stdout.write(`\n?? ${step.name} ??\n`);
+    process.stdout.write(`\n── ${step.name} ──\n`);
 
     const choice = await askStep(step.question, { assumeYes, canGoBack: i > 0 });
     if (choice === "back") {
@@ -357,7 +378,7 @@ export async function onboardCommand(commandArgs, { makeArgs, authenticateTermin
     i += 1;
   }
 
-  process.stdout.write("\n?? done ??\n");
+  process.stdout.write("\n── done ──\n");
   // One line per step, marked, so the outcome is scannable rather than prose.
   for (const step of steps) {
     const result = outcome.get(step.name);