@birdybeep/cli 0.0.3 → 0.1.0

package/dist/bin.cjs

@@ -348,7 +348,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 +385,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 +519,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 +577,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 +600,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 +613,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 +626,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.1.0".length > 0 ? "0.1.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 +707,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 +722,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 +778,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 +823,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 +854,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 +869,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 +950,9 @@ function createTestCommand(deps = {}) {
 // src/commands.ts
 function buildCommands() {
   return [
-    createLoginCommand(),
+    createPairCommand(),
     createLogoutCommand(),
+    createUnpairCommand(),
     createStatusCommand(),
     createTestCommand(),
     createDoctorCommand(),