@dylanpiercey/work 0.0.115 → 0.0.117

package/bin/work.mjs

@@ -25,6 +25,7 @@ import { createRequire } from "node:module";
 import { doctor, formatDoctor, setupPath } from "../lib/setup/doctor.mjs";
 import { installTool } from "../lib/setup/install.mjs";
 import { commentMarkdown } from "../lib/review/markdown.mjs";
+import { duration, pctText } from "../lib/usage/format.mjs";
 
 const pkgRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
 const pkg = JSON.parse(fs.readFileSync(path.join(pkgRoot, "package.json"), "utf8"));
@@ -104,17 +105,10 @@ async function start() {
  * this table can never disagree, which is also why this asks over HTTP instead
  * of re-reading every provider's credentials itself. */
 async function usage() {
-  const port = serviceEnv().PORT;
-  const url = `http://127.0.0.1:${port}/api/usage${args.includes("--refresh") ? "?refresh" : ""}`;
-  let data;
-  try {
-    const res = await fetch(url, { signal: AbortSignal.timeout(30_000) });
-    if (!res.ok) die(`server answered ${res.status} for /api/usage`);
-    data = await res.json();
-  } catch {
-    die(`no work server on port ${port}. Start one with: work start`);
-  }
-  if (args.includes("--json")) {
+  const data = await apiGet(
+    `/api/usage${args.includes("--refresh") ? "?refresh" : ""}`,
+  );
+  if (jsonOut) {
     console.log(JSON.stringify(data, null, 2));
     return;
   }
@@ -139,7 +133,7 @@ async function usage() {
     // enough to read as a warning rather than another window.
     if (agent.note) console.log(`  ⚠ ${agent.note}`);
     if (agent.stale_seconds != null) {
-      console.log(`  ⚠ ${short(agent.stale_seconds * 1000)} old`);
+      console.log(`  ⚠ ${duration(agent.stale_seconds * 1000)} old`);
     }
   }
 }
@@ -285,23 +279,7 @@ async function reviewCmd() {
 function until(iso) {
   if (!iso) return null;
   const ms = new Date(iso).getTime() - Date.now();
-  return ms > 0 ? short(ms) : null;
-}
-
-/** Percent, with a decimal only where rounding would lie: 99.6% must not
- * read as a spent 100%, and 0.4% must not read as an untouched 0%. */
-function pctText(pct) {
-  const rounded = Math.round(pct);
-  return rounded !== pct && (rounded === 100 || rounded === 0)
-    ? `${pct.toFixed(1)}%`
-    : `${rounded}%`;
-}
-
-function short(ms) {
-  const m = Math.round(ms / 60_000);
-  if (m < 60) return `${m}m`;
-  const h = Math.round(m / 60);
-  return h < 48 ? `${h}h` : `${Math.round(h / 24)}d`;
+  return ms > 0 ? duration(ms) : null;
 }
 
 async function setup() {