@wbern/cc-ping 1.5.1 → 1.7.0

package/dist/cli.js

@@ -9,6 +9,27 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/color.ts
+function isColorEnabled() {
+  if (process.env.NO_COLOR) return false;
+  if (process.env.FORCE_COLOR === "1") return true;
+  if (process.env.FORCE_COLOR === "0") return false;
+  return process.stdout.isTTY ?? false;
+}
+function wrap(code, text) {
+  return isColorEnabled() ? `\x1B[${code}m${text}\x1B[0m` : text;
+}
+var green, red, yellow, blue;
+var init_color = __esm({
+  "src/color.ts"() {
+    "use strict";
+    green = (text) => wrap("32", text);
+    red = (text) => wrap("31", text);
+    yellow = (text) => wrap("33", text);
+    blue = (text) => wrap("34", text);
+  }
+});
+
 // src/paths.ts
 var paths_exports = {};
 __export(paths_exports, {
@@ -186,26 +207,6 @@ var init_bell = __esm({
   }
 });
 
-// src/color.ts
-function isColorEnabled() {
-  if (process.env.NO_COLOR) return false;
-  if (process.env.FORCE_COLOR === "1") return true;
-  if (process.env.FORCE_COLOR === "0") return false;
-  return process.stdout.isTTY ?? false;
-}
-function wrap(code, text) {
-  return isColorEnabled() ? `\x1B[${code}m${text}\x1B[0m` : text;
-}
-var green, red, yellow;
-var init_color = __esm({
-  "src/color.ts"() {
-    "use strict";
-    green = (text) => wrap("32", text);
-    red = (text) => wrap("31", text);
-    yellow = (text) => wrap("33", text);
-  }
-});
-
 // src/history.ts
 import { appendFileSync, existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync4 } from "fs";
 import { join as join5 } from "path";
@@ -991,12 +992,22 @@ async function stopDaemon(deps) {
       process.kill(pid2, "SIGTERM");
     }
   });
+  const _forceKill = deps?.forceKill ?? /* c8 ignore next 7 -- production default */
+  ((pid2) => {
+    if (process.platform === "win32") {
+      execSync(`taskkill /F /PID ${pid2}`);
+    } else {
+      process.kill(pid2, "SIGKILL");
+    }
+  });
+  const _log = deps?.log ?? ((msg) => console.log(msg));
   const status = _getDaemonStatus();
   if (!status.running || !status.pid) {
     return { success: false, error: "Daemon is not running" };
   }
   const pid = status.pid;
   _writeStopFile();
+  _log(`Waiting for daemon to stop (PID: ${pid})...`);
   for (let i = 0; i < GRACEFUL_POLL_ATTEMPTS; i++) {
     await _sleep(GRACEFUL_POLL_MS);
     if (!_isProcessRunning(pid)) {
@@ -1005,13 +1016,28 @@ async function stopDaemon(deps) {
       return { success: true, pid };
     }
   }
+  _log("Force-killing daemon...");
   try {
     _kill(pid);
   } catch {
   }
   await _sleep(POST_KILL_DELAY_MS);
+  if (_isProcessRunning(pid)) {
+    try {
+      _forceKill(pid);
+    } catch {
+    }
+    await _sleep(POST_KILL_DELAY_MS);
+  }
   _removeDaemonState();
   _removeStopFile();
+  if (_isProcessRunning(pid)) {
+    return {
+      success: false,
+      pid,
+      error: `Failed to stop daemon (PID: ${pid})`
+    };
+  }
   return { success: true, pid };
 }
 async function runDaemon(intervalMs, options, deps) {
@@ -1440,6 +1466,9 @@ function checkAccounts(accounts) {
   return accounts.map((a) => checkAccount(a));
 }
 
+// src/cli.ts
+init_color();
+
 // src/completions.ts
 var COMMANDS = "ping scan add remove list status next-reset history suggest check completions moo daemon";
 function bashCompletion() {
@@ -1707,17 +1736,29 @@ function colorizeStatus(windowStatus) {
       return green(windowStatus);
     case "needs ping":
       return red(windowStatus);
+    case "deferred":
+      return blue(windowStatus);
     default:
       return yellow(windowStatus);
   }
 }
 function formatStatusLine(status) {
-  const ping = status.lastPing === null ? "never" : status.lastPing.replace("T", " ").replace(/\.\d+Z$/, "Z");
-  const reset = status.timeUntilReset !== null ? ` (resets in ${status.timeUntilReset})` : "";
+  const lines = [];
   const dup = status.duplicateOf ? `  [duplicate of ${status.duplicateOf}]` : "";
-  return `  ${status.handle}: ${colorizeStatus(status.windowStatus)}  last ping: ${ping}${reset}${dup}`;
+  lines.push(
+    `  ${status.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) {
+    lines.push(`    - resets in ${status.timeUntilReset}`);
+  }
+  if (status.deferUntilUtcHour !== void 0) {
+    lines.push(`    - scheduled ping at ${status.deferUntilUtcHour}:00 UTC`);
+  }
+  return lines.join("\n");
 }
-function getAccountStatuses(accounts, now = /* @__PURE__ */ new Date(), duplicates) {
+function getAccountStatuses(accounts, now = /* @__PURE__ */ new Date(), duplicates, deferredHandles) {
   const dupLookup = /* @__PURE__ */ new Map();
   if (duplicates) {
     for (const group of duplicates.values()) {
@@ -1746,33 +1787,36 @@ function getAccountStatuses(accounts, now = /* @__PURE__ */ new Date(), duplicat
       };
     }
     const window = getWindowReset(account.handle, now);
+    const isDeferred = !window && deferredHandles?.has(account.handle);
+    const deferUntilUtcHour = isDeferred ? deferredHandles?.get(account.handle) : void 0;
     return {
       handle: account.handle,
       configDir: account.configDir,
       lastPing: lastPing.toISOString(),
-      windowStatus: window ? "active" : "needs ping",
+      windowStatus: window ? "active" : isDeferred ? "deferred" : "needs ping",
       timeUntilReset: window ? formatTimeRemaining(window.remainingMs) : null,
       lastCostUsd,
       lastTokens,
-      duplicateOf
+      duplicateOf,
+      deferUntilUtcHour
     };
   });
 }
-function printAccountTable(log = console.log, now = /* @__PURE__ */ new Date()) {
+function printAccountTable(log = console.log, now = /* @__PURE__ */ new Date(), deferredHandles) {
   const accounts = listAccounts();
   if (accounts.length === 0) {
     log("No accounts configured");
     return;
   }
   const dupes = findDuplicates(accounts);
-  const statuses = getAccountStatuses(accounts, now, dupes);
+  const statuses = getAccountStatuses(accounts, now, dupes, deferredHandles);
   for (const s of statuses) {
     log(formatStatusLine(s));
   }
 }
 
 // src/default-command.ts
-function showDefault(log = console.log, now = /* @__PURE__ */ new Date()) {
+function showDefault(log = console.log, now = /* @__PURE__ */ new Date(), deferredHandles) {
   const accounts = listAccounts();
   if (accounts.length === 0) {
     log("No accounts configured.");
@@ -1782,7 +1826,7 @@ function showDefault(log = console.log, now = /* @__PURE__ */ new Date()) {
     return;
   }
   const dupes = findDuplicates(accounts);
-  const statuses = getAccountStatuses(accounts, now, dupes);
+  const statuses = getAccountStatuses(accounts, now, dupes, deferredHandles);
   for (const s of statuses) {
     log(formatStatusLine(s));
   }
@@ -1916,7 +1960,18 @@ function suggestAccount(accounts, now = /* @__PURE__ */ new Date()) {
 }
 
 // src/cli.ts
-var program = new Command().name("cc-ping").description("Ping Claude Code sessions to trigger quota windows early").version("1.5.1").option(
+function getDeferredHandles() {
+  const deferred = /* @__PURE__ */ new Map();
+  const now = /* @__PURE__ */ new Date();
+  for (const account of listAccounts()) {
+    const schedule = readAccountSchedule(account.configDir);
+    if (schedule && shouldDefer(now, schedule.optimalPingHour).defer) {
+      deferred.set(account.handle, schedule.optimalPingHour);
+    }
+  }
+  return deferred;
+}
+var program = new Command().name("cc-ping").description("Ping Claude Code sessions to trigger quota windows early").version("1.7.0").option(
   "--config <path>",
   "Path to config directory (default: ~/.config/cc-ping, env: CC_PING_CONFIG)"
 ).hook("preAction", (thisCommand) => {
@@ -1925,7 +1980,7 @@ var program = new Command().name("cc-ping").description("Ping Claude Code sessio
     setConfigDir(opts.config);
   }
 }).action(() => {
-  showDefault();
+  showDefault(console.log, /* @__PURE__ */ new Date(), getDeferredHandles());
 });
 program.command("ping").description("Ping configured accounts to start quota windows").argument(
   "[handles...]",
@@ -2039,14 +2094,20 @@ program.command("list").description("List configured accounts").option("--json",
   }
 });
 program.command("status").description("Show status of all accounts with window information").option("--json", "Output as JSON", false).action((opts) => {
+  const deferred = getDeferredHandles();
   if (opts.json) {
     const accounts = listAccounts();
     const dupes = findDuplicates(accounts);
-    const statuses = getAccountStatuses(accounts, /* @__PURE__ */ new Date(), dupes);
+    const statuses = getAccountStatuses(
+      accounts,
+      /* @__PURE__ */ new Date(),
+      dupes,
+      deferred
+    );
     console.log(JSON.stringify(statuses, null, 2));
     return;
   }
-  printAccountTable();
+  printAccountTable(console.log, /* @__PURE__ */ new Date(), deferred);
 });
 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();
@@ -2137,7 +2198,7 @@ daemon.command("start").description("Start the daemon process").option(
     bell: opts.bell,
     notify: opts.notify,
     smartSchedule,
-    version: "1.5.1"
+    version: "1.7.0"
   });
   if (!result.success) {
     console.error(result.error);
@@ -2151,7 +2212,7 @@ 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();
+  printAccountTable(console.log, /* @__PURE__ */ new Date(), getDeferredHandles());
 });
 daemon.command("stop").description("Stop the daemon process").action(async () => {
   const result = await stopDaemon();
@@ -2171,7 +2232,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.5.1" });
+  const status = getDaemonStatus({ currentVersion: "1.7.0" });
   if (opts.json) {
     const serviceInfo = svc.installed ? {
       service: {
@@ -2186,7 +2247,13 @@ daemon.command("status").description("Show daemon status").option("--json", "Out
     }
     const accounts = listAccounts();
     const dupes = findDuplicates(accounts);
-    const accountStatuses = getAccountStatuses(accounts, /* @__PURE__ */ new Date(), dupes);
+    const deferred = getDeferredHandles();
+    const accountStatuses = getAccountStatuses(
+      accounts,
+      /* @__PURE__ */ new Date(),
+      dupes,
+      deferred
+    );
     console.log(
       JSON.stringify(
         { ...status, ...serviceInfo, accounts: accountStatuses },
@@ -2225,14 +2292,18 @@ daemon.command("status").description("Show daemon status").option("--json", "Out
   }
   if (status.versionMismatch) {
     console.log(
-      `  Warning: daemon is running v${status.daemonVersion} but v${"1.5.1"} is installed.`
+      yellow(
+        `  Warning: daemon is running v${status.daemonVersion} but v${"1.7.0"} is installed.`
+      )
     );
     console.log(
-      "  Restart to pick up the new version: cc-ping daemon stop && cc-ping daemon start"
+      yellow(
+        "  Restart to pick up the new version: cc-ping daemon stop && cc-ping daemon start"
+      )
     );
   }
   console.log("");
-  printAccountTable();
+  printAccountTable(console.log, /* @__PURE__ */ new Date(), getDeferredHandles());
 });
 daemon.command("install").description("Install daemon as a system service (launchd/systemd)").option(
   "--interval <minutes>",
@@ -2288,7 +2359,7 @@ daemon.command("_run", { hidden: true }).option("--interval-ms <ms>", "Ping inte
       startedAt: (/* @__PURE__ */ new Date()).toISOString(),
       intervalMs,
       configDir: resolveConfigDir2(),
-      version: "1.5.1"
+      version: "1.7.0"
     });
   }
   await runDaemonWithDefaults(intervalMs, {

package/package.json

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