meksus 0.3.0 → 0.4.0

package/README.md

@@ -38,7 +38,9 @@ Start a new Claude Code session after installing the hooks. It then appears on t
 ## Check
 
 ```sh
-meksus status    # who you're signed in as, whether you have access, and this repo's project
+meksus status    # who you're signed in as, this repo's project, then three cards:
+                 # AI assistants, services & spending, problems to fix (--all: every project)
+meksus ack 3f2a  # acknowledge a problem (the id's first characters are enough); resolve works the same
 ```
 
 ## What is sent
@@ -56,7 +58,8 @@ The server scrubs anything that looks like a secret.
 | Command | What it does |
 |---|---|
 | `meksus login` / `logout` | Sign in with GitHub, or sign out |
-| `meksus status` | Account, access, and this repo's project |
+| `meksus status [--all] [--json]` | Account and this repo's project, then the dashboard's three cards: AI assistants, services & spending, problems to fix |
+| `meksus ack <id>` · `meksus resolve <id>` | Acknowledge or resolve a problem from the terminal; the Discord card updates for everyone |
 | `meksus project list` | Your organisations, Personal, and their projects |
 | `meksus project create <name> [--in <parent>] [--use]` | Create a project (owners and admins) |
 | `meksus project use <owner/project>` | Write this repo's `.meksus` |

package/bin/meksus.mjs

@@ -5,6 +5,7 @@ import { login, logout } from "../src/auth.mjs";
 import { install, runHook, uninstall } from "../src/hooks.mjs";
 import { apiBase, dir, readConfig } from "../src/config.mjs";
 import { projectCommand, readProjectFile } from "../src/project.mjs";
+import { incidentCommand, printCards } from "../src/cards.mjs";
 import { flush } from "../src/spool.mjs";
 import { taskLinesCommand } from "../src/tasks.mjs";
 import { VERSION } from "../src/version.mjs";
@@ -14,7 +15,8 @@ const HELP = `M.E.K.S.U.S. CLI ${VERSION}
 
   meksus login [--no-browser]                     Sign in with GitHub (your account, not this machine)
   meksus logout                                   End this sign-in
-  meksus status                                   Who you are, and which project this repo reports to
+  meksus status [--all] [--json]                  Who you are, then AI assistants, services & spend, and problems
+  meksus ack <id> | meksus resolve <id>           Acknowledge or resolve a problem (id from status; a prefix is enough)
   meksus project list                             Your organisations, Personal, and their projects
   meksus project create <name> [--in <parent>] [--slug <slug>] [--use]
   meksus project use <owner/project>              Write this repo's .meksus file (commit it)
@@ -36,6 +38,8 @@ switch (command) {
   case "login": code = await login({ noBrowser: flag("--no-browser") }); break;
   case "logout": code = await logout(); break;
   case "status": code = await status(); break;
+  case "ack": case "acknowledge": code = await incidentCommand("acknowledge", rest[0]); break;
+  case "resolve": code = await incidentCommand("resolve", rest[0]); break;
   case "project": case "projects": code = (await requireAccess()) ? await projectCommand(rest) : 1; break;
   case "hooks":
     if (rest[0] === "install") code = (await requireAccess()) ? install() : 1;
@@ -64,5 +68,6 @@ async function status() {
   }
   console.log(project ? `This repo reports to ${project.name ?? project.id}  (${project.file})` : "This repo has no .meksus file: nothing here is reported. `meksus project use <owner/project>` adds one.");
   console.log(`API ${apiBase(c)}`);
-  return c?.session ? 0 : 1;
+  if (!c?.session) return 1;
+  return printCards({ json: flag("--json"), all: flag("--all") });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meksus",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "M.E.K.S.U.S. CLI: see what your AI coding agents (Claude Code) and builds are doing, live, and get Discord alerts when they fail or need you. Status only: code, prompts and output never leave your machine.",
   "keywords": [
     "meksus",

package/src/auth.mjs

@@ -4,8 +4,8 @@
 // typed, pasted or shown:
 //   1. ask the ingest Worker where Supabase lives (/v1/cli/config: public values only)
 //   2. listen on http://127.0.0.1:<random port> for one callback
-//   3. open <supabase>/auth/v1/authorize?provider=github&code_challenge=…  The browser comes back to
-//      https://<app>/cli-callback, a static page that forwards ?code= to the local listener. The code is
+//   3. open https://<app>/cli-callback?challenge=…, which forwards to <supabase>/auth/v1/authorize (GitHub,
+//      PKCE). The browser comes back to the same static page, which forwards ?code= to the local listener. The code is
 //      useless without this process's verifier, which never leaves it.
 //   4. exchange code + verifier for a session; keep it in config.json (0600)
 // Access tokens last an hour; getAccessToken() refreshes them (rotating refresh token) when needed.
@@ -55,10 +55,9 @@ export async function login({ noBrowser = false } = {}) {
   await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
   const port = server.address().port;
 
-  const redirect = `${cfg.app_url.replace(/\/$/, "")}/cli-callback?port=${port}&state=${state}`;
-  const authorize = `${cfg.supabase_url.replace(/\/$/, "")}/auth/v1/authorize?${new URLSearchParams({
-    provider: "github", redirect_to: redirect, code_challenge: challenge, code_challenge_method: "s256",
-  })}`;
+  // The browser starts at the app's own /cli-callback page, which forwards to GitHub sign-in (through
+  // Supabase Auth) and later hands the code back here. Only public values travel: port, state, challenge.
+  const authorize = `${cfg.app_url.replace(/\/$/, "")}/cli-callback?${new URLSearchParams({ port: String(port), state, challenge })}`;
 
   console.log("\n  Sign in to M.E.K.S.U.S. with GitHub\n");
   console.log(`  Open: ${authorize}\n`);

package/src/cards.mjs

@@ -0,0 +1,132 @@
+// `meksus status` (the dashboard's three cards in the terminal) and `meksus ack|resolve <id>` (CLI-3/4).
+// Reads go straight to the database as the signed-in user, so its access rules decide what's shown,
+// exactly as on the dashboard. Actions use the same incident_action as the dashboard (recorded with
+// source "cli"), then ask the ingest Worker to redraw the Discord card for everyone.
+import { getAccessToken } from "./auth.mjs";
+import { apiBase, readConfig } from "./config.mjs";
+import { readProjectFile } from "./project.mjs";
+import { VERSION } from "./version.mjs";
+
+const color = process.stdout.isTTY && !process.env.NO_COLOR;
+const paint = (code) => (s) => (color ? `\x1b[${code}m${s}\x1b[0m` : String(s));
+const dim = paint("2"), bold = paint("1"), red = paint("31"), orange = paint("33"), green = paint("32"), cyan = paint("36");
+const SEV = { critical: (s) => red(bold(s)), high: red, medium: orange, low: dim };
+
+export const shortId = (id) => id.slice(0, 8);
+
+async function db(config, token, path, init = {}) {
+  const res = await fetch(`${config.supabase_url.replace(/\/$/, "")}/rest/v1/${path}`, {
+    ...init,
+    headers: { apikey: config.supabase_publishable_key, Authorization: `Bearer ${token}`, "Content-Type": "application/json",
+      "User-Agent": `meksus-cli/${VERSION}`, "X-Meksus-Source": "cli", ...(init.headers ?? {}) },
+    signal: AbortSignal.timeout(10_000),
+  });
+  const body = await res.json().catch(() => null);
+  return { status: res.status, body };
+}
+
+const ago = (iso) => {
+  const s = Math.max(0, Math.round((Date.now() - Date.parse(iso)) / 1000));
+  return s < 60 ? `${s}s ago` : s < 3600 ? `${Math.round(s / 60)}m ago` : s < 86400 ? `${Math.round(s / 3600)}h ago` : `${Math.round(s / 86400)}d ago`;
+};
+const clip = (s, n) => (s && s.length > n ? `${s.slice(0, n - 1)}…` : s ?? "");
+const usd = (v) => (typeof v === "number" ? `$${v.toFixed(2)}` : "—");
+
+/** The three cards' data for one project (the repo's .meksus) or every project the user can see. */
+export async function loadOverview(config, token, projectId) {
+  const only = projectId ? `&project_id=eq.${projectId}` : "";
+  const [projects, incidents, agents, connectors] = await Promise.all([
+    db(config, token, `projects?select=id,name${projectId ? `&id=eq.${projectId}` : ""}&order=name`),
+    db(config, token, `incidents?select=id,title,severity,status,occurrences,last_seen_at,project_id,muted&status=neq.resolved${only}&order=last_seen_at.desc&limit=100`),
+    db(config, token, `agent_sessions?select=id,label,agent,state,task,last_event_at,project_id&ended_at=is.null${only}&order=last_event_at.desc&limit=20`),
+    db(config, token, `connectors?select=provider,status,snapshot,project_id${only}`),
+  ]);
+  for (const r of [projects, incidents, agents, connectors]) if (r.status === 401) return { error: "signed_out" };
+  if ([projects, incidents, agents, connectors].some((r) => !Array.isArray(r.body))) return { error: "unavailable" };
+  const name = Object.fromEntries(projects.body.map((p) => [p.id, p.name]));
+  const now = Date.now();
+  const live = agents.body.filter((a) => now - Date.parse(a.last_event_at) < 30 * 60_000);
+  const order = { critical: 0, high: 1, medium: 2, low: 3 };
+  const problems = incidents.body.filter((i) => !i.muted)
+    .sort((a, b) => (order[a.severity] - order[b.severity]) || Date.parse(b.last_seen_at) - Date.parse(a.last_seen_at));
+  return {
+    scope: projectId ? name[projectId] ?? "this project" : `${projects.body.length} project${projects.body.length === 1 ? "" : "s"}`,
+    agents: live.map((a) => ({ ...a, project: name[a.project_id], quiet: a.state !== "waiting" && now - Date.parse(a.last_event_at) > 5 * 60_000 })),
+    spend: connectors.body.map((c) => ({ provider: c.provider, status: c.status, today_usd: c.snapshot?.usage_daily_usd ?? null, remaining_usd: c.snapshot?.remaining_usd ?? null, project: name[c.project_id] })),
+    problems: problems.map((i) => ({ ...i, project: name[i.project_id] })),
+  };
+}
+
+/** Plain-text cards (no colour when piped or NO_COLOR is set). */
+export function renderCards(o, { width = 78 } = {}) {
+  const out = [];
+  const head = (title, note) => { out.push(""); out.push(`${bold(title)}${note ? `  ${dim(note)}` : ""}`); out.push(dim("─".repeat(Math.min(width, 78)))); };
+  const waiting = o.agents.filter((a) => a.state === "waiting").length;
+  head("AI assistants", o.agents.length ? `${o.agents.length} live · ${waiting} waiting for you` : "none running");
+  if (!o.agents.length) out.push(dim("  Claude Code and anything under `meksus watch` show up here while they work."));
+  for (const a of o.agents.slice(0, 5)) {
+    const state = a.state === "waiting" ? orange("waiting for you") : a.quiet ? orange("gone quiet") : a.state === "working" ? green("working") : a.state;
+    out.push(`  ${clip(a.label ?? a.agent, 32).padEnd(32)} ${state}  ${dim(ago(a.last_event_at))}${a.task ? `\n    ${dim("→")} ${clip(a.task, width - 6)}` : ""}`);
+  }
+  head("Service health & spending", o.spend.length ? `${o.spend.length} connected` : null);
+  if (!o.spend.length) out.push(dim("  No services connected yet. Connect one on the dashboard (Integrations / Spend)."));
+  for (const s of o.spend) {
+    const st = s.status === "ok" ? green("ok") : red(s.status);
+    out.push(`  ${(s.provider === "openrouter" ? "OpenRouter" : s.provider).padEnd(14)} ${st}  ${usd(s.today_usd)} today · ${usd(s.remaining_usd)} left${s.project ? dim(`  ${s.project}`) : ""}`);
+  }
+  const needs = o.problems.filter((p) => p.status === "open").length;
+  head("Problems to fix", o.problems.length ? `${o.problems.length} open · ${needs} need a person` : null);
+  if (!o.problems.length) out.push(`  ${green("All steady.")} ${dim("Nothing needs you.")}`);
+  for (const p of o.problems.slice(0, 10)) {
+    const sev = (SEV[p.severity] ?? dim)(p.severity.padEnd(8));
+    out.push(`  ${cyan(shortId(p.id))}  ${sev} ${clip(p.title, width - 36)}${p.occurrences > 1 ? dim(` ×${p.occurrences}`) : ""}${p.status === "acknowledged" ? dim(" (ack)") : ""}`);
+    out.push(`            ${dim(`${p.project ?? ""} · last ${ago(p.last_seen_at)}`)}`);
+  }
+  if (o.problems.length > 10) out.push(dim(`  … and ${o.problems.length - 10} more on the dashboard`));
+  if (o.problems.length) out.push(dim("\n  meksus ack <id> · meksus resolve <id>   (the first characters of the id are enough)"));
+  return out.join("\n");
+}
+
+async function session() {
+  const config = readConfig();
+  if (!config?.session) return { error: "Not signed in. Run `meksus login`." };
+  const token = await getAccessToken(config);
+  if (!token) return { error: "Your sign-in expired. Run `meksus login`." };
+  return { config, token };
+}
+
+/** Appended to `meksus status` (after who you are and which project this repo reports to). */
+export async function printCards({ json = false, all = false } = {}) {
+  const s = await session();
+  if (s.error) return 1;
+  const project = all ? null : readProjectFile();
+  const o = await loadOverview(s.config, s.token, project?.id ?? null);
+  if (o.error) { console.error(o.error === "signed_out" ? "Your sign-in expired. Run `meksus login`." : "Couldn't load the cards right now. Try again."); return 1; }
+  if (json) { console.log(JSON.stringify(o, null, 2)); return 0; }
+  console.log(dim(`\nShowing ${o.scope}${project && !all ? " (this repo's .meksus; --all for every project)" : ""}`));
+  console.log(renderCards(o, { width: Math.max(60, Math.min(process.stdout.columns ?? 80, 100)) }));
+  return 0;
+}
+
+/** `meksus ack <id>` / `meksus resolve <id>`: the id prefix is matched among open problems you can see. */
+export async function incidentCommand(action, ref) {
+  if (!ref || !/^[0-9a-f-]{4,36}$/i.test(ref)) { console.error(`Usage: meksus ${action === "acknowledge" ? "ack" : "resolve"} <id>   (see \`meksus status\`)`); return 2; }
+  const s = await session();
+  if (s.error) { console.error(s.error); return 1; }
+  const list = await db(s.config, s.token, "incidents?select=id,title,status,project_id&status=neq.resolved&order=last_seen_at.desc&limit=200");
+  if (!Array.isArray(list.body)) { console.error("Couldn't load your problems right now. Try again."); return 1; }
+  const matches = list.body.filter((i) => i.id.startsWith(ref.toLowerCase()));
+  if (!matches.length) { console.error(`No open problem starts with ${ref}. \`meksus status --all\` lists them.`); return 1; }
+  if (matches.length > 1) { console.error(`${ref} matches ${matches.length} problems; type more of the id:\n${matches.map((m) => `  ${m.id}  ${m.title}`).join("\n")}`); return 1; }
+  const i = matches[0];
+  const r = await db(s.config, s.token, "rpc/incident_action", { method: "POST", body: JSON.stringify({ p_incident: i.id, p_action: action }) });
+  if (r.status >= 300 || !r.body?.ok) { console.error(`Not done: ${r.body?.error ?? r.body?.message ?? `HTTP ${r.status}`}.`); return 1; }
+  // Redraw the Discord card(s) for everyone, like the dashboard does. Best effort.
+  let synced = false;
+  try {
+    const res = await fetch(`${apiBase(s.config)}/v1/incidents/${i.id}/discord-sync`, { method: "POST", headers: { Authorization: `Bearer ${s.token}`, "User-Agent": `meksus-cli/${VERSION}` }, signal: AbortSignal.timeout(10_000) });
+    synced = res.ok && (await res.json().catch(() => null))?.synced !== false;
+  } catch { /* the next action redraws it */ }
+  console.log(`${green("✔")} ${action === "acknowledge" ? "Acknowledged" : "Resolved"}: ${i.title}${synced ? dim("  (Discord card updated)") : ""}`);
+  return 0;
+}

package/src/hooks.mjs

@@ -132,9 +132,29 @@ function settingsPath(cwd) {
   return join(d, ".claude", "settings.local.json");
 }
 
+// Reads the settings file, or explains (and changes nothing) when it isn't valid JSON — often two
+// { … } blocks pasted one after the other, which Claude Code can't read either.
+function readSettings(file) {
+  if (!existsSync(file)) return {};
+  const text = readFileSync(file, "utf8");
+  try {
+    const value = JSON.parse(text);
+    if (value && typeof value === "object" && !Array.isArray(value)) return value;
+  } catch (error) {
+    const at = /line (\d+)/.exec(error.message)?.[1];
+    console.error(`✖ ${file} isn't valid JSON${at ? ` (line ${at})` : ""}, so nothing was changed.`);
+    if (/after JSON/.test(error.message)) console.error("  It holds more than one { … } block. Merge them into one object, then run this again.");
+    console.error("  Claude Code can't read this file either until it's fixed.");
+    return null;
+  }
+  console.error(`✖ ${file} should hold one JSON object, so nothing was changed.`);
+  return null;
+}
+
 export function install(cwd = process.cwd()) {
   const file = settingsPath(cwd);
-  const settings = existsSync(file) ? JSON.parse(readFileSync(file, "utf8")) : {};
+  const settings = readSettings(file);
+  if (!settings) return 1;
   settings.hooks ??= {};
   const command = `node "${CLI}" hook`;
   for (const event of EVENTS) {
@@ -155,7 +175,8 @@ export function install(cwd = process.cwd()) {
 export function uninstall(cwd = process.cwd()) {
   const file = settingsPath(cwd);
   if (!existsSync(file)) { console.log("No hooks file here."); return 0; }
-  const settings = JSON.parse(readFileSync(file, "utf8"));
+  const settings = readSettings(file);
+  if (!settings) return 1;
   for (const event of Object.keys(settings.hooks ?? {})) {
     settings.hooks[event] = settings.hooks[event]
       .map((g) => ({ ...g, hooks: (g.hooks ?? []).filter((h) => !String(h.command).includes(MARK)) }))