@birdybeep/cli 0.0.3 → 0.2.0

package/dist/bin.cjs

@@ -169,8 +169,9 @@ async function dispatch(argv, deps) {
     io.errline(`birdybeep ${path}: unknown option "${unknown}".`);
     return EXIT.USAGE;
   }
+  let code;
   try {
-    return await command.run({ args, flags, io });
+    code = await command.run({ args, flags, io });
   } catch (err) {
     if (err instanceof MissingInputError) {
       io.errline(
@@ -181,6 +182,13 @@ async function dispatch(argv, deps) {
     io.errline(`birdybeep ${path}: ${err instanceof Error ? err.message : String(err)}`);
     return EXIT.ERROR;
   }
+  if (deps.notifyUpdate !== void 0) {
+    try {
+      await deps.notifyUpdate({ command: pathParts[0] ?? "", flags, io });
+    } catch {
+    }
+  }
+  return code;
 }
 
 // src/commands/agent.ts
@@ -336,6 +344,12 @@ function resolveApiUrl() {
   if (env !== void 0 && env.length > 0) return env;
   return readCliConfig().apiUrl ?? DEFAULT_API_URL;
 }
+var DEFAULT_REGISTRY_URL = "https://registry.npmjs.org";
+function resolveRegistryUrl() {
+  const env = process.env["npm_config_registry"];
+  if (env !== void 0 && env.length > 0) return env;
+  return DEFAULT_REGISTRY_URL;
+}
 
 // src/diagnostics.ts
 var import_agent_core3 = require("@birdybeep/agent-core");
@@ -348,7 +362,7 @@ async function gatherIntegrations(adapters) {
     }))
   );
 }
-async function isLoggedIn(tokenOptions = {}) {
+async function isPaired(tokenOptions = {}) {
   return await (0, import_agent_core3.getToken)(tokenOptions) !== null;
 }
 function localQueueDepth() {
@@ -385,13 +399,13 @@ function createDoctorCommand(deps = {}) {
     run: async (ctx) => {
       const checks = [];
       const apiUrl = resolveApiUrl();
-      const loggedIn = await isLoggedIn(deps.tokenOptions ?? {});
+      const paired = await isPaired(deps.tokenOptions ?? {});
       checks.push(
-        loggedIn ? { name: "Machine token", ok: true } : {
+        paired ? { name: "Machine token", ok: true } : {
           name: "Machine token",
           ok: false,
           detail: "No machine token found.",
-          remedy: "Run `birdybeep login` to pair this machine."
+          remedy: "Run `birdybeep pair` to pair this machine."
         }
       );
       for (const adapter of adapters) {
@@ -519,12 +533,49 @@ function createHookCommand(deps = {}) {
   };
 }
 
-// src/commands/login.ts
-var import_agent_core7 = require("@birdybeep/agent-core");
+// src/commands/logout.ts
+var import_agent_core6 = require("@birdybeep/agent-core");
+function createClearTokenCommand(spec, deps = {}) {
+  return {
+    name: spec.name,
+    summary: spec.summary,
+    usage: `birdybeep ${spec.name}`,
+    run: async (ctx) => {
+      await (0, import_agent_core6.clearToken)(deps.tokenOptions ?? {});
+      ctx.io.emit(spec.humanMessage, { [spec.jsonKey]: true });
+      return EXIT.OK;
+    }
+  };
+}
+function createLogoutCommand(deps = {}) {
+  return createClearTokenCommand(
+    {
+      name: "logout",
+      summary: "Remove the local machine token (same as `unpair`)",
+      humanMessage: "Logged out \u2014 the machine token was removed.",
+      jsonKey: "loggedOut"
+    },
+    deps
+  );
+}
+function createUnpairCommand(deps = {}) {
+  return createClearTokenCommand(
+    {
+      name: "unpair",
+      summary: "Unpair this machine \u2014 remove the local machine token (same as `logout`)",
+      humanMessage: "Unpaired \u2014 the machine token was removed.",
+      jsonKey: "unpaired"
+    },
+    deps
+  );
+}
+
+// src/commands/pair.ts
+var import_agent_core8 = require("@birdybeep/agent-core");
 var import_uqr = require("uqr");
 
 // src/pairing.ts
-var import_agent_core6 = require("@birdybeep/agent-core");
+var import_agent_core7 = require("@birdybeep/agent-core");
 function base(apiUrl) {
   return apiUrl.replace(/\/$/, "");
 }
@@ -540,7 +591,7 @@ async function pairStart(apiUrl, input, fetchImpl) {
     body: JSON.stringify(body)
   });
   if (!res.ok) throw new Error(`pairing could not be started (HTTP ${res.status})`);
-  const parsed = import_agent_core6.pairStartResponseSchema.safeParse(await res.json());
+  const parsed = import_agent_core7.pairStartResponseSchema.safeParse(await res.json());
   if (!parsed.success) throw new Error("pairing start returned an unexpected response shape");
   return parsed.data;
 }
@@ -563,7 +614,7 @@ async function pairTokenPoll(apiUrl, deviceCode, fetchImpl, machineFingerprint)
     body: JSON.stringify(body)
   });
   if (res.ok) {
-    const parsed = import_agent_core6.pairTokenResponseSchema.safeParse(await res.json());
+    const parsed = import_agent_core7.pairTokenResponseSchema.safeParse(await res.json());
     if (!parsed.success) return { status: "pending" };
     return {
       status: "paired",
@@ -576,7 +627,7 @@ async function pairTokenPoll(apiUrl, deviceCode, fetchImpl, machineFingerprint)
     errBody = await res.json();
   } catch {
   }
-  const env = import_agent_core6.errorEnvelopeSchema.safeParse(errBody);
+  const env = import_agent_core7.errorEnvelopeSchema.safeParse(errBody);
   const code = env.success ? env.data.error.code : void 0;
   if (code === "validation_failed" || code === void 0 && res.status >= 400 && res.status < 500 && res.status !== 429) {
     return { status: "pending" };
@@ -589,27 +640,27 @@ async function pairTokenPoll(apiUrl, deviceCode, fetchImpl, machineFingerprint)
 }
 
 // src/version.ts
-var CLI_VERSION = "0.0.3".length > 0 ? "0.0.3" : "0.0.0";
+var CLI_VERSION = "0.2.0".length > 0 ? "0.2.0" : "0.0.0";
 
-// src/commands/login.ts
+// src/commands/pair.ts
 var DEFAULT_POLL_INTERVAL_MS = 2e3;
 var HEARTBEAT_MS = 15e3;
 function renderQrMatrix(qrPayload) {
   return (0, import_uqr.renderUnicodeCompact)(qrPayload, { border: 2 });
 }
-function createLoginCommand(deps = {}) {
+function createPairCommand(deps = {}) {
   const fetchImpl = deps.fetchImpl ?? fetch;
   const sleep = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
   const clock = deps.now ?? (() => Date.now());
   const renderQr = deps.renderQr ?? renderQrMatrix;
   const intervalMs = deps.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
   return {
-    name: "login",
+    name: "pair",
     summary: "Pair this machine with your BirdyBeep account (QR or manual)",
-    usage: "birdybeep login [--json]",
+    usage: "birdybeep pair [--json]",
     run: async (ctx) => {
       const apiUrl = resolveApiUrl();
-      const identity = (0, import_agent_core7.getMachineIdentity)();
+      const identity = (0, import_agent_core8.getMachineIdentity)();
       const start = await pairStart(
         apiUrl,
         { machineLabel: identity.label, os: identity.os, cliVersion: CLI_VERSION },
@@ -670,11 +721,11 @@ function createLoginCommand(deps = {}) {
       if (paired === void 0 || paired.status !== "paired") {
         ctx.io.result({ paired: false, reason: "timeout" });
         ctx.io.errline(
-          "Pairing timed out before you approved it. In the BirdyBeep app, tap \u201Cpair a machine\u201D, scan the QR (or enter the code), then run `birdybeep login` again."
+          "Pairing timed out before you approved it. In the BirdyBeep app, tap \u201Cpair a machine\u201D, scan the QR (or enter the code), then run `birdybeep pair` again."
         );
         return EXIT.ERROR;
       }
-      await (0, import_agent_core7.setToken)(paired.machineToken, deps.tokenOptions ?? {});
+      await (0, import_agent_core8.setToken)(paired.machineToken, deps.tokenOptions ?? {});
       writeCliConfig({ apiUrl });
       ctx.io.emit(`\u2713 Paired. Run \`birdybeep test\` to send a test Beep.`, {
         paired: true,
@@ -685,21 +736,6 @@ function createLoginCommand(deps = {}) {
   };
 }
 
-// src/commands/logout.ts
-var import_agent_core8 = require("@birdybeep/agent-core");
-function createLogoutCommand(deps = {}) {
-  return {
-    name: "logout",
-    summary: "Remove the local machine token",
-    usage: "birdybeep logout",
-    run: async (ctx) => {
-      await (0, import_agent_core8.clearToken)(deps.tokenOptions ?? {});
-      ctx.io.emit("Logged out \u2014 the machine token was removed.", { loggedOut: true });
-      return EXIT.OK;
-    }
-  };
-}
-
 // src/commands/queue.ts
 var import_agent_core9 = require("@birdybeep/agent-core");
 function createQueueCommand() {
@@ -756,7 +792,7 @@ function createReportStatusCommand(deps = {}) {
     run: async (ctx) => {
       const token = await (0, import_agent_core10.getToken)(deps.tokenOptions ?? {});
       if (token === null) {
-        ctx.io.errline("Not logged in \u2014 run `birdybeep login` first.");
+        ctx.io.errline("No machine token \u2014 run `birdybeep pair` first.");
         return EXIT.ERROR;
       }
       const items = await gatherItems(adapters);
@@ -801,7 +837,7 @@ function createReportStatusCommand(deps = {}) {
         });
       } else if (outcome === "terminal") {
         ctx.io.errline(
-          `Report rejected (${errorCode ?? "auth"}) \u2014 your token may be revoked. Re-run \`birdybeep login\`.`
+          `Report rejected (${errorCode ?? "auth"}) \u2014 your token may be revoked. Re-run \`birdybeep pair\`.`
         );
       } else {
         for (const e of effective) {
@@ -832,14 +868,14 @@ function createStatusCommand(deps = {}) {
     usage: "birdybeep status [--json]",
     run: async (ctx) => {
       const machine = machineIdentity();
-      const loggedIn = await isLoggedIn(deps.tokenOptions ?? {});
+      const paired = await isPaired(deps.tokenOptions ?? {});
       const integrations = await gatherIntegrations(adapters);
       const depthBefore = localQueueDepth();
       const drain = await makeSender(resolveApiUrl()).drainNow();
       const depthAfter = localQueueDepth();
       const report = {
         machine,
-        loggedIn,
+        paired,
         integrations,
         queue: { depthBefore, delivered: drain.delivered, depthAfter }
       };
@@ -847,16 +883,14 @@ function createStatusCommand(deps = {}) {
         ctx.io.result(report);
       } else {
         ctx.io.line(`Machine: ${machine.label} (${machine.os})`);
-        ctx.io.line(
-          loggedIn ? "Login:   paired" : "Login:   NOT logged in \u2014 run `birdybeep login`"
-        );
+        ctx.io.line(paired ? "Paired:  yes" : "Paired:  no \u2014 run `birdybeep pair`");
         ctx.io.line("Integrations:");
         for (const i of integrations) ctx.io.line(`  ${i.displayName}: ${i.status}`);
         ctx.io.line(
           `Queue:   ${depthBefore} queued \u2192 ${drain.delivered} delivered, ${depthAfter} remaining`
         );
       }
-      return loggedIn ? EXIT.OK : EXIT.ERROR;
+      return paired ? EXIT.OK : EXIT.ERROR;
     }
   };
 }
@@ -930,8 +964,9 @@ function createTestCommand(deps = {}) {
 // src/commands.ts
 function buildCommands() {
   return [
-    createLoginCommand(),
+    createPairCommand(),
     createLogoutCommand(),
+    createUnpairCommand(),
     createStatusCommand(),
     createTestCommand(),
     createDoctorCommand(),
@@ -942,13 +977,152 @@ function buildCommands() {
   ];
 }
 
+// src/update-check.ts
+var import_node_fs3 = require("fs");
+var import_node_path2 = require("path");
+var import_agent_core13 = require("@birdybeep/agent-core");
+var PACKAGE_NAME = "@birdybeep/cli";
+var PACKAGE_PATH = "@birdybeep%2Fcli";
+var UPDATE_CACHE_FILE = "update-check.json";
+var DEFAULT_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
+var DEFAULT_TIMEOUT_MS = 1500;
+var SKIP_COMMANDS = /* @__PURE__ */ new Set(["hook", "report-status"]);
+var SEMVER_RE = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/;
+function parseSemver(input) {
+  const m = SEMVER_RE.exec(input.trim());
+  if (m === null) return null;
+  return {
+    major: Number(m[1]),
+    minor: Number(m[2]),
+    patch: Number(m[3]),
+    prerelease: m[4] !== void 0 ? m[4].split(".") : []
+  };
+}
+function comparePrerelease(a, b) {
+  if (a.length === 0 && b.length === 0) return 0;
+  if (a.length === 0) return 1;
+  if (b.length === 0) return -1;
+  const len = Math.min(a.length, b.length);
+  for (let i = 0; i < len; i++) {
+    const ai = a[i];
+    const bi = b[i];
+    const aNum = /^\d+$/.test(ai);
+    const bNum = /^\d+$/.test(bi);
+    if (aNum && bNum) {
+      const d = Number(ai) - Number(bi);
+      if (d !== 0) return d < 0 ? -1 : 1;
+    } else if (aNum) {
+      return -1;
+    } else if (bNum) {
+      return 1;
+    } else if (ai !== bi) {
+      return ai < bi ? -1 : 1;
+    }
+  }
+  if (a.length === b.length) return 0;
+  return a.length < b.length ? -1 : 1;
+}
+function compareSemver(a, b) {
+  if (a.major !== b.major) return a.major < b.major ? -1 : 1;
+  if (a.minor !== b.minor) return a.minor < b.minor ? -1 : 1;
+  if (a.patch !== b.patch) return a.patch < b.patch ? -1 : 1;
+  return comparePrerelease(a.prerelease, b.prerelease);
+}
+function isNewer(current, latest) {
+  const cur = parseSemver(current);
+  const lat = parseSemver(latest);
+  return cur !== null && lat !== null && compareSemver(cur, lat) < 0;
+}
+function updateCachePath() {
+  return (0, import_node_path2.join)((0, import_agent_core13.birdyBeepConfigDir)(), UPDATE_CACHE_FILE);
+}
+function readUpdateCache() {
+  try {
+    const parsed = JSON.parse((0, import_node_fs3.readFileSync)(updateCachePath(), "utf8"));
+    if (typeof parsed !== "object" || parsed === null) return null;
+    const { checkedAt, latest } = parsed;
+    if (typeof checkedAt !== "number") return null;
+    if (latest !== null && typeof latest !== "string") return null;
+    return { checkedAt, latest };
+  } catch {
+    return null;
+  }
+}
+function writeUpdateCache(cache) {
+  (0, import_node_fs3.mkdirSync)((0, import_agent_core13.birdyBeepConfigDir)(), { recursive: true, mode: 448 });
+  (0, import_node_fs3.writeFileSync)(updateCachePath(), `${JSON.stringify(cache)}
+`, { mode: 384 });
+}
+async function fetchLatestVersion(registryUrl, fetchImpl, timeoutMs) {
+  const url = `${registryUrl.replace(/\/+$/, "")}/${PACKAGE_PATH}/latest`;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  if (typeof timer.unref === "function") timer.unref();
+  try {
+    const res = await fetchImpl(url, {
+      headers: { accept: "application/json" },
+      signal: controller.signal
+    });
+    if (!res.ok) throw new Error(`registry responded ${res.status}`);
+    const body = await res.json();
+    if (typeof body.version !== "string" || body.version.length === 0) {
+      throw new Error("registry response had no version");
+    }
+    return body.version;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function renderNotice(current, latest) {
+  return `a new version of birdybeep is available: ${current} \u2192 ${latest}
+upgrade with: npm install -g ${PACKAGE_NAME}@latest`;
+}
+async function maybeNotifyUpdate(opts) {
+  try {
+    if (opts.command !== void 0 && SKIP_COMMANDS.has(opts.command)) return;
+    if (opts.flags.json || opts.flags.nonInteractive) return;
+    const env = opts.env ?? process.env;
+    if (env["BIRDYBEEP_NO_UPDATE_NOTIFIER"] || env["NO_UPDATE_NOTIFIER"] || env["CI"]) return;
+    const isTTY = opts.isTTY ?? Boolean(process.stderr.isTTY);
+    if (!isTTY) return;
+    const current = opts.currentVersion ?? CLI_VERSION;
+    const now = opts.now ?? Date.now();
+    const intervalMs = opts.intervalMs ?? DEFAULT_CHECK_INTERVAL_MS;
+    const readCache = opts.readCache ?? readUpdateCache;
+    const writeCache = opts.writeCache ?? writeUpdateCache;
+    let cache = readCache();
+    if (cache === null || now - cache.checkedAt >= intervalMs) {
+      let latest = cache?.latest ?? null;
+      try {
+        latest = await fetchLatestVersion(
+          opts.registryUrl ?? resolveRegistryUrl(),
+          opts.fetchImpl ?? fetch,
+          opts.timeoutMs ?? DEFAULT_TIMEOUT_MS
+        );
+      } catch {
+      }
+      cache = { checkedAt: now, latest };
+      try {
+        writeCache(cache);
+      } catch {
+      }
+    }
+    if (cache.latest !== null && isNewer(current, cache.latest)) {
+      opts.io.errline(renderNotice(current, cache.latest));
+    }
+  } catch {
+  }
+}
+
 // src/cli.ts
 function runCli(argv, deps = {}) {
+  const notifyUpdate = deps.updateCheck === false ? void 0 : (ctx) => maybeNotifyUpdate({ ...ctx, ...deps.updateCheck ?? {} });
   return dispatch(argv, {
     version: CLI_VERSION,
     commands: deps.commands ?? buildCommands(),
     stdout: deps.stdout ?? process.stdout,
     stderr: deps.stderr ?? process.stderr,
+    ...notifyUpdate !== void 0 ? { notifyUpdate } : {},
     ...deps.ensureConfig !== void 0 ? { ensureConfig: deps.ensureConfig } : {}
   });
 }