@pushary/agent-hooks 1.9.7 → 1.9.9

package/dist/bin/pushary-elicitation-hook.js

@@ -1,53 +1,51 @@
 #!/usr/bin/env node
 import {
   readHookInput
-} from "../chunk-XWAYAO3V.js";
+} from "../chunk-R5RIVOPL.js";
 import {
   announceSubscriptionRequired,
   isDeferAnswer
 } from "../chunk-5OP5MQI7.js";
-import "../chunk-BTQGAXZ3.js";
+import "../chunk-COQ64C4F.js";
 import "../chunk-SGZJ5LYH.js";
-import "../chunk-SD3272LS.js";
-import "../chunk-SBLPHUEB.js";
-import "../chunk-MNWRUGMH.js";
-import "../chunk-4YO4T5FV.js";
-import "../chunk-VXRXFU6Q.js";
-import "../chunk-JCWZ23MJ.js";
-import "../chunk-7264S5HZ.js";
-import "../chunk-AUUXS44H.js";
-import "../chunk-4FK6RZVJ.js";
-import "../chunk-HPRZJKRO.js";
+import "../chunk-SZ4Q6ZVS.js";
+import "../chunk-APP43AW7.js";
+import "../chunk-462EQA6K.js";
+import "../chunk-VIIHC42X.js";
 import "../chunk-XHKBHWLX.js";
+import "../chunk-BYLKCZ2G.js";
+import "../chunk-M3STIAGU.js";
+import "../chunk-ZGADIZDS.js";
+import "../chunk-MLGIVVSG.js";
+import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
+import "../chunk-REU2VQPH.js";
 import "../chunk-N6IOSZOE.js";
-import "../chunk-6DJTDHBI.js";
+import "../chunk-MD4SVNT6.js";
 import {
   askUser,
   isDecisionStopped,
   waitForQuestion
-} from "../chunk-D6S5EKXA.js";
-import "../chunk-AVNKVF7N.js";
-import "../chunk-POFBE6ZY.js";
-import "../chunk-GMXKITVA.js";
-import "../chunk-ADSQDYYG.js";
+} from "../chunk-WRPYCIV2.js";
 import {
   SubscriptionRequiredError
-} from "../chunk-L76HTPU6.js";
-import "../chunk-KFKL3FHS.js";
-import "../chunk-JXISQ7DT.js";
+} from "../chunk-6AYSKVLL.js";
+import "../chunk-QRXPWW3M.js";
+import "../chunk-UPIZSCYD.js";
+import "../chunk-POFBE6ZY.js";
+import "../chunk-5N5L6DNN.js";
 import {
   getMachineId
-} from "../chunk-KYO45G5L.js";
+} from "../chunk-KOWFRUIT.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-4D2AYNSE.js";
-import "../chunk-ZUTU43FT.js";
+import "../chunk-BNSKVIAW.js";
+import "../chunk-Z23ZBYDW.js";
 import "../chunk-T7E75EKA.js";
 import {
   getApiKey
-} from "../chunk-Z6HPS67T.js";
-import "../chunk-STQRUH3S.js";
+} from "../chunk-IRHABAQT.js";
+import "../chunk-5DCDQ5VW.js";
 import {
   ELICITATION_ANSWERABLE_MODE,
   effectiveWaitSeconds,
@@ -58,7 +56,7 @@ import {
   planElicitationAsk,
   readElicitationFields,
   renderElicitationOutput
-} from "../chunk-QR6VE5ME.js";
+} from "../chunk-5RGA636G.js";
 
 // bin/pushary-elicitation-hook.ts
 import { basename } from "path";

package/dist/bin/pushary-gemini-bridge.js

@@ -5,10 +5,10 @@ import {
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-GKI6LFAV.js";
+} from "../chunk-RQ32ADJP.js";
 import {
   resolveProviderBinary
-} from "../chunk-T7Y5EADL.js";
+} from "../chunk-F7R3SZ4Q.js";
 import "../chunk-RIVNNBEK.js";
 import {
   SESSION_IDLE_TIMEOUT_MS,
@@ -16,29 +16,29 @@ import {
   idleDeadlinePassed,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-JWQZSYCK.js";
-import "../chunk-AUUXS44H.js";
-import "../chunk-4FK6RZVJ.js";
+} from "../chunk-NUVGDBZC.js";
+import "../chunk-APP43AW7.js";
+import "../chunk-462EQA6K.js";
 import {
   transcriptsEnabled
-} from "../chunk-HPRZJKRO.js";
+} from "../chunk-VIIHC42X.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-ADSQDYYG.js";
+import "../chunk-REU2VQPH.js";
 import {
   getMachineId
-} from "../chunk-KYO45G5L.js";
-import "../chunk-4D2AYNSE.js";
-import "../chunk-ZUTU43FT.js";
+} from "../chunk-KOWFRUIT.js";
+import "../chunk-BNSKVIAW.js";
+import "../chunk-Z23ZBYDW.js";
 import "../chunk-T7E75EKA.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-Z6HPS67T.js";
-import "../chunk-STQRUH3S.js";
-import "../chunk-QR6VE5ME.js";
+} from "../chunk-IRHABAQT.js";
+import "../chunk-5DCDQ5VW.js";
+import "../chunk-5RGA636G.js";
 
 // bin/pushary-gemini-bridge.ts
 import { existsSync } from "fs";

package/dist/bin/pushary-gemini-hook.js

@@ -1,33 +1,33 @@
 #!/usr/bin/env node
 import {
   triggerAutoUpdate
-} from "../chunk-QTO6HEZD.js";
+} from "../chunk-K545B734.js";
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "../chunk-CBQACHKY.js";
+} from "../chunk-IIVZZMSO.js";
 import {
   readHookInput
-} from "../chunk-XWAYAO3V.js";
+} from "../chunk-R5RIVOPL.js";
 import {
   announceSubscriptionRequired,
   denyReasonFrom,
   isDeferAnswer
 } from "../chunk-5OP5MQI7.js";
-import "../chunk-BTQGAXZ3.js";
+import "../chunk-COQ64C4F.js";
 import "../chunk-SGZJ5LYH.js";
-import "../chunk-SD3272LS.js";
-import "../chunk-SBLPHUEB.js";
-import "../chunk-MNWRUGMH.js";
-import "../chunk-4YO4T5FV.js";
-import "../chunk-VXRXFU6Q.js";
-import "../chunk-JCWZ23MJ.js";
-import "../chunk-7264S5HZ.js";
-import "../chunk-AUUXS44H.js";
-import "../chunk-4FK6RZVJ.js";
-import "../chunk-HPRZJKRO.js";
+import "../chunk-SZ4Q6ZVS.js";
+import "../chunk-APP43AW7.js";
+import "../chunk-462EQA6K.js";
+import "../chunk-VIIHC42X.js";
 import "../chunk-XHKBHWLX.js";
+import "../chunk-BYLKCZ2G.js";
+import "../chunk-M3STIAGU.js";
+import "../chunk-ZGADIZDS.js";
+import "../chunk-MLGIVVSG.js";
+import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
+import "../chunk-REU2VQPH.js";
 import {
   UNNAMED_ACTION,
   deriveActionBody,
@@ -46,53 +46,51 @@ import {
   repoKeyFor,
   reportEvent,
   scopePathFor
-} from "../chunk-QFEM7R6T.js";
+} from "../chunk-KQFTBQ66.js";
 import {
   DEFAULT_SESSION
 } from "../chunk-N6IOSZOE.js";
-import "../chunk-6DJTDHBI.js";
+import "../chunk-MD4SVNT6.js";
 import {
-  DECISION_STOP_REASON,
-  UNVERIFIABLE_APPROVAL_REASON,
   askUser,
   isDecisionStopped,
   isLocalQuestionHandoff,
   sendNotification,
   waitForQuestion
-} from "../chunk-D6S5EKXA.js";
+} from "../chunk-WRPYCIV2.js";
+import {
+  SubscriptionRequiredError
+} from "../chunk-6AYSKVLL.js";
+import "../chunk-QRXPWW3M.js";
 import {
   exitAfterClientReports
-} from "../chunk-AVNKVF7N.js";
+} from "../chunk-UPIZSCYD.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-GMXKITVA.js";
-import "../chunk-ADSQDYYG.js";
-import {
-  SubscriptionRequiredError
-} from "../chunk-L76HTPU6.js";
-import "../chunk-KFKL3FHS.js";
-import "../chunk-JXISQ7DT.js";
+import "../chunk-5N5L6DNN.js";
 import {
   getMachineId
-} from "../chunk-KYO45G5L.js";
+} from "../chunk-KOWFRUIT.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-4D2AYNSE.js";
-import "../chunk-ZUTU43FT.js";
+import "../chunk-BNSKVIAW.js";
+import "../chunk-Z23ZBYDW.js";
 import "../chunk-T7E75EKA.js";
 import {
   getApiKey
-} from "../chunk-Z6HPS67T.js";
-import "../chunk-STQRUH3S.js";
+} from "../chunk-IRHABAQT.js";
+import "../chunk-5DCDQ5VW.js";
 import {
+  DECISION_STOP_REASON,
   KILL_REASON,
+  UNVERIFIABLE_APPROVAL_REASON,
   effectiveWaitSeconds,
   gateOutputFor,
   hookWaitClamped,
   hookWaitDeadline,
   resolveGate
-} from "../chunk-QR6VE5ME.js";
+} from "../chunk-5RGA636G.js";
 
 // bin/pushary-gemini-hook.ts
 import { basename } from "path";

package/dist/bin/pushary-hook.js

@@ -1,64 +1,61 @@
 #!/usr/bin/env node
 import {
   handlePreToolUse
-} from "../chunk-R3YW55MY.js";
-import {
-  activeHookSource,
-  normalizeToolCall,
-  profileFromArgv
-} from "../chunk-MZPXVH4A.js";
-import "../chunk-ANEAA37E.js";
-import "../chunk-3GNUXXDZ.js";
-import "../chunk-CBQACHKY.js";
+} from "../chunk-AI7RMFVV.js";
+import "../chunk-B5NMSP3V.js";
+import "../chunk-IIVZZMSO.js";
 import {
   readToolHookInput
-} from "../chunk-XWAYAO3V.js";
+} from "../chunk-R5RIVOPL.js";
 import "../chunk-5OP5MQI7.js";
-import "../chunk-BTQGAXZ3.js";
+import "../chunk-COQ64C4F.js";
 import "../chunk-SGZJ5LYH.js";
-import "../chunk-SD3272LS.js";
-import "../chunk-SBLPHUEB.js";
-import "../chunk-MNWRUGMH.js";
-import "../chunk-4YO4T5FV.js";
-import "../chunk-VXRXFU6Q.js";
-import "../chunk-JCWZ23MJ.js";
-import "../chunk-7264S5HZ.js";
-import "../chunk-AUUXS44H.js";
-import "../chunk-4FK6RZVJ.js";
-import "../chunk-HPRZJKRO.js";
+import "../chunk-SZ4Q6ZVS.js";
+import "../chunk-APP43AW7.js";
+import "../chunk-462EQA6K.js";
+import "../chunk-VIIHC42X.js";
 import "../chunk-XHKBHWLX.js";
+import {
+  activeHookSource,
+  normalizeToolCall,
+  profileFromArgv
+} from "../chunk-UF6RBP5V.js";
+import {
+  exitOnHelpFlag
+} from "../chunk-TO3PS646.js";
+import "../chunk-BYLKCZ2G.js";
+import "../chunk-M3STIAGU.js";
+import "../chunk-ZGADIZDS.js";
+import "../chunk-MLGIVVSG.js";
+import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
+import "../chunk-REU2VQPH.js";
 import {
   canonicalGateInputs
-} from "../chunk-QFEM7R6T.js";
+} from "../chunk-KQFTBQ66.js";
 import "../chunk-N6IOSZOE.js";
-import "../chunk-6DJTDHBI.js";
-import "../chunk-D6S5EKXA.js";
+import "../chunk-MD4SVNT6.js";
+import "../chunk-WRPYCIV2.js";
+import "../chunk-6AYSKVLL.js";
+import "../chunk-QRXPWW3M.js";
 import {
   exitAfterClientReports
-} from "../chunk-AVNKVF7N.js";
+} from "../chunk-UPIZSCYD.js";
 import "../chunk-POFBE6ZY.js";
-import {
-  exitOnHelpFlag
-} from "../chunk-UFVGSEWH.js";
-import "../chunk-GMXKITVA.js";
-import "../chunk-ADSQDYYG.js";
-import "../chunk-L76HTPU6.js";
-import "../chunk-KFKL3FHS.js";
-import "../chunk-JXISQ7DT.js";
-import "../chunk-KYO45G5L.js";
+import "../chunk-5N5L6DNN.js";
+import "../chunk-KOWFRUIT.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-4D2AYNSE.js";
-import "../chunk-ZUTU43FT.js";
+import "../chunk-BNSKVIAW.js";
+import "../chunk-Z23ZBYDW.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-Z6HPS67T.js";
-import "../chunk-STQRUH3S.js";
+import "../chunk-IRHABAQT.js";
+import "../chunk-5DCDQ5VW.js";
 import {
   renderPreToolUseVerdict
-} from "../chunk-QR6VE5ME.js";
+} from "../chunk-5RGA636G.js";
 
 // bin/pushary-hook.ts
 exitOnHelpFlag("hook");

package/dist/bin/pushary-login.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {
   runBrowserLogin
-} from "../chunk-AQ55ZSSS.js";
+} from "../chunk-OAYWO5NP.js";
 import "../chunk-PUZZELE6.js";
 import {
   writeStdoutFully
 } from "../chunk-EO23EUOK.js";
 import {
   recoverDaemonAfterLogin
-} from "../chunk-VXRXFU6Q.js";
+} from "../chunk-SZ4Q6ZVS.js";
 import "../chunk-XHKBHWLX.js";
 import "../chunk-3EGEA4KH.js";
 import {
@@ -16,7 +16,7 @@ import {
 } from "../chunk-U4TMAANR.js";
 import {
   exitOnHelpFlag
-} from "../chunk-UFVGSEWH.js";
+} from "../chunk-TO3PS646.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
@@ -25,28 +25,28 @@ import {
   readControlMode,
   readKeySource,
   writeKey
-} from "../chunk-ADSQDYYG.js";
+} from "../chunk-REU2VQPH.js";
 import {
   checkApiKey,
   describeKeyCheck
-} from "../chunk-KFKL3FHS.js";
-import "../chunk-JXISQ7DT.js";
-import "../chunk-KYO45G5L.js";
+} from "../chunk-QRXPWW3M.js";
+import "../chunk-5N5L6DNN.js";
+import "../chunk-KOWFRUIT.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-4D2AYNSE.js";
-import "../chunk-ZUTU43FT.js";
+import "../chunk-BNSKVIAW.js";
+import "../chunk-Z23ZBYDW.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-Z6HPS67T.js";
-import "../chunk-STQRUH3S.js";
+import "../chunk-IRHABAQT.js";
+import "../chunk-5DCDQ5VW.js";
 import {
   getPackageVersion,
   isValidApiKey
-} from "../chunk-QR6VE5ME.js";
+} from "../chunk-5RGA636G.js";
 
 // bin/pushary-login.ts
 exitOnHelpFlag("login");

package/dist/bin/pushary-logout.js

@@ -4,41 +4,103 @@ import {
 } from "../chunk-U4TMAANR.js";
 import {
   exitOnHelpFlag
-} from "../chunk-UFVGSEWH.js";
+} from "../chunk-TO3PS646.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
 import {
   clearKey,
   readKeySource
-} from "../chunk-ADSQDYYG.js";
+} from "../chunk-REU2VQPH.js";
+import {
+  checkApiKey
+} from "../chunk-QRXPWW3M.js";
+import "../chunk-5N5L6DNN.js";
+import "../chunk-KOWFRUIT.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-4D2AYNSE.js";
+import "../chunk-BNSKVIAW.js";
 import {
   claudeJson,
   codexConfigToml,
   cursorUserMcp,
   geminiSettings
-} from "../chunk-ZUTU43FT.js";
+} from "../chunk-Z23ZBYDW.js";
 import "../chunk-T7E75EKA.js";
 import {
   getBaseUrl
-} from "../chunk-Z6HPS67T.js";
-import "../chunk-STQRUH3S.js";
-import "../chunk-QR6VE5ME.js";
+} from "../chunk-IRHABAQT.js";
+import {
+  isInvocationOf
+} from "../chunk-5DCDQ5VW.js";
+import "../chunk-5RGA636G.js";
 
 // bin/pushary-logout.ts
 import { existsSync } from "fs";
-exitOnHelpFlag("logout");
+
+// src/key-revocation.ts
+var SELF_REVOKE_PATH = "/api/v1/server/keys/self/revoke";
+var DEVICE_KEY_PATH = "/api/agent/device-key";
+var FULL_ACCESS_ONLY_STATUS = 403;
+var REVOKE_TIMEOUT_MS = 1e4;
+var readRevokedCount = async (response) => {
+  try {
+    const body = await response.json();
+    const revoked = typeof body === "object" && body !== null && "revoked" in body ? body.revoked : void 0;
+    return typeof revoked === "number" && Number.isInteger(revoked) && revoked >= 0 ? revoked : null;
+  } catch {
+    return null;
+  }
+};
+var revokeAgentKey = async (apiKey, baseUrl, fetchImpl) => {
+  const response = await fetchImpl(`${baseUrl}${DEVICE_KEY_PATH}`, {
+    method: "DELETE",
+    headers: { Authorization: `Bearer ${apiKey}` },
+    signal: AbortSignal.timeout(REVOKE_TIMEOUT_MS)
+  });
+  if (!response.ok) return { kind: "refused", status: response.status };
+  const revoked = await readRevokedCount(response);
+  if (revoked === null) return { kind: "refused", status: response.status };
+  return revoked > 0 ? { kind: "revoked" } : { kind: "not_accepted" };
+};
+var revokeOwnKey = async (apiKey, baseUrl, fetchImpl = fetch) => {
+  try {
+    const response = await fetchImpl(`${baseUrl}${SELF_REVOKE_PATH}`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
+      signal: AbortSignal.timeout(REVOKE_TIMEOUT_MS)
+    });
+    if (response.status === 401) return { kind: "not_accepted" };
+    if (response.status === FULL_ACCESS_ONLY_STATUS) return await revokeAgentKey(apiKey, baseUrl, fetchImpl);
+    if (!response.ok) return { kind: "refused", status: response.status };
+    return { kind: "revoked" };
+  } catch (err) {
+    return { kind: "unreachable", detail: err instanceof Error ? err.message : "network error" };
+  }
+};
+var keyValidityOf = (check) => {
+  switch (check.kind) {
+    case "ok":
+    case "locked":
+      return "valid";
+    case "rejected":
+    case "malformed":
+      return "invalid";
+    case "unreachable":
+      return "unknown";
+  }
+};
+
+// bin/pushary-logout.ts
+exitOnHelpFlag("sign-out");
 var parseLogoutOptions = (argv) => {
   const flags = parseFlags(argv, { bools: ["json", "revoke", "help", "h"], values: [] });
-  if (flags.command !== void 0 && flags.command !== "logout") {
-    throw new UsageError(`logout takes no positional arguments (got ${flags.command})`);
+  if (flags.command !== void 0 && !isInvocationOf(flags.command, "sign-out")) {
+    throw new UsageError(`sign-out takes no positional arguments (got ${flags.command})`);
   }
   return { json: flags.bools.has("json"), revoke: flags.bools.has("revoke") };
 };
@@ -60,30 +122,26 @@ var AGENT_CONFIGS = [
   { label: "Gemini CLI", path: geminiSettings() },
   { label: "Cursor", path: cursorUserMcp() }
 ];
-var revokeRemotely = async (apiKey) => {
-  try {
-    const res = await fetch(`${getBaseUrl()}/api/v1/server/keys/self/revoke`, {
-      method: "POST",
-      headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-      signal: AbortSignal.timeout(1e4)
-    });
-    if (res.status === 401) return { ok: true, detail: "the server had already stopped accepting it" };
-    if (!res.ok) return { ok: false, detail: `the server answered ${res.status}` };
-    return { ok: true, detail: "revoked server-side" };
-  } catch (err) {
-    return { ok: false, detail: err instanceof Error ? err.message : "network error" };
-  }
+var REVOKE_DETAIL = {
+  revoked: "Revoked the key on pushary.com.",
+  not_accepted: "pushary.com had already stopped accepting the key.",
+  refused: "pushary.com refused to revoke the key",
+  unreachable: "Could not reach pushary.com to revoke the key"
+};
+var describeRevokeAttempt = (attempt) => {
+  if (attempt.kind === "refused") return `${REVOKE_DETAIL.refused} (HTTP ${attempt.status}).`;
+  if (attempt.kind === "unreachable") return `${REVOKE_DETAIL.unreachable}: ${attempt.detail}`;
+  return REVOKE_DETAIL[attempt.kind];
+};
+var revokeAndVerify = async (apiKey) => {
+  const baseUrl = getBaseUrl();
+  const attempt = await revokeOwnKey(apiKey, baseUrl);
+  const validity = keyValidityOf(await checkApiKey(apiKey, { baseUrl }));
+  return { attempt, validity };
 };
 var main = async () => {
   const before = readKeySource();
-  let revoked = null;
-  if (options.revoke) {
-    if (before.key) {
-      revoked = await revokeRemotely(before.key);
-    } else {
-      revoked = { ok: false, detail: "no key was stored here, so there was nothing to revoke" };
-    }
-  }
+  const revoked = options.revoke && before.key ? await revokeAndVerify(before.key) : null;
   const result = clearKey();
   const remaining = AGENT_CONFIGS.filter((entry) => existsSync(entry.path));
   say("");
@@ -96,14 +154,16 @@ var main = async () => {
       say(`  ${dim(`Commented out ${result.rcLinesDisabled} export line in ${result.rcPath}`)}`);
     }
   }
+  if (options.revoke && !before.key) {
+    say("");
+    say(`  ${yellow("!")} No key was stored here, so there was nothing to revoke.`);
+  }
   if (revoked) {
     say("");
-    if (revoked.ok) {
-      say(`  ${green("\u2713")} Key ${revoked.detail}. It will not work anywhere else either.`);
-    } else {
-      say(`  ${yellow("!")} Could not revoke the key server-side: ${revoked.detail}`);
-      say(`  ${dim("It is still valid. Revoke it at")} ${cyan("pushary.com/dashboard/agent/settings")}`);
-    }
+    say(`  ${revoked.attempt.kind === "revoked" || revoked.attempt.kind === "not_accepted" ? green("\u2713") : yellow("!")} ${describeRevokeAttempt(revoked.attempt)}`);
+    if (revoked.validity === "invalid") say(`  ${green("\u2713")} The key no longer works anywhere.`);
+    else if (revoked.validity === "valid") say(`  ${yellow("!")} The key still works on pushary.com. Revoke it at ${cyan("pushary.com/dashboard/agent/settings")}`);
+    else say(`  ${yellow("!")} Could not check whether the key still works. Check it at ${cyan("pushary.com/dashboard/agent/settings")}`);
   }
   if (before.kind === "env") {
     say("");
@@ -112,12 +172,14 @@ var main = async () => {
   }
   if (remaining.length > 0) {
     say("");
-    say(`  ${dim("Still holding a copy of the key, untouched by logout:")}`);
+    say(`  ${dim("Still holding a copy of the key, untouched by sign-out:")}`);
     for (const entry of remaining) say(`  ${dim(`\u2022 ${entry.label}  ${entry.path}`)}`);
     say(`  ${dim("Run")} ${cyan("pushary clean")} ${dim("to remove Pushary from those too.")}`);
   }
-  say("");
-  say(`  ${dim("The key itself is still valid server-side. Revoke it at")} ${cyan("pushary.com/dashboard/agent/settings")}`);
+  if (!options.revoke) {
+    say("");
+    say(`  ${dim("The key itself is still valid server-side. Revoke it at")} ${cyan("pushary.com/dashboard/agent/settings")}`);
+  }
   say("");
   if (options.json) {
     process.stdout.write(
@@ -129,7 +191,8 @@ var main = async () => {
           rcPath: result.rcPath,
           rcLinesDisabled: result.rcLinesDisabled,
           envStillSet: before.kind === "env",
-          revoked: revoked === null ? null : revoked.ok,
+          revoked: revoked === null ? options.revoke ? false : null : revoked.attempt.kind === "revoked" || revoked.attempt.kind === "not_accepted",
+          keyStillValid: revoked === null ? null : revoked.validity === "unknown" ? null : revoked.validity === "valid",
           agentConfigsRetainingKey: remaining.map((entry) => entry.path)
         },
         null,
@@ -141,7 +204,7 @@ var main = async () => {
   process.exit(EXIT.OK);
 };
 main().catch((err) => {
-  process.stderr.write(`  ! logout failed: ${err instanceof Error ? err.message : String(err)}
+  process.stderr.write(`  ! sign-out failed: ${err instanceof Error ? err.message : String(err)}
 `);
   process.exit(EXIT.FAILED);
 });