@wbern/cc-ping 1.5.0 → 1.6.0

package/dist/cli.js

@@ -196,13 +196,14 @@ function isColorEnabled() {
 function wrap(code, text) {
   return isColorEnabled() ? `\x1B[${code}m${text}\x1B[0m` : text;
 }
-var green, red, yellow;
+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);
   }
 });
 
@@ -701,6 +702,7 @@ __export(daemon_exports, {
   daemonStopPath: () => daemonStopPath,
   getDaemonStatus: () => getDaemonStatus,
   isProcessRunning: () => isProcessRunning,
+  msUntilUtcHour: () => msUntilUtcHour,
   parseInterval: () => parseInterval,
   readDaemonState: () => readDaemonState,
   removeDaemonState: () => removeDaemonState,
@@ -824,6 +826,12 @@ function formatUptime(ms) {
   if (minutes > 0) return `${minutes}m ${seconds}s`;
   return `${seconds}s`;
 }
+function msUntilUtcHour(targetHour, now) {
+  const currentMs = now.getUTCHours() * 36e5 + now.getUTCMinutes() * 6e4 + now.getUTCSeconds() * 1e3 + now.getUTCMilliseconds();
+  const targetMs = targetHour * 36e5;
+  const diff = targetMs - currentMs;
+  return diff > 0 ? diff : diff + 24 * 36e5;
+}
 async function daemonLoop(intervalMs, options, deps) {
   let wakeDelayMs;
   while (!deps.shouldStop()) {
@@ -837,23 +845,28 @@ async function daemonLoop(intervalMs, options, deps) {
     if (skipped > 0) {
       deps.log(`Skipping ${skipped} account(s) with active window`);
     }
+    let soonestDeferHour;
     if (deps.shouldDeferPing) {
       const deferResults = /* @__PURE__ */ new Map();
       for (const a of accounts) {
-        deferResults.set(
-          a.handle,
-          deps.shouldDeferPing(a.handle, a.configDir).defer
-        );
+        deferResults.set(a.handle, deps.shouldDeferPing(a.handle, a.configDir));
       }
-      const deferredCount = [...deferResults.values()].filter(Boolean).length;
-      if (deferredCount > 0) {
-        accounts = accounts.filter((a) => !deferResults.get(a.handle));
-        deps.log(`Deferring ${deferredCount} account(s) (smart scheduling)`);
+      const deferred = [...deferResults.entries()].filter(([, r]) => r.defer);
+      if (deferred.length > 0) {
+        accounts = accounts.filter((a) => !deferResults.get(a.handle)?.defer);
+        deps.log(`Deferring ${deferred.length} account(s) (smart scheduling)`);
+        for (const [, r] of deferred) {
+          if (r.deferUntilUtcHour !== void 0 && (soonestDeferHour === void 0 || /* c8 ignore next -- production default */
+          msUntilUtcHour(r.deferUntilUtcHour, deps.now?.() ?? /* @__PURE__ */ new Date()) < /* c8 ignore next -- production default */
+          msUntilUtcHour(soonestDeferHour, deps.now?.() ?? /* @__PURE__ */ new Date()))) {
+            soonestDeferHour = r.deferUntilUtcHour;
+          }
+        }
       }
     }
     if (accounts.length === 0) {
       deps.log(
-        allAccounts.length === 0 ? "No accounts configured, waiting..." : "All accounts have active windows, waiting..."
+        allAccounts.length === 0 ? "No accounts configured, waiting..." : soonestDeferHour !== void 0 ? "All accounts deferred (smart scheduling), waiting..." : "All accounts have active windows, waiting..."
       );
     } else {
       deps.log(
@@ -882,9 +895,20 @@ async function daemonLoop(intervalMs, options, deps) {
       deps.updateState?.({ lastPingAt: (/* @__PURE__ */ new Date()).toISOString() });
     }
     if (deps.shouldStop()) break;
-    deps.log(`Sleeping ${Math.round(intervalMs / 6e4)}m until next ping...`);
+    let sleepMs = intervalMs;
+    if (soonestDeferHour !== void 0) {
+      const msUntilDefer = msUntilUtcHour(
+        soonestDeferHour,
+        /* c8 ignore next -- production default */
+        deps.now?.() ?? /* @__PURE__ */ new Date()
+      );
+      if (msUntilDefer > 0 && msUntilDefer < intervalMs) {
+        sleepMs = msUntilDefer;
+      }
+    }
+    deps.log(`Sleeping ${Math.round(sleepMs / 6e4)}m until next ping...`);
     const sleepStart = Date.now();
-    await deps.sleep(intervalMs);
+    await deps.sleep(sleepMs);
     const overshootMs = Date.now() - sleepStart - intervalMs;
     if (overshootMs > 6e4) {
       wakeDelayMs = overshootMs;
@@ -968,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)) {
@@ -982,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) {
@@ -1684,6 +1733,8 @@ function colorizeStatus(windowStatus) {
       return green(windowStatus);
     case "needs ping":
       return red(windowStatus);
+    case "deferred":
+      return blue(windowStatus);
     default:
       return yellow(windowStatus);
   }
@@ -1694,7 +1745,7 @@ function formatStatusLine(status) {
   const dup = status.duplicateOf ? `  [duplicate of ${status.duplicateOf}]` : "";
   return `  ${status.handle}: ${colorizeStatus(status.windowStatus)}  last ping: ${ping}${reset}${dup}`;
 }
-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()) {
@@ -1723,11 +1774,12 @@ function getAccountStatuses(accounts, now = /* @__PURE__ */ new Date(), duplicat
       };
     }
     const window = getWindowReset(account.handle, now);
+    const isDeferred = !window && deferredHandles?.has(account.handle);
     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,
@@ -1735,21 +1787,21 @@ function getAccountStatuses(accounts, now = /* @__PURE__ */ new Date(), duplicat
     };
   });
 }
-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.");
@@ -1759,7 +1811,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));
   }
@@ -1893,7 +1945,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.0").option(
+function getDeferredHandles() {
+  const deferred = /* @__PURE__ */ new Set();
+  const now = /* @__PURE__ */ new Date();
+  for (const account of listAccounts()) {
+    const schedule = readAccountSchedule(account.configDir);
+    if (schedule && shouldDefer(now, schedule.optimalPingHour).defer) {
+      deferred.add(account.handle);
+    }
+  }
+  return deferred;
+}
+var program = new Command().name("cc-ping").description("Ping Claude Code sessions to trigger quota windows early").version("1.6.0").option(
   "--config <path>",
   "Path to config directory (default: ~/.config/cc-ping, env: CC_PING_CONFIG)"
 ).hook("preAction", (thisCommand) => {
@@ -1902,7 +1965,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...]",
@@ -2016,14 +2079,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();
@@ -2114,7 +2183,7 @@ daemon.command("start").description("Start the daemon process").option(
     bell: opts.bell,
     notify: opts.notify,
     smartSchedule,
-    version: "1.5.0"
+    version: "1.6.0"
   });
   if (!result.success) {
     console.error(result.error);
@@ -2128,7 +2197,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();
@@ -2148,7 +2217,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.0" });
+  const status = getDaemonStatus({ currentVersion: "1.6.0" });
   if (opts.json) {
     const serviceInfo = svc.installed ? {
       service: {
@@ -2163,7 +2232,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 },
@@ -2202,14 +2277,14 @@ 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.0"} is installed.`
+      `  Warning: daemon is running v${status.daemonVersion} but v${"1.6.0"} is installed.`
     );
     console.log(
       "  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>",
@@ -2265,7 +2340,7 @@ daemon.command("_run", { hidden: true }).option("--interval-ms <ms>", "Ping inte
       startedAt: (/* @__PURE__ */ new Date()).toISOString(),
       intervalMs,
       configDir: resolveConfigDir2(),
-      version: "1.5.0"
+      version: "1.6.0"
     });
   }
   await runDaemonWithDefaults(intervalMs, {

package/package.json

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