@wbern/cc-ping 1.8.0 → 1.10.0

package/dist/cli.js

@@ -701,6 +701,7 @@ __export(daemon_exports, {
   daemonPidPath: () => daemonPidPath,
   daemonStopPath: () => daemonStopPath,
   getDaemonStatus: () => getDaemonStatus,
+  hasVersionChanged: () => hasVersionChanged,
   isProcessRunning: () => isProcessRunning,
   msUntilUtcHour: () => msUntilUtcHour,
   parseInterval: () => parseInterval,
@@ -712,15 +713,13 @@ __export(daemon_exports, {
   stopDaemon: () => stopDaemon,
   writeDaemonState: () => writeDaemonState
 });
-import { execSync, spawn } from "child_process";
+import { execFileSync, execSync, spawn } from "child_process";
 import {
   existsSync as existsSync6,
   closeSync as fsCloseSync,
   openSync as fsOpenSync,
   mkdirSync as mkdirSync4,
   readFileSync as readFileSync6,
-  realpathSync,
-  statSync as statSync2,
   unlinkSync,
   writeFileSync as writeFileSync3
 } from "fs";
@@ -832,6 +831,14 @@ function msUntilUtcHour(targetHour, now) {
   const diff = targetMs - currentMs;
   return diff > 0 ? diff : diff + 24 * 36e5;
 }
+function hasVersionChanged(runningVersion, getInstalledVersion) {
+  if (!runningVersion) return false;
+  try {
+    return getInstalledVersion() !== runningVersion;
+  } catch {
+    return false;
+  }
+}
 async function daemonLoop(intervalMs, options, deps) {
   let wakeDelayMs;
   while (!deps.shouldStop()) {
@@ -1070,15 +1077,7 @@ async function runDaemon(intervalMs, options, deps) {
     cleanup();
   }
   if (exitReason === "upgrade") {
-    if (deps.restart) {
-      try {
-        deps.restart();
-      } catch {
-        deps.exit(75);
-      }
-    } else {
-      deps.exit(75);
-    }
+    deps.exit(75);
   }
 }
 async function runDaemonWithDefaults(intervalMs, options) {
@@ -1108,8 +1107,28 @@ async function runDaemonWithDefaults(intervalMs, options) {
       return shouldDefer2(/* @__PURE__ */ new Date(), schedule.optimalPingHour);
     };
   }
-  const binaryPath = realpathSync(process.argv[1]);
-  const startMtimeMs = statSync2(binaryPath).mtimeMs;
+  let hasUpgraded;
+  if (options.autoUpdate) {
+    let ccPingBin = process.env.CC_PING_BIN;
+    if (!ccPingBin) {
+      try {
+        ccPingBin = execSync("which cc-ping", {
+          encoding: "utf-8",
+          timeout: 5e3
+        }).trim();
+      } catch {
+        console.log(
+          "Auto-update: cc-ping not found in PATH, version checks disabled"
+        );
+      }
+    }
+    if (ccPingBin) {
+      hasUpgraded = () => hasVersionChanged(
+        readDaemonState()?.version,
+        () => execFileSync(ccPingBin, ["--version"], { timeout: 5e3 }).toString().trim()
+      );
+    }
+  }
   await runDaemon(intervalMs, options, {
     runPing: runPing2,
     listAccounts: listAccounts2,
@@ -1118,36 +1137,14 @@ async function runDaemonWithDefaults(intervalMs, options) {
     log: (msg) => console.log(msg),
     isWindowActive: (handle) => getWindowReset2(handle) !== null,
     shouldDeferPing,
-    hasUpgraded: () => {
-      try {
-        return statSync2(binaryPath).mtimeMs !== startMtimeMs;
-      } catch {
-        return false;
-      }
-    },
+    hasUpgraded,
     updateState: (patch) => {
       const current = readDaemonState();
       if (current) writeDaemonState({ ...current, ...patch });
     },
     onSignal: (signal, handler) => process.on(signal, handler),
     removeSignal: (signal, handler) => process.removeListener(signal, handler),
-    exit: (code) => process.exit(code),
-    restart: () => {
-      console.log("Restarting daemon with updated binary...");
-      const result = startDaemon({
-        interval: `${intervalMs / 6e4}m`,
-        quiet: options.quiet,
-        bell: options.bell,
-        notify: options.notify,
-        smartSchedule: options.smartSchedule
-      });
-      if (result.success) {
-        console.log(`Daemon restarted (PID: ${result.pid})`);
-      } else {
-        console.log(`Failed to restart: ${result.error}`);
-        process.exit(75);
-      }
-    }
+    exit: (code) => process.exit(code)
   });
 }
 var GRACEFUL_POLL_MS, GRACEFUL_POLL_ATTEMPTS, POST_KILL_DELAY_MS;
@@ -1212,19 +1209,26 @@ function generateLaunchdPlist(options, execInfo, configDir) {
   if (options.notify) programArgs.push("--notify");
   if (options.smartSchedule === false)
     programArgs.push("--smart-schedule", "off");
+  programArgs.push("--auto-update");
   const allArgs = [execInfo.executable, ...programArgs];
   const argsXml = allArgs.map((a) => `      <string>${escapeXml(a)}</string>`).join("\n");
   const logPath = join10(
     configDir || join10(nodeHomedir(), ".config", "cc-ping"),
     "daemon.log"
   );
+  const envVars = {};
+  if (configDir) envVars.CC_PING_CONFIG = configDir;
+  if (execInfo.args.length === 0) envVars.CC_PING_BIN = execInfo.executable;
   let envSection = "";
-  if (configDir) {
+  if (Object.keys(envVars).length > 0) {
+    const entries = Object.entries(envVars).map(
+      ([k, v]) => `      <key>${escapeXml(k)}</key>
+      <string>${escapeXml(v)}</string>`
+    ).join("\n");
     envSection = `
     <key>EnvironmentVariables</key>
     <dict>
-      <key>CC_PING_CONFIG</key>
-      <string>${escapeXml(configDir)}</string>
+${entries}
     </dict>`;
   }
   return `<?xml version="1.0" encoding="UTF-8"?>
@@ -1266,12 +1270,14 @@ function generateSystemdUnit(options, execInfo, configDir) {
   if (options.notify) programArgs.push("--notify");
   if (options.smartSchedule === false)
     programArgs.push("--smart-schedule", "off");
+  programArgs.push("--auto-update");
   const execStart = [execInfo.executable, ...programArgs].map((a) => a.includes(" ") ? `"${a}"` : a).join(" ");
-  let envLine = "";
-  if (configDir) {
-    envLine = `
-Environment=CC_PING_CONFIG=${configDir}`;
-  }
+  const envPairs = [];
+  if (configDir) envPairs.push(`CC_PING_CONFIG=${configDir}`);
+  if (execInfo.args.length === 0)
+    envPairs.push(`CC_PING_BIN=${execInfo.executable}`);
+  const envLine = envPairs.map((p) => `
+Environment=${p}`).join("");
   return `[Unit]
 Description=cc-ping daemon - auto-ping Claude Code sessions
 
@@ -1766,12 +1772,31 @@ function colorizeStatus(windowStatus) {
       return yellow(windowStatus);
   }
 }
-function formatStatusLine(status) {
+function censorHandle(handle) {
+  const atIdx = handle.indexOf("@");
+  if (atIdx !== -1) {
+    const local = handle.slice(0, atIdx);
+    const domain = handle.slice(atIdx + 1);
+    return censorPart(local) + "@" + censorDomain(domain);
+  }
+  return censorDomain(handle);
+}
+function censorPart(part) {
+  if (part.length <= 1) return part;
+  return part[0] + "*".repeat(part.length - 1);
+}
+function censorDomain(domain) {
+  const lastDot = domain.lastIndexOf(".");
+  if (lastDot === -1) return censorPart(domain);
+  const name = domain.slice(0, lastDot);
+  const tld = domain.slice(lastDot);
+  return censorPart(name) + tld;
+}
+function formatStatusLine(status, options) {
   const lines = [];
-  const dup = status.duplicateOf ? `  [duplicate of ${status.duplicateOf}]` : "";
-  lines.push(
-    `  ${status.handle}: ${colorizeStatus(status.windowStatus)}${dup}`
-  );
+  const handle = options?.censor ? censorHandle(status.handle) : status.handle;
+  const dup = status.duplicateOf ? `  [duplicate of ${options?.censor ? censorHandle(status.duplicateOf) : status.duplicateOf}]` : "";
+  lines.push(`  ${handle}: ${colorizeStatus(status.windowStatus)}${dup}`);
   const ping = status.lastPing === null ? "never" : status.lastPing.replace("T", " ").replace(/\.\d+Z$/, "Z");
   lines.push(`    - last ping: ${ping}`);
   if (status.timeUntilReset !== null) {
@@ -1826,7 +1851,7 @@ function getAccountStatuses(accounts, now = /* @__PURE__ */ new Date(), duplicat
     };
   });
 }
-function printAccountTable(log = console.log, now = /* @__PURE__ */ new Date(), deferredHandles) {
+function printAccountTable(log = console.log, now = /* @__PURE__ */ new Date(), deferredHandles, options) {
   const accounts = listAccounts();
   if (accounts.length === 0) {
     log("No accounts configured");
@@ -1835,12 +1860,12 @@ function printAccountTable(log = console.log, now = /* @__PURE__ */ new Date(),
   const dupes = findDuplicates(accounts);
   const statuses = getAccountStatuses(accounts, now, dupes, deferredHandles);
   for (const s of statuses) {
-    log(formatStatusLine(s));
+    log(formatStatusLine(s, options));
   }
 }
 
 // src/default-command.ts
-function showDefault(log = console.log, now = /* @__PURE__ */ new Date(), deferredHandles) {
+function showDefault(log = console.log, now = /* @__PURE__ */ new Date(), deferredHandles, options) {
   const accounts = listAccounts();
   if (accounts.length === 0) {
     log("No accounts configured.");
@@ -1852,7 +1877,7 @@ function showDefault(log = console.log, now = /* @__PURE__ */ new Date(), deferr
   const dupes = findDuplicates(accounts);
   const statuses = getAccountStatuses(accounts, now, dupes, deferredHandles);
   for (const s of statuses) {
-    log(formatStatusLine(s));
+    log(formatStatusLine(s, options));
   }
   const needsPing = statuses.filter((s) => s.windowStatus !== "active");
   if (needsPing.length > 0) {
@@ -1915,7 +1940,7 @@ init_paths();
 init_run_ping();
 
 // src/scan.ts
-import { existsSync as existsSync7, readdirSync, statSync as statSync3 } from "fs";
+import { existsSync as existsSync7, readdirSync, statSync as statSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join9 } from "path";
 function scanAccounts(dir) {
@@ -1923,7 +1948,7 @@ function scanAccounts(dir) {
   if (!existsSync7(accountsDir)) return [];
   return readdirSync(accountsDir).filter((name) => {
     const full = join9(accountsDir, name);
-    return statSync3(full).isDirectory() && !name.startsWith(".") && existsSync7(join9(full, ".claude.json"));
+    return statSync2(full).isDirectory() && !name.startsWith(".") && existsSync7(join9(full, ".claude.json"));
   }).map((name) => ({
     handle: name,
     configDir: join9(accountsDir, name)
@@ -1995,16 +2020,19 @@ function getDeferredHandles() {
   }
   return deferred;
 }
-var program = new Command().name("cc-ping").description("Ping Claude Code sessions to trigger quota windows early").version("1.8.0").option(
+var program = new Command().name("cc-ping").description("Ping Claude Code sessions to trigger quota windows early").version("1.10.0").option(
   "--config <path>",
   "Path to config directory (default: ~/.config/cc-ping, env: CC_PING_CONFIG)"
-).hook("preAction", (thisCommand) => {
+).option("--censor", "Mask account handles in output (for screenshots)").hook("preAction", (thisCommand) => {
   const opts = thisCommand.opts();
   if (opts.config) {
     setConfigDir(opts.config);
   }
 }).action(() => {
-  showDefault(console.log, /* @__PURE__ */ new Date(), getDeferredHandles());
+  const opts = program.opts();
+  showDefault(console.log, /* @__PURE__ */ new Date(), getDeferredHandles(), {
+    censor: opts.censor
+  });
 });
 program.command("ping").description("Ping configured accounts to start quota windows").argument(
   "[handles...]",
@@ -2131,7 +2159,9 @@ program.command("status").description("Show status of all accounts with window i
     console.log(JSON.stringify(statuses, null, 2));
     return;
   }
-  printAccountTable(console.log, /* @__PURE__ */ new Date(), deferred);
+  printAccountTable(console.log, /* @__PURE__ */ new Date(), deferred, {
+    censor: program.opts().censor
+  });
 });
 program.command("next-reset").description("Show which account has its quota window resetting soonest").option("--json", "Output as JSON", false).action((opts) => {
   const accounts = listAccounts();
@@ -2222,7 +2252,7 @@ daemon.command("start").description("Start the daemon process").option(
     bell: opts.bell,
     notify: opts.notify,
     smartSchedule,
-    version: "1.8.0"
+    version: "1.10.0"
   });
   if (!result.success) {
     console.error(result.error);
@@ -2236,7 +2266,9 @@ daemon.command("start").description("Start the daemon process").option(
       "Hint: won't survive a reboot. Use `cc-ping daemon install` for a persistent service."
     );
   }
-  printAccountTable(console.log, /* @__PURE__ */ new Date(), getDeferredHandles());
+  printAccountTable(console.log, /* @__PURE__ */ new Date(), getDeferredHandles(), {
+    censor: program.opts().censor
+  });
 });
 daemon.command("stop").description("Stop the daemon process").action(async () => {
   const result = await stopDaemon();
@@ -2256,7 +2288,7 @@ daemon.command("stop").description("Stop the daemon process").action(async () =>
 daemon.command("status").description("Show daemon status").option("--json", "Output as JSON", false).action(async (opts) => {
   const { getServiceStatus: getServiceStatus2 } = await Promise.resolve().then(() => (init_service(), service_exports));
   const svc = getServiceStatus2();
-  const status = getDaemonStatus({ currentVersion: "1.8.0" });
+  const status = getDaemonStatus({ currentVersion: "1.10.0" });
   if (opts.json) {
     const serviceInfo = svc.installed ? {
       service: {
@@ -2317,7 +2349,7 @@ daemon.command("status").description("Show daemon status").option("--json", "Out
   if (status.versionMismatch) {
     console.log(
       yellow(
-        `  Warning: daemon is running v${status.daemonVersion} but v${"1.8.0"} is installed.`
+        `  Warning: daemon is running v${status.daemonVersion} but v${"1.10.0"} is installed.`
       )
     );
     console.log(
@@ -2327,7 +2359,9 @@ daemon.command("status").description("Show daemon status").option("--json", "Out
     );
   }
   console.log("");
-  printAccountTable(console.log, /* @__PURE__ */ new Date(), getDeferredHandles());
+  printAccountTable(console.log, /* @__PURE__ */ new Date(), getDeferredHandles(), {
+    censor: program.opts().censor
+  });
 });
 daemon.command("install").description("Install daemon as a system service (launchd/systemd)").option(
   "--interval <minutes>",
@@ -2366,7 +2400,7 @@ daemon.command("uninstall").description("Remove daemon system service").action(a
   }
   console.log(`Service removed: ${result.servicePath}`);
 });
-daemon.command("_run", { hidden: true }).option("--interval-ms <ms>", "Ping interval in milliseconds").option("-q, --quiet", "Suppress ping output", false).option("--bell", "Ring terminal bell on ping failure", false).option("--notify", "Send desktop notification on ping failure", false).option("--smart-schedule <on|off>", "Smart scheduling (default: on)").action(async (opts) => {
+daemon.command("_run", { hidden: true }).option("--interval-ms <ms>", "Ping interval in milliseconds").option("-q, --quiet", "Suppress ping output", false).option("--bell", "Ring terminal bell on ping failure", false).option("--notify", "Send desktop notification on ping failure", false).option("--smart-schedule <on|off>", "Smart scheduling (default: on)").option("--auto-update", "Auto-restart on upgrade (for service installs)").action(async (opts) => {
   const intervalMs = Number(opts.intervalMs);
   if (!intervalMs || intervalMs <= 0) {
     console.error("Invalid --interval-ms");
@@ -2383,14 +2417,15 @@ daemon.command("_run", { hidden: true }).option("--interval-ms <ms>", "Ping inte
       startedAt: (/* @__PURE__ */ new Date()).toISOString(),
       intervalMs,
       configDir: resolveConfigDir2(),
-      version: "1.8.0"
+      version: "1.10.0"
     });
   }
   await runDaemonWithDefaults(intervalMs, {
     quiet: opts.quiet,
     bell: opts.bell,
     notify: opts.notify,
-    smartSchedule
+    smartSchedule,
+    autoUpdate: opts.autoUpdate
   });
 });
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wbern/cc-ping",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "description": "Ping Claude Code sessions to trigger quota windows early across multiple accounts",
   "type": "module",
   "bin": {